diff --git a/stage0/src/Init/Data/Array/Subarray.lean b/stage0/src/Init/Data/Array/Subarray.lean
index 7fa67b1773..e5e93997b4 100644
--- a/stage0/src/Init/Data/Array/Subarray.lean
+++ b/stage0/src/Init/Data/Array/Subarray.lean
@@ -17,6 +17,27 @@ structure Subarray (α : Type u)  where
 
 namespace Subarray
 
+def size (s : Subarray α) : Nat :=
+  s.stop - s.start
+
+def get (s : Subarray α) (i : Fin s.size) : α :=
+  have : s.start + i.val < s.as.size := by
+   apply Nat.lt_of_lt_of_le _ s.h₂
+   have := i.isLt
+   simp [size] at this
+   rw [Nat.add_comm]
+   exact Nat.add_lt_of_lt_sub s.h₁ this
+  s.as.get ⟨s.start + i.val, this⟩
+
+@[inline] def getD (s : Subarray α) (i : Nat) (v₀ : α) : α :=
+  if h : i < s.size then s.get ⟨i, h⟩ else v₀
+
+def get! [Inhabited α] (s : Subarray α) (i : Nat) : α :=
+  getD s i default
+
+def getOp [Inhabited α] (self : Subarray α) (idx : Nat) : α :=
+  self.get! idx
+
 def popFront (s : Subarray α) : Subarray α :=
   if h : s.start < s.stop then
     { s with start := s.start + 1, h₁ := Nat.le_of_lt_succ (Nat.add_lt_add_right h 1) }
diff --git a/stage0/src/Init/Data/Nat/Basic.lean b/stage0/src/Init/Data/Nat/Basic.lean
index 1534d60688..1ed993c35a 100644
--- a/stage0/src/Init/Data/Nat/Basic.lean
+++ b/stage0/src/Init/Data/Nat/Basic.lean
@@ -610,6 +610,15 @@ theorem le_sub_of_add_le {a b c : Nat} (h : a + b ≤ c) : a ≤ c - b := by
     have hd := Nat.sub_eq_of_eq_add hd.symm
     exact hd.symm
 
+theorem add_lt_of_lt_sub {a b c : Nat} (hle : b ≤ c) (h : a < c - b) : a + b < c := by
+  have : a.succ + b ≤ c := add_le_of_le_sub hle h
+  simp [Nat.succ_add] at this
+  exact this
+
+theorem lt_sub_of_add_lt {a b c : Nat} (h : a + b < c) : a < c - b :=
+  have : a.succ + b ≤ c := by simp [Nat.succ_add]; exact h
+  le_sub_of_add_le this
+
 @[simp] protected theorem pred_zero : pred 0 = 0 :=
   rfl
 
diff --git a/stage0/src/Init/Notation.lean b/stage0/src/Init/Notation.lean
index 243e1d959c..76914797fb 100644
--- a/stage0/src/Init/Notation.lean
+++ b/stage0/src/Init/Notation.lean
@@ -218,9 +218,13 @@ macro_rules
 /-- Special identifier introduced by "anonymous" `have : ...`, `suffices p ...` etc. -/
 macro tk:"this" : term => return Syntax.ident tk.getHeadInfo "this".toSubstring `this []
 
-namespace Parser.Tactic
+/-
+  Category for carrying raw syntax trees between macros; any content is printed as is by the pretty printer.
+  The only accepted parser for this category is an antiquotation. -/
 declare_syntax_cat rawStx
-/-- `withAnnotateState stx t` annotates the lexical range of `stx : Syntax` with the initial and final state of running tactic `t`. -/
+
+namespace Parser.Tactic
+/-- `with_annotate_state stx t` annotates the lexical range of `stx : Syntax` with the initial and final state of running tactic `t`. -/
 scoped syntax (name := withAnnotateState) "with_annotate_state " rawStx ppSpace tactic : tactic
 
 /--
@@ -350,7 +354,12 @@ syntax (name := rotateRight) "rotate_right" (num)? : tactic
 /-- `try tac` runs `tac` and succeeds even if `tac` failed. -/
 macro "try " t:tacticSeq : tactic => `(first | $t | skip)
 /-- `tac <;> tac'` runs `tac` on the main goal and `tac'` on each produced goal, concatenating all goals produced by `tac'`. -/
-macro:1 x:tactic " <;> " y:tactic:0 : tactic => `(tactic| focus ($x:tactic; all_goals $y:tactic))
+macro:1 x:tactic tk:" <;> " y:tactic:0 : tactic => `(tactic|
+  focus
+    $x:tactic
+    -- annotate token with state after executing `x`
+    with_annotate_state $tk skip
+    all_goals $y:tactic)
 
 /-- `eq_refl` is equivalent to `exact rfl`, but has a few optimizatons. -/
 syntax (name := refl) "eq_refl" : tactic
diff --git a/stage0/src/Lean/Data/Json/Parser.lean b/stage0/src/Lean/Data/Json/Parser.lean
index 751bb5ad2b..13811eff58 100644
--- a/stage0/src/Lean/Data/Json/Parser.lean
+++ b/stage0/src/Lean/Data/Json/Parser.lean
@@ -50,17 +50,15 @@ partial def strCore (acc : String) : Parsec String := do
     return acc
   else
     let c ← anyChar
-    let ec ←
-      if c = '\\' then
-        escapedChar
-      -- as to whether c.val > 0xffff should be split up and encoded with multiple \u,
-      -- the JSON standard is not definite: both directly printing the character
-      -- and encoding it with multiple \u is allowed. we choose the former.
-      else if 0x0020 ≤ c.val ∧ c.val ≤ 0x10ffff then
-        pure c
-      else
-        fail "unexpected character in string"
-    strCore (acc.push ec)
+    if c = '\\' then
+      strCore (acc.push (← escapedChar))
+    -- as to whether c.val > 0xffff should be split up and encoded with multiple \u,
+    -- the JSON standard is not definite: both directly printing the character
+    -- and encoding it with multiple \u is allowed. we choose the former.
+    else if 0x0020 ≤ c.val ∧ c.val ≤ 0x10ffff then
+      strCore (acc.push c)
+    else
+      fail "unexpected character in string"
 
 def str : Parsec String := strCore ""
 
diff --git a/stage0/src/Lean/Elab/Match.lean b/stage0/src/Lean/Elab/Match.lean
index 1f7947d945..8a93ba2a71 100644
--- a/stage0/src/Lean/Elab/Match.lean
+++ b/stage0/src/Lean/Elab/Match.lean
@@ -67,8 +67,14 @@ private def elabAtomicDiscr (discr : Syntax) : TermElabM Expr := do
       instantiateMVars localDecl.value
   | _ => throwErrorAt discr "unexpected discriminant"
 
+structure Discr where
+  expr : Expr
+  /-- `some h` if discriminant is annotated with the `h : ` notation. -/
+  h?  : Option Syntax := none
+  deriving Inhabited
+
 structure ElabMatchTypeAndDiscrsResult where
-  discrs    : Array Expr
+  discrs    : Array Discr
   matchType : Expr
   /- `true` when performing dependent elimination. We use this to decide whether we optimize the "match unit" case.
      See `isMatchUnit?`. -/
@@ -88,7 +94,7 @@ private partial def elabMatchTypeAndDiscrs (discrStxs : Array Syntax) (matchOptM
       return { discrs := discrs, matchType := matchType, isDep := isDep, alts := matchAltViews }
   where
     /- Easy case: elaborate discriminant when the match-type has been explicitly provided by the user.  -/
-    elabDiscrsWitMatchType (matchType : Expr) (expectedType : Expr) : TermElabM (Array Expr × Bool) := do
+    elabDiscrsWitMatchType (matchType : Expr) (expectedType : Expr) : TermElabM (Array Discr × Bool) := do
       let mut discrs := #[]
       let mut i := 0
       let mut matchType := matchType
@@ -103,7 +109,7 @@ private partial def elabMatchTypeAndDiscrs (discrStxs : Array Syntax) (matchOptM
           if b.hasLooseBVars then
             isDep := true
           matchType := b.instantiate1 discr
-          discrs := discrs.push discr
+          discrs := discrs.push { expr := discr }
         | _ =>
           throwError "invalid motive provided to match-expression, function type with arity #{discrStxs.size} expected"
       return (discrs, isDep)
@@ -112,41 +118,21 @@ private partial def elabMatchTypeAndDiscrs (discrStxs : Array Syntax) (matchOptM
       { r with isDep := true }
 
     /- Elaborate discriminants inferring the match-type -/
-    elabDiscrs (i : Nat) (discrs : Array Expr) : TermElabM ElabMatchTypeAndDiscrsResult := do
+    elabDiscrs (i : Nat) (discrs : Array Discr) : TermElabM ElabMatchTypeAndDiscrsResult := do
       if h : i < discrStxs.size then
         let discrStx := discrStxs.get ⟨i, h⟩
         let discr     ← elabAtomicDiscr discrStx
         let discr     ← instantiateMVars discr
         let discrType ← inferType discr
         let discrType ← instantiateMVars discrType
-        let discrs    := discrs.push discr
         let userName ← mkUserNameFor discr
-        if discrStx[0].isNone then
-          let mut result ← elabDiscrs (i + 1) discrs
-          let matchTypeBody ← kabstract result.matchType discr
-          if matchTypeBody.hasLooseBVars then
-            result := markIsDep result
-          return { result with matchType := Lean.mkForall userName BinderInfo.default discrType matchTypeBody }
-        else
-          let discrs := discrs.push (← mkEqRefl discr)
-          let result ← elabDiscrs (i + 1) discrs
-          let result := markIsDep result
-          let identStx := discrStx[0][0]
-          withLocalDeclD userName discrType fun x => do
-            let eqType ← mkEq discr x
-            withLocalDeclD identStx.getId eqType fun h => do
-              let matchTypeBody ← kabstract result.matchType discr
-              let matchTypeBody := matchTypeBody.instantiate1 x
-              let matchType ← mkForallFVars #[x, h] matchTypeBody
-              return { result with
-                matchType := matchType
-                alts      := result.alts.map fun altView =>
-                  if i+1 > altView.patterns.size then
-                    -- Unexpected number of patterns. The input is invalid, but we want to process whatever to provide info to users.
-                    altView
-                  else
-                    { altView with patterns := altView.patterns.insertAt (i+1) identStx }
-              }
+        let h? := if discrStx[0].isNone then none else some discrStx[0][0]
+        let discrs := discrs.push { expr := discr, h? }
+        let mut result ← elabDiscrs (i + 1) discrs
+        let matchTypeBody ← kabstract result.matchType discr
+        if matchTypeBody.hasLooseBVars then
+          result := markIsDep result
+        return { result with matchType := Lean.mkForall userName BinderInfo.default discrType matchTypeBody }
       else
         return { discrs, alts := matchAltViews, isDep := false, matchType := expectedType }
 
@@ -783,32 +769,55 @@ private def withoutAuxDiscrs (matchType : Expr) (k : TermElabM α) : TermElabM 
       toClear := toClear.push localDecl.fvarId
   withToClear toClear matchType k
 
+/--
+  Generate equalities `h : discr = pattern` for discriminants annotated with `h :`.
+  We use these equalities to elaborate the right-hand-side of a `match` alternative.
+-/
+private def withEqs (discrs : Array Discr) (patterns : List Pattern) (k : Array Expr → TermElabM α) : TermElabM α := do
+  go 0 patterns #[]
+where
+  go (i : Nat) (ps : List Pattern) (eqs : Array Expr) : TermElabM α := do
+    match ps with
+    | [] => k eqs
+    | p::ps =>
+      if h : i < discrs.size then
+        let discr := discrs.get ⟨i, h⟩
+        if let some h := discr.h? then
+          withLocalDeclD h.getId (← mkEq discr.expr (← p.toExpr)) fun eq => do
+            addTermInfo' h eq (isBinder := true)
+            go (i+1) ps (eqs.push eq)
+        else
+          go (i+1) ps eqs
+      else
+        k eqs
+
 /--
   Elaborate the `match` alternative `alt` using the given `matchType`.
   The array `toClear` contains variables that must be cleared before elaborating the `rhs` because
   they have been generalized/refined.
 -/
-private def elabMatchAltView (alt : MatchAltView) (matchType : Expr) (toClear : Array FVarId) : ExceptT PatternElabException TermElabM (AltLHS × Expr) := withRef alt.ref do
+private def elabMatchAltView (discrs : Array Discr) (alt : MatchAltView) (matchType : Expr) (toClear : Array FVarId) : ExceptT PatternElabException TermElabM (AltLHS × Expr) := withRef alt.ref do
   withoutAuxDiscrs matchType do
     let (patternVars, alt) ← collectPatternVars alt
     trace[Elab.match] "patternVars: {patternVars}"
     withPatternVars patternVars fun patternVarDecls => do
-      withElaboratedLHS alt.ref patternVarDecls alt.patterns matchType fun altLHS matchType => do
-        withLocalInstances altLHS.fvarDecls do
-          trace[Elab.match] "elabMatchAltView: {matchType}"
-          let matchType ← instantiateMVars matchType
-          -- If `matchType` is of the form `@m ...`, we create a new metavariable with the current scope.
-          -- This improves the effectiveness of the `isDefEq` default approximations
-          let matchType' ← if matchType.getAppFn.isMVar then mkFreshTypeMVar else pure matchType
-          withToClear toClear matchType' do
-            let rhs ← elabTermEnsuringType alt.rhs matchType'
-            -- We use all approximations to ensure the auxiliary type is defeq to the original one.
-            unless (← fullApproxDefEq <| isDefEq matchType' matchType) do
-              throwError "type mistmatch, alternative {← mkHasTypeButIsExpectedMsg matchType' matchType}"
-            let xs := altLHS.fvarDecls.toArray.map LocalDecl.toExpr
-            let rhs ← if xs.isEmpty then pure <| mkSimpleThunk rhs else mkLambdaFVars xs rhs
-            trace[Elab.match] "rhs: {rhs}"
-            return (altLHS, rhs)
+      withElaboratedLHS alt.ref patternVarDecls alt.patterns matchType fun altLHS matchType =>
+        withEqs discrs altLHS.patterns fun eqs =>
+          withLocalInstances altLHS.fvarDecls do
+            trace[Elab.match] "elabMatchAltView: {matchType}"
+            let matchType ← instantiateMVars matchType
+            -- If `matchType` is of the form `@m ...`, we create a new metavariable with the current scope.
+            -- This improves the effectiveness of the `isDefEq` default approximations
+            let matchType' ← if matchType.getAppFn.isMVar then mkFreshTypeMVar else pure matchType
+            withToClear toClear matchType' do
+              let rhs ← elabTermEnsuringType alt.rhs matchType'
+              -- We use all approximations to ensure the auxiliary type is defeq to the original one.
+              unless (← fullApproxDefEq <| isDefEq matchType' matchType) do
+                throwError "type mistmatch, alternative {← mkHasTypeButIsExpectedMsg matchType' matchType}"
+              let xs := altLHS.fvarDecls.toArray.map LocalDecl.toExpr ++ eqs
+              let rhs ← if xs.isEmpty then pure <| mkSimpleThunk rhs else mkLambdaFVars xs rhs
+              trace[Elab.match] "rhs: {rhs}"
+              return (altLHS, rhs)
 
 /--
   Collect problematic index for the "discriminant refinement feature". This method is invoked
@@ -825,7 +834,7 @@ where
       go (e.getArg! i) path
 
 structure GeneralizeResult where
-  discrs    : Array Expr
+  discrs    : Array Discr
   /-- `FVarId`s of the variables that have been generalized. We store them to clear after in each branch. -/
   toClear   : Array FVarId := #[]
   matchType : Expr
@@ -843,24 +852,25 @@ structure GeneralizeResult where
     but they become inaccessible since they are shadowed by the patterns variables. We assume this is ok since
     this is the exact behavior users would get if they had written it by hand. Recall there is no `clear` in term mode.
 -/
-private def generalize (discrs : Array Expr) (matchType : Expr) (altViews : Array MatchAltView) (generalizing? : Option Bool) : TermElabM GeneralizeResult := do
+private def generalize (discrs : Array Discr) (matchType : Expr) (altViews : Array MatchAltView) (generalizing? : Option Bool) : TermElabM GeneralizeResult := do
   let gen := if let some g := generalizing? then g else true
   if !gen then
     return { discrs, matchType, altViews }
   else
+    let discrExprs := discrs.map (·.expr)
     /- let-decls are currently being ignored by the generalizer. -/
-    let ysFVarIds ← getFVarsToGeneralize discrs (ignoreLetDecls := true)
+    let ysFVarIds ← getFVarsToGeneralize discrExprs (ignoreLetDecls := true)
     if ysFVarIds.isEmpty then
       return { discrs, matchType, altViews }
     else
       let ys := ysFVarIds.map mkFVar
       let matchType' ← forallBoundedTelescope matchType discrs.size fun ds type => do
         let type ← mkForallFVars ys type
-        let (discrs', ds') := Array.unzip <| Array.zip discrs ds |>.filter fun (di, d) => di.isFVar
+        let (discrs', ds') := Array.unzip <| Array.zip discrExprs ds |>.filter fun (di, d) => di.isFVar
         let type := type.replaceFVars discrs' ds'
         mkForallFVars ds type
       if (← isTypeCorrect matchType') then
-        let discrs := discrs ++ ys
+        let discrs := discrs ++  ys.map fun y => { expr := y : Discr }
         let altViews ← altViews.mapM fun altView => do
           let patternVars ← getPatternsVars altView.patterns
           -- We traverse backwards because we want to keep the most recent names.
@@ -882,27 +892,27 @@ private def generalize (discrs : Array Expr) (matchType : Expr) (altViews : Arra
         return { discrs, matchType, altViews }
 
 
-private partial def elabMatchAltViews (generalizing? : Option Bool) (discrs : Array Expr) (matchType : Expr) (altViews : Array MatchAltView) : TermElabM (Array Expr × Expr × Array (AltLHS × Expr) × Bool) := do
+private partial def elabMatchAltViews (generalizing? : Option Bool) (discrs : Array Discr) (matchType : Expr) (altViews : Array MatchAltView) : TermElabM (Array Discr × Expr × Array (AltLHS × Expr) × Bool) := do
   loop discrs #[] matchType altViews none
 where
   /-
     "Discriminant refinement" main loop.
     `first?` contains the first error message we found before updated the `discrs`. -/
-  loop (discrs : Array Expr) (toClear : Array FVarId) (matchType : Expr) (altViews : Array MatchAltView) (first? : Option (SavedState × Exception))
-      : TermElabM (Array Expr × Expr × Array (AltLHS × Expr) × Bool) := do
+  loop (discrs : Array Discr) (toClear : Array FVarId) (matchType : Expr) (altViews : Array MatchAltView) (first? : Option (SavedState × Exception))
+      : TermElabM (Array Discr × Expr × Array (AltLHS × Expr) × Bool) := do
     let s ← saveState
     let { discrs := discrs', toClear := toClear', matchType := matchType', altViews := altViews', refined } ← generalize discrs matchType altViews generalizing?
-    match (← altViews'.mapM (fun altView => elabMatchAltView altView matchType' (toClear ++ toClear')) |>.run) with
+    match (← altViews'.mapM (fun altView => elabMatchAltView discrs' altView matchType' (toClear ++ toClear')) |>.run) with
     | Except.ok alts => return (discrs', matchType', alts, first?.isSome || refined)
     | Except.error { patternIdx := patternIdx, pathToIndex := pathToIndex, ex := ex } =>
-      let some index ← getIndexToInclude? discrs[patternIdx] pathToIndex
+      let some index ← getIndexToInclude? discrs[patternIdx].expr pathToIndex
         | throwEx (← updateFirst first? ex)
       trace[Elab.match] "index to include: {index}"
-      if (← discrs.anyM fun discr => isDefEq discr index) then
+      if (← discrs.anyM fun discr => isDefEq discr.expr index) then
         throwEx (← updateFirst first? ex)
       let first ← updateFirst first? ex
       s.restore (restoreInfo := true)
-      let indices ← collectDeps #[index] discrs
+      let indices ← collectDeps #[index] (discrs.map (·.expr))
       let matchType ←
         try
           updateMatchType indices matchType
@@ -921,7 +931,7 @@ where
         else
           return mkHole ref
       let altViews  := altViews.map fun altView => { altView with patterns := wildcards ++ altView.patterns }
-      let discrs    := indices ++ discrs
+      let discrs    := (indices.map fun i => { expr := i : Discr }) ++ discrs
       let indexFVarIds := indices.filterMap fun | .fvar fvarId .. => some fvarId | _  => none
       loop discrs (toClear ++ indexFVarIds) matchType altViews first
 
@@ -1086,12 +1096,12 @@ private def elabMatchAux (generalizing? : Option Bool) (discrStxs : Array Syntax
   else
     let numDiscrs := discrs.size
     let matcherName ← mkAuxName `match
-    let matcherResult ← mkMatcher { matcherName, matchType, numDiscrs, lhss := altLHSS }
+    let matcherResult ← mkMatcher { matcherName, matchType, discrInfos := discrs.map fun discr => { hName? := discr.h?.map (·.getId) }, lhss := altLHSS }
     matcherResult.addMatcher
     let motive ← forallBoundedTelescope matchType numDiscrs fun xs matchType => mkLambdaFVars xs matchType
     reportMatcherResultErrors altLHSS matcherResult
     let r := mkApp matcherResult.matcher motive
-    let r := mkAppN r discrs
+    let r := mkAppN r (discrs.map (·.expr))
     let r := mkAppN r rhss
     trace[Elab.match] "result: {r}"
     return r
diff --git a/stage0/src/Lean/Elab/Tactic/Match.lean b/stage0/src/Lean/Elab/Tactic/Match.lean
index bdda735865..ec2fa25d20 100644
--- a/stage0/src/Lean/Elab/Tactic/Match.lean
+++ b/stage0/src/Lean/Elab/Tactic/Match.lean
@@ -15,6 +15,7 @@ structure AuxMatchTermState where
   nextIdx : Nat := 1
   «cases» : Array Syntax := #[]
 
+open Parser.Tactic in
 private def mkAuxiliaryMatchTermAux (parentTag : Name) (matchTac : Syntax) : StateT AuxMatchTermState MacroM Syntax := do
   let matchAlts := matchTac[5]
   let alts      := matchAlts[0].getArgs
@@ -33,7 +34,11 @@ private def mkAuxiliaryMatchTermAux (parentTag : Name) (matchTac : Syntax) : Sta
     else withFreshMacroScope do
       let newHole ← `(?rhs)
       let newHoleId := newHole[1]
-      let newCase ← `(tactic| case $newHoleId =>%$(alt[2]) ($holeOrTacticSeq:tacticSeq) )
+      let newCase ← `(tactic|
+        case $newHoleId =>%$(alt[2])
+          -- annotate `| ... =>` with state after `case`
+          with_annotate_state $(mkNullNode #[alt[0], alt[2]]) skip
+          $holeOrTacticSeq)
       modify fun s => { s with cases := s.cases.push newCase }
       pure <| alt.setArg 3 newHole
   let result  := matchTac.setKind ``Parser.Term.«match»
diff --git a/stage0/src/Lean/Meta/Eqns.lean b/stage0/src/Lean/Meta/Eqns.lean
index ecd593baa3..238f3074a1 100644
--- a/stage0/src/Lean/Meta/Eqns.lean
+++ b/stage0/src/Lean/Meta/Eqns.lean
@@ -80,7 +80,7 @@ private def mkSimpleEqThm (declName : Name) : MetaM (Option Name) := do
   By default, we not create equation theorems for nonrecursive definitions.
   You can use `nonRec := true` to override this behavior, a dummy `rfl` proof is created on the fly.
 -/
-def getEqnsFor? (declName : Name) (nonRec := false) : MetaM (Option (Array Name)) := do
+def getEqnsFor? (declName : Name) (nonRec := false) : MetaM (Option (Array Name)) := withLCtx {} {} do
   if let some eqs := eqnsExt.getState (← getEnv) |>.map.find? declName then
     return some eqs
   else if (← shouldGenerateEqnThms declName) then
@@ -134,7 +134,7 @@ def registerGetUnfoldEqnFn (f : GetUnfoldEqnFn) : IO Unit := do
   By default, we not create unfold theorems for nonrecursive definitions.
   You can use `nonRec := true` to override this behavior.
 -/
-def getUnfoldEqnFor? (declName : Name) (nonRec := false) : MetaM (Option Name) := do
+def getUnfoldEqnFor? (declName : Name) (nonRec := false) : MetaM (Option Name) := withLCtx {} {} do
   if (← shouldGenerateEqnThms declName) then
     for f in (← getUnfoldEqnFnsRef.get) do
       if let some r ← f declName then
diff --git a/stage0/src/Lean/Meta/IndPredBelow.lean b/stage0/src/Lean/Meta/IndPredBelow.lean
index c2eb11049f..77c1510e17 100644
--- a/stage0/src/Lean/Meta/IndPredBelow.lean
+++ b/stage0/src/Lean/Meta/IndPredBelow.lean
@@ -437,7 +437,7 @@ partial def mkBelowMatcher
   withExistingLocalDecls (lhss.foldl (init := []) fun s v => s ++ v.fvarDecls) do
     for lhs in lhss do
       trace[Meta.IndPredBelow.match] "{lhs.patterns.map (·.toMessageData)}"
-  let res ← Match.mkMatcher { matcherName, matchType, numDiscrs := (mkMatcherInput.numDiscrs + 1), lhss }
+  let res ← Match.mkMatcher { matcherName, matchType, discrInfos := mkArray (mkMatcherInput.numDiscrs + 1) {}, lhss }
   res.addMatcher
   -- if a wrong index is picked, the resulting matcher can be type-incorrect.
   -- we check here, so that errors can propagate higher up the call stack.
diff --git a/stage0/src/Lean/Meta/Match/Match.lean b/stage0/src/Lean/Meta/Match/Match.lean
index 4813dddca4..edcfecfa5e 100644
--- a/stage0/src/Lean/Meta/Match/Match.lean
+++ b/stage0/src/Lean/Meta/Match/Match.lean
@@ -17,21 +17,37 @@ import Lean.Meta.Match.CaseValues
 
 namespace Lean.Meta.Match
 
-/- The number of patterns in each AltLHS must be equal to majors.length -/
-private def checkNumPatterns (majors : Array Expr) (lhss : List AltLHS) : MetaM Unit := do
-  let num := majors.size
-  if lhss.any fun lhs => lhs.patterns.length != num then
+/-- The number of patterns in each AltLHS must be equal to the number of discriminants. -/
+private def checkNumPatterns (numDiscrs : Nat) (lhss : List AltLHS) : MetaM Unit := do
+  if lhss.any fun lhs => lhs.patterns.length != numDiscrs then
     throwError "incorrect number of patterns"
 
-/- Given a list of `AltLHS`, create a minor premise for each one, convert them into `Alt`, and then execute `k` -/
-private def withAlts {α} (motive : Expr) (lhss : List AltLHS) (k : List Alt → Array (Expr × Nat) → MetaM α) : MetaM α :=
+/--
+  Execute `k hs` where `hs` contains new equalities `h : lhs[i] = rhs[i]` for each `discrInfos[i] = some h`.
+  Assume `lhs.size == rhs.size == discrInfos.size`
+-/
+private partial def withEqs (lhs rhs : Array Expr) (discrInfos : Array DiscrInfo) (k : Array Expr → MetaM α) : MetaM α := do
+  go 0 #[]
+where
+  go (i : Nat) (hs : Array Expr) : MetaM α := do
+    if h : i < lhs.size then
+      if let some hName := discrInfos[i].hName? then
+        withLocalDeclD hName (← mkEq lhs[i] rhs[i]) fun h =>
+          go (i+1) (hs.push h)
+      else
+        go (i+1) hs
+    else
+      k hs
+/-- Given a list of `AltLHS`, create a minor premise for each one, convert them into `Alt`, and then execute `k` -/
+private def withAlts {α} (motive : Expr) (discrs : Array Expr) (discrInfos : Array DiscrInfo) (lhss : List AltLHS) (k : List Alt → Array (Expr × Nat) → MetaM α) : MetaM α :=
   loop lhss [] #[]
 where
   mkMinorType (xs : Array Expr) (lhs : AltLHS) : MetaM Expr :=
     withExistingLocalDecls lhs.fvarDecls do
       let args ← lhs.patterns.toArray.mapM (Pattern.toExpr · (annotate := true))
       let minorType := mkAppN motive args
-      mkForallFVars xs minorType
+      withEqs discrs args discrInfos fun eqs => do
+        mkForallFVars (xs ++ eqs) minorType
 
   loop (lhss : List AltLHS) (alts : List Alt) (minors : Array (Expr × Nat)) : MetaM α := do
     match lhss with
@@ -39,12 +55,13 @@ where
     | lhs::lhss =>
       let xs := lhs.fvarDecls.toArray.map LocalDecl.toExpr
       let minorType ← mkMinorType xs lhs
-      let (minorType, minorNumParams) := if !xs.isEmpty then (minorType, xs.size) else (mkSimpleThunkType minorType, 1)
+      let hasParams := !xs.isEmpty || discrInfos.any fun info => info.hName?.isSome
+      let (minorType, minorNumParams) := if hasParams then (minorType, xs.size) else (mkSimpleThunkType minorType, 1)
       let idx       := alts.length
       let minorName := (`h).appendIndexAfter (idx+1)
       trace[Meta.Match.debug] "minor premise {minorName} : {minorType}"
       withLocalDeclD minorName minorType fun minor => do
-        let rhs    := if xs.isEmpty then mkApp minor (mkConst `Unit.unit) else mkAppN minor xs
+        let rhs    := if hasParams then mkAppN minor xs else mkApp minor (mkConst `Unit.unit)
         let minors := minors.push (minor, minorNumParams)
         let fvarDecls ← lhs.fvarDecls.mapM instantiateLocalDeclMVars
         let alts   := { ref := lhs.ref, idx := idx, rhs := rhs, fvarDecls := fvarDecls, patterns := lhs.patterns : Alt } :: alts
@@ -713,7 +730,7 @@ builtin_initialize matcherExt : EnvExtension (Std.PHashMap (Expr × Bool) Name)
 
 /- Similar to `mkAuxDefinition`, but uses the cache `matcherExt`.
    It also returns an Boolean that indicates whether a new matcher function was added to the environment or not. -/
-def mkMatcherAuxDefinition (name : Name) (type : Expr) (value : Expr) : MetaM (Expr × (Option $ MatcherInfo → MetaM Unit)) := do
+def mkMatcherAuxDefinition (name : Name) (type : Expr) (value : Expr) : MetaM (Expr × Option (MatcherInfo → MetaM Unit)) := do
   trace[Meta.Match.debug] "{name} : {type} := {value}"
   let compile := bootstrap.genMatcherCode.get (← getOptions)
   let result ← Closure.mkValueTypeClosure type value (zeta := false)
@@ -743,11 +760,14 @@ def mkMatcherAuxDefinition (name : Name) (type : Expr) (value : Expr) : MetaM (E
 
 structure MkMatcherInput where
   matcherName : Name
-  matchType : Expr
-  numDiscrs : Nat
-  lhss : List Match.AltLHS
+  matchType   : Expr
+  discrInfos  : Array DiscrInfo
+  lhss        : List Match.AltLHS
 
-/-
+def MkMatcherInput.numDiscrs (m : MkMatcherInput) :=
+  m.discrInfos.size
+
+/--
 Create a dependent matcher for `matchType` where `matchType` is of the form
 `(a_1 : A_1) -> (a_2 : A_2[a_1]) -> ... -> (a_n : A_n[a_1, a_2, ... a_{n-1}]) -> B[a_1, ..., a_n]`
 where `n = numDiscrs`, and the `lhss` are the left-hand-sides of the `match`-expression alternatives.
@@ -756,29 +776,21 @@ The number of patterns must be the same in each `AltLHS`.
 The generated matcher has the structure described at `MatcherInfo`. The motive argument is of the form
 `(motive : (a_1 : A_1) -> (a_2 : A_2[a_1]) -> ... -> (a_n : A_n[a_1, a_2, ... a_{n-1}]) -> Sort v)`
 where `v` is a universe parameter or 0 if `B[a_1, ..., a_n]` is a proposition. -/
-def mkMatcher (input : MkMatcherInput) : MetaM MatcherResult :=
-  let ⟨matcherName, matchType, numDiscrs, lhss⟩ := input
-  forallBoundedTelescope matchType numDiscrs fun majors matchTypeBody => do
-  checkNumPatterns majors lhss
+def mkMatcher (input : MkMatcherInput) : MetaM MatcherResult := do
+  let ⟨matcherName, matchType, discrInfos, lhss⟩ := input
+  let numDiscrs := discrInfos.size
+  let numEqs := getNumEqsFromDiscrInfos discrInfos
+  checkNumPatterns numDiscrs lhss
+  forallBoundedTelescope matchType numDiscrs fun discrs matchTypeBody => do
   /- We generate an matcher that can eliminate using different motives with different universe levels.
      `uElim` is the universe level the caller wants to eliminate to.
      If it is not levelZero, we create a matcher that can eliminate in any universe level.
      This is useful for implementing `MatcherApp.addArg` because it may have to change the universe level. -/
   let uElim ← getLevel matchTypeBody
   let uElimGen ← if uElim == levelZero then pure levelZero else mkFreshLevelMVar
-  let motiveType ← mkForallFVars majors (mkSort uElimGen)
-  withLocalDeclD `motive motiveType fun motive => do
-  trace[Meta.Match.debug] "motiveType: {motiveType}"
-  let mvarType  := mkAppN motive majors
-  trace[Meta.Match.debug] "target: {mvarType}"
-  withAlts motive lhss fun alts minors => do
-    let mvar ← mkFreshExprMVar mvarType
-    let examples := majors.toList.map fun major => Example.var major.fvarId!
-    let (_, s) ← (process { mvarId := mvar.mvarId!, vars := majors.toList, alts := alts, examples := examples }).run {}
-    let args := #[motive] ++ majors ++ minors.map Prod.fst
-    let type ← mkForallFVars args mvarType
-    let val  ← mkLambdaFVars args mvar
+  let mkMatcher (type val : Expr) (minors : Array (Expr × Nat)) (s : State) : MetaM MatcherResult := do
     trace[Meta.Match.debug] "matcher value: {val}\ntype: {type}"
+    trace[Meta.Match.debug] "minors num params: {minors.map (·.2)}"
     /- The option `bootstrap.gen_matcher_code` is a helper hack. It is useful, for example,
        for compiling `src/Init/Data/Int`. It is needed because the compiler uses `Int.decLt`
        for generating code for `Int.casesOn` applications, but `Int.casesOn` is used to
@@ -797,22 +809,57 @@ def mkMatcher (input : MkMatcherInput) : MetaM MatcherResult :=
     discard <| isLevelDefEq uElimGen uElim
     let addMatcher :=
       match addMatcher with
-      | some addMatcher =>
+      | some addMatcher => addMatcher <|
         { numParams := matcher.getAppNumArgs
-          numDiscrs,
-          altNumParams := minors.map Prod.snd,
-          uElimPos? }
-        |> addMatcher
+          altNumParams := minors.map fun minor => minor.2 + numEqs
+          discrInfos
+          numDiscrs
+          uElimPos?
+          }
       | none => pure ()
 
     trace[Meta.Match.debug] "matcher: {matcher}"
     let unusedAltIdxs := lhss.length.fold (init := []) fun i r =>
       if s.used.contains i then r else i::r
-    pure {
+    return {
       matcher,
       counterExamples := s.counterExamples,
       unusedAltIdxs := unusedAltIdxs.reverse,
-      addMatcher }
+      addMatcher
+    }
+
+  let motiveType ← mkForallFVars discrs (mkSort uElimGen)
+  trace[Meta.Match.debug] "motiveType: {motiveType}"
+  withLocalDeclD `motive motiveType fun motive => do
+  if discrInfos.any fun info => info.hName?.isSome then
+    forallBoundedTelescope matchType numDiscrs fun discrs' matchTypeBody => do
+    let mvarType ← withEqs discrs discrs' discrInfos fun eqs => mkForallFVars eqs (mkAppN motive discrs')
+    trace[Meta.Match.debug] "target: {mvarType}"
+    withAlts motive discrs discrInfos lhss fun alts minors => do
+      let mvar ← mkFreshExprMVar mvarType
+      trace[Meta.Match.debug] "goal\n{mvar.mvarId!}"
+      let examples := discrs.toList.map fun discr => Example.var discr.fvarId!
+      let (_, s) ← (process { mvarId := mvar.mvarId!, vars := discrs'.toList, alts := alts, examples := examples }).run {}
+      let val ← mkLambdaFVars discrs' mvar
+      trace[Meta.Match.debug] "matcher\nvalue: {val}\ntype: {← inferType val}"
+      let rfls ← (discrs.zip discrInfos).filterMapM fun (discr, info) =>
+        if info.hName?.isNone then return none else return some (← mkEqRefl discr)
+      let val := mkAppN (mkAppN val discrs) rfls
+      let args := #[motive] ++ discrs ++ minors.map Prod.fst
+      let val ← mkLambdaFVars args val
+      let type ← mkForallFVars args (mkAppN motive discrs)
+      mkMatcher type val minors s
+  else
+    let mvarType  := mkAppN motive discrs
+    trace[Meta.Match.debug] "target: {mvarType}"
+    withAlts motive discrs discrInfos lhss fun alts minors => do
+      let mvar ← mkFreshExprMVar mvarType
+      let examples := discrs.toList.map fun discr => Example.var discr.fvarId!
+      let (_, s) ← (process { mvarId := mvar.mvarId!, vars := discrs.toList, alts := alts, examples := examples }).run {}
+      let args := #[motive] ++ discrs ++ minors.map Prod.fst
+      let type ← mkForallFVars args mvarType
+      let val  ← mkLambdaFVars args mvar
+      mkMatcher type val minors s
 
 def getMkMatcherInputInContext (matcherApp : MatcherApp) : MetaM MkMatcherInput := do
   let matcherName := matcherApp.matcherName
@@ -843,7 +890,7 @@ def getMkMatcherInputInContext (matcherApp : MatcherApp) : MetaM MkMatcherInput
       fvarDecls := localDecls.toList
       patterns := patterns.toList : Match.AltLHS }
 
-  return { matcherName, matchType, numDiscrs := matcherApp.discrs.size, lhss }
+  return { matcherName, matchType, discrInfos := mkArray matcherApp.discrs.size {}, lhss }
 
 
 def withMkMatcherInput
diff --git a/stage0/src/Lean/Meta/Match/MatchEqs.lean b/stage0/src/Lean/Meta/Match/MatchEqs.lean
index 4a44d4c505..c9ca541542 100644
--- a/stage0/src/Lean/Meta/Match/MatchEqs.lean
+++ b/stage0/src/Lean/Meta/Match/MatchEqs.lean
@@ -62,43 +62,60 @@ def unfoldNamedPattern (e : Expr) : MetaM Expr := do
   Meta.transform e (pre := visit)
 
 /--
-  Similar to `forallTelescopeReducing`, but eliminates arguments for named parameters and the associated
-  equation proofs. The continuation `k` takes four arguments `ys args mask type`.
+  Similar to `forallTelescopeReducing`, but
+
+  1. Eliminates arguments for named parameters and the associated equation proofs.
+
+  2. Equality parameters associated with the `h : discr` notation are replaced with `rfl` proofs.
+     Recall that this kind of parameter always occurs after the parameters correspoting to pattern variables.
+     `numNonEqParams` is the size of the prefix.
+
+  The continuation `k` takes four arguments `ys args mask type`.
   - `ys` are variables for the hypotheses that have not been eliminated.
+  - `eqs` are variables for equality hypotheses associated with discriminants annotated with `h : discr`.
   - `args` are the arguments for the alternative `alt` that has type `altType`. `ys.size <= args.size`
   - `mask[i]` is true if the hypotheses has not been eliminated. `mask.size == args.size`.
   - `type` is the resulting type for `altType`.
 
   We use the `mask` to build the splitter proof. See `mkSplitterProof`.
 -/
-partial def forallAltTelescope (altType : Expr) (k : Array Expr → Array Expr → Array Bool → Expr → MetaM α) : MetaM α := do
-  go #[] #[] #[] altType
+partial def forallAltTelescope (altType : Expr) (numNonEqParams : Nat)
+    (k : (ys : Array Expr) → (eqs : Array Expr) → (args : Array Expr) → (mask : Array Bool) → (type : Expr) → MetaM α)
+    : MetaM α := do
+  go #[] #[] #[] #[] 0 altType
 where
-  go (ys : Array Expr) (args : Array Expr) (mask : Array Bool) (type : Expr) : MetaM α := do
+  go (ys : Array Expr) (eqs : Array Expr) (args : Array Expr) (mask : Array Bool) (i : Nat) (type : Expr) : MetaM α := do
     let type ← whnfForall type
     match type with
     | Expr.forallE n d b .. =>
-      let d ← unfoldNamedPattern d
-      withLocalDeclD n d fun y => do
-        let typeNew := b.instantiate1 y
-        if let some (_, lhs, rhs) ← matchEq? d then
-          if lhs.isFVar && ys.contains lhs && args.contains lhs && isNamedPatternProof typeNew y then
-             let some i  := ys.getIdx? lhs | unreachable!
-             let ys      := ys.eraseIdx i
-             let mask    := mask.set! i false
-             let args    := args.map fun arg => if arg == lhs then rhs else arg
-             let args    := args.push (← mkEqRefl rhs)
-             let typeNew := typeNew.replaceFVar lhs rhs
-             return (← go ys args (mask.push false) typeNew)
-        go (ys.push y) (args.push y) (mask.push true) typeNew
+      if i < numNonEqParams then
+        let d ← unfoldNamedPattern d
+        withLocalDeclD n d fun y => do
+          let typeNew := b.instantiate1 y
+          if let some (_, lhs, rhs) ← matchEq? d then
+            if lhs.isFVar && ys.contains lhs && args.contains lhs && isNamedPatternProof typeNew y then
+               let some i  := ys.getIdx? lhs | unreachable!
+               let ys      := ys.eraseIdx i
+               let mask    := mask.set! i false
+               let args    := args.map fun arg => if arg == lhs then rhs else arg
+               let args    := args.push (← mkEqRefl rhs)
+               let typeNew := typeNew.replaceFVar lhs rhs
+               return (← go ys eqs args (mask.push false) (i+1) typeNew)
+          go (ys.push y) eqs (args.push y) (mask.push true) (i+1) typeNew
+      else
+        let some (_, _, rhs) ← matchEq? d | throwError "unexpected match alternative type{indentExpr altType}"
+        let arg ← mkEqRefl rhs
+        withLocalDeclD n d fun eq => do
+          let typeNew := b.instantiate1 eq
+          go ys (eqs.push eq) (args.push arg) (mask.push false) (i+1) typeNew
     | _ =>
       let type ← unfoldNamedPattern type
       /- Recall that alternatives that do not have variables have a `Unit` parameter to ensure
          they are not eagerly evaluated. -/
       if ys.size == 1 then
         if (← inferType ys[0]).isConstOf ``Unit && !(← dependsOn type ys[0].fvarId!) then
-          return (← k #[] #[mkConst ``Unit.unit] #[false] type)
-      k ys args mask type
+          return (← k #[] #[] #[mkConst ``Unit.unit] #[false] type)
+      k ys eqs args mask type
 
   isNamedPatternProof (type : Expr) (h : Expr) : Bool :=
     Option.isSome <| type.find? fun e =>
@@ -258,16 +275,17 @@ private def substSomeVar (mvarId : MVarId) : MetaM (Array MVarId) := withMVarCon
 /--
   Helper method for proving a conditional equational theorem associated with an alternative of
   the `match`-eliminator `matchDeclName`. `type` contains the type of the theorem. -/
-partial def proveCondEqThm (matchDeclName : Name) (type : Expr) : MetaM Expr := do
+partial def proveCondEqThm (matchDeclName : Name) (type : Expr) : MetaM Expr := withLCtx {} {} do
   let type ← instantiateMVars type
-  withLCtx {} {} <| forallTelescope type fun ys target => do
+  forallTelescope type fun ys target => do
     let mvar0  ← mkFreshExprSyntheticOpaqueMVar target
+    trace[Meta.Match.matchEqs] "proveCondEqThm {mvar0.mvarId!}"
     let mvarId ← deltaTarget mvar0.mvarId! (· == matchDeclName)
-    trace[Meta.Match.matchEqs] "{MessageData.ofGoal mvarId}"
     withDefault <| go mvarId 0
     mkLambdaFVars ys (← instantiateMVars mvar0)
 where
   go (mvarId : MVarId) (depth : Nat) : MetaM Unit := withIncRecDepth do
+    trace[Meta.Match.matchEqs] "proveCondEqThm.go {mvarId}"
     let mvarId' ← modifyTargetEqLHS mvarId whnfCore
     let mvarId := mvarId'
     let subgoals ←
@@ -341,6 +359,7 @@ private def injectionAny (mvarId : MVarId) : MetaM InjectionAnyResult :=
   - `altNews` are the new free variables which contains aditional hypotheses that ensure they are only used
      when the previous overlapping alternatives are not applicable. -/
 private partial def mkSplitterProof (matchDeclName : Name) (template : Expr) (alts altsNew : Array Expr)
+    (altsNewNumParams : Array Nat)
     (altArgMasks : Array (Array Bool)) : MetaM Expr := do
   trace[Meta.Match.matchEqs] "proof template: {template}"
   let map := mkMap
@@ -350,25 +369,26 @@ private partial def mkSplitterProof (matchDeclName : Name) (template : Expr) (al
     proveSubgoal mvarId
   instantiateMVars proof
 where
-  mkMap : FVarIdMap (Expr × Array Bool) := Id.run do
+  mkMap : FVarIdMap (Expr × Nat × Array Bool) := Id.run do
     let mut m := {}
-    for alt in alts, altNew in altsNew, argMask in altArgMasks do
-      m := m.insert alt.fvarId! (altNew, argMask)
+    for alt in alts, altNew in altsNew, numParams in altsNewNumParams, argMask in altArgMasks do
+      m := m.insert alt.fvarId! (altNew, numParams, argMask)
     return m
 
-  convertTemplate (m : FVarIdMap (Expr × Array Bool)) : StateRefT (Array MVarId) MetaM Expr :=
+  convertTemplate (m : FVarIdMap (Expr × Nat × Array Bool)) : StateRefT (Array MVarId) MetaM Expr :=
     transform template fun e => do
       match e.getAppFn with
       | Expr.fvar fvarId .. =>
         match m.find? fvarId with
-        | some (altNew, argMask) =>
+        | some (altNew, numParams, argMask) =>
           trace[Meta.Match.matchEqs] ">> {e}, {altNew}"
           let mut newArgs := #[]
           for arg in e.getAppArgs, includeArg in argMask do
             if includeArg then
               newArgs := newArgs.push arg
           let eNew := mkAppN altNew newArgs
-          let (mvars, _, _) ← forallMetaTelescopeReducing (← inferType eNew) (kind := MetavarKind.syntheticOpaque)
+          /- Recall that `numParams` does not include the equalities associated with discriminants of the form `h : discr`. -/
+          let (mvars, _, _) ← forallMetaBoundedTelescope (← inferType eNew) (numParams - newArgs.size) (kind := MetavarKind.syntheticOpaque)
           modify fun s => s ++ (mvars.map (·.mvarId!))
           let eNew := mkAppN eNew mvars
           return TransformStep.done eNew
@@ -395,15 +415,37 @@ where
     let mvarId ← tryClearMany mvarId (alts.map (·.fvarId!))
     proveSubgoalLoop mvarId
 
+/--
+  Create new alternatives (aka minor premises) by replacing `discrs` with `patterns` at `alts`.
+  Recall that `alts` depends on `discrs` when `numDiscrEqs > 0`, where `numDiscrEqs` is the number of discriminants
+  annotated with `h : discr`.
+-/
+private partial def withNewAlts (numDiscrEqs : Nat) (discrs : Array Expr) (patterns : Array Expr) (alts : Array Expr) (k : Array Expr → MetaM α) : MetaM α :=
+  if numDiscrEqs == 0 then
+    k alts
+  else
+    go 0 #[]
+where
+  go (i : Nat) (altsNew : Array Expr) : MetaM α := do
+   if h : i < alts.size then
+     let alt := alts.get ⟨i, h⟩
+     let altLocalDecl ← getFVarLocalDecl alt
+     let typeNew := altLocalDecl.type.replaceFVars discrs patterns
+     withLocalDecl altLocalDecl.userName altLocalDecl.binderInfo typeNew fun altNew =>
+       go (i+1) (altsNew.push altNew)
+   else
+     k altsNew
+
 /--
   Create conditional equations and splitter for the given match auxiliary declaration. -/
-private partial def mkEquationsFor (matchDeclName : Name) :  MetaM MatchEqns := do
+private partial def mkEquationsFor (matchDeclName : Name) :  MetaM MatchEqns := withLCtx {} {} do
   trace[Meta.Match.matchEqs] "mkEquationsFor '{matchDeclName}'"
   withConfig (fun c => { c with etaStruct := .none }) do
   let baseName := mkPrivateName (← getEnv) matchDeclName
   let constInfo ← getConstInfo matchDeclName
   let us := constInfo.levelParams.map mkLevelParam
   let some matchInfo ← getMatcherInfo? matchDeclName | throwError "'{matchDeclName}' is not a matcher function"
+  let numDiscrEqs := getNumEqsFromDiscrInfos matchInfo.discrInfos
   forallTelescopeReducing constInfo.type fun xs matchResultType => do
     let mut eqnNames := #[]
     let params := xs[:matchInfo.numParams]
@@ -416,10 +458,12 @@ private partial def mkEquationsFor (matchDeclName : Name) :  MetaM MatchEqns :=
     let mut splitterAltTypes := #[]
     let mut splitterAltNumParams := #[]
     let mut altArgMasks := #[] -- masks produced by `forallAltTelescope`
-    for alt in alts do
+    for i in [:alts.size] do
+      let altNumParams := matchInfo.altNumParams[i]
+      let altNonEqNumParams := altNumParams - numDiscrEqs
       let thmName := baseName ++ ((`eq).appendIndexAfter idx)
       eqnNames := eqnNames.push thmName
-      let (notAlt, splitterAltType, splitterAltNumParam, argMask) ← forallAltTelescope (← inferType alt) fun ys rhsArgs argMask altResultType => do
+      let (notAlt, splitterAltType, splitterAltNumParam, argMask) ← forallAltTelescope (← inferType alts[i]) altNonEqNumParams fun ys eqs rhsArgs argMask altResultType => do
         let patterns := altResultType.getAppArgs
         let mut hs := #[]
         for notAlt in notAlts do
@@ -427,7 +471,7 @@ private partial def mkEquationsFor (matchDeclName : Name) :  MetaM MatchEqns :=
           if let some h ← simpH? h patterns.size then
             hs := hs.push h
         trace[Meta.Match.matchEqs] "hs: {hs}"
-        let splitterAltType ← mkForallFVars ys (← hs.foldrM (init := altResultType) mkArrow)
+        let splitterAltType ← mkForallFVars ys (← hs.foldrM (init := (← mkForallFVars eqs altResultType)) mkArrow)
         let splitterAltNumParam := hs.size + ys.size
         -- Create a proposition for representing terms that do not match `patterns`
         let mut notAlt := mkConst ``False
@@ -437,20 +481,24 @@ private partial def mkEquationsFor (matchDeclName : Name) :  MetaM MatchEqns :=
           else
             notAlt ← mkArrow (← mkHEq discr pattern) notAlt
         notAlt ← mkForallFVars (discrs ++ ys) notAlt
-        let lhs := mkAppN (mkConst constInfo.name us) (params ++ #[motive] ++ patterns ++ alts)
-        let rhs := mkAppN alt rhsArgs
-        let thmType ← mkEq lhs rhs
-        let thmType ← hs.foldrM (init := thmType) mkArrow
-        let thmType ← mkForallFVars (params ++ #[motive] ++ alts ++ ys) thmType
-        let thmType ← unfoldNamedPattern thmType
-        let thmVal ← proveCondEqThm matchDeclName thmType
-        addDecl <| Declaration.thmDecl {
-          name        := thmName
-          levelParams := constInfo.levelParams
-          type        := thmType
-          value       := thmVal
-        }
-        return (notAlt, splitterAltType, splitterAltNumParam, argMask)
+        /- Recall that when we use the `h : discr`, the alternative type depends on the discriminant.
+           Thus, we need to create new `alts`. -/
+        withNewAlts numDiscrEqs discrs patterns alts fun alts => do
+          let alt := alts[i]
+          let lhs := mkAppN (mkConst constInfo.name us) (params ++ #[motive] ++ patterns ++ alts)
+          let rhs := mkAppN alt rhsArgs
+          let thmType ← mkEq lhs rhs
+          let thmType ← hs.foldrM (init := thmType) mkArrow
+          let thmType ← mkForallFVars (params ++ #[motive] ++ ys ++ alts) thmType
+          let thmType ← unfoldNamedPattern thmType
+          let thmVal ← proveCondEqThm matchDeclName thmType
+          addDecl <| Declaration.thmDecl {
+            name        := thmName
+            levelParams := constInfo.levelParams
+            type        := thmType
+            value       := thmVal
+          }
+          return (notAlt, splitterAltType, splitterAltNumParam, argMask)
       notAlts := notAlts.push notAlt
       splitterAltTypes := splitterAltTypes.push splitterAltType
       splitterAltNumParams := splitterAltNumParams.push splitterAltNumParam
@@ -464,7 +512,8 @@ private partial def mkEquationsFor (matchDeclName : Name) :  MetaM MatchEqns :=
       trace[Meta.Match.matchEqs] "splitterType: {splitterType}"
       let template := mkAppN (mkConst constInfo.name us) (params ++ #[motive] ++ discrs ++ alts)
       let template ← deltaExpand template (· == constInfo.name)
-      let splitterVal ← mkLambdaFVars splitterParams (← mkSplitterProof matchDeclName template alts altsNew altArgMasks)
+      let template := template.headBeta
+      let splitterVal ← mkLambdaFVars splitterParams (← mkSplitterProof matchDeclName template alts altsNew splitterAltNumParams altArgMasks)
       let splitterName := baseName ++ `splitter
       addDecl <| Declaration.thmDecl {
         name        := splitterName
diff --git a/stage0/src/Lean/Meta/Match/MatcherInfo.lean b/stage0/src/Lean/Meta/Match/MatcherInfo.lean
index c06a762635..8d592fabe9 100644
--- a/stage0/src/Lean/Meta/Match/MatcherInfo.lean
+++ b/stage0/src/Lean/Meta/Match/MatcherInfo.lean
@@ -8,6 +8,11 @@ import Lean.Meta.Basic
 namespace Lean.Meta
 namespace Match
 
+structure DiscrInfo where
+  /-- `some h` if the discriminant is annotated with `h:` -/
+  hName? : Option Name := none
+  deriving Inhabited
+
 /--
 A "matcher" auxiliary declaration has the following structure:
 - `numParams` parameters
@@ -18,10 +23,14 @@ A "matcher" auxiliary declaration has the following structure:
    `pos` is the position of the universe level parameter that specifies the elimination universe.
    It is `none` if the matcher only eliminates into `Prop`. -/
 structure MatcherInfo where
-  numParams : Nat
-  numDiscrs : Nat
+  numParams    : Nat
+  numDiscrs    : Nat
   altNumParams : Array Nat
-  uElimPos? : Option Nat
+  uElimPos?    : Option Nat
+  /--
+    `discrInfos[i] = { hName? := some h }` if the i-th discriminant was annotated with `h :`.
+  -/
+  discrInfos   : Array DiscrInfo
 
 def MatcherInfo.numAlts (info : MatcherInfo) : Nat :=
   info.altNumParams.size
@@ -38,6 +47,16 @@ def MatcherInfo.getFirstAltPos (info : MatcherInfo) : Nat :=
 def MatcherInfo.getMotivePos (info : MatcherInfo) : Nat :=
   info.numParams
 
+def getNumEqsFromDiscrInfos (infos : Array DiscrInfo) : Nat := Id.run do
+  let mut r := 0
+  for info in infos do
+    if info.hName?.isSome then
+      r := r + 1
+  return r
+
+def MatcherInfo.getNumDiscrEqs (info : MatcherInfo) : Nat :=
+  getNumEqsFromDiscrInfos info.discrInfos
+
 namespace Extension
 
 structure Entry where
diff --git a/stage0/src/Lean/Meta/Tactic/Simp/SimpTheorems.lean b/stage0/src/Lean/Meta/Tactic/Simp/SimpTheorems.lean
index a09735275c..f41f1f5196 100644
--- a/stage0/src/Lean/Meta/Tactic/Simp/SimpTheorems.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp/SimpTheorems.lean
@@ -76,7 +76,6 @@ mutual
 end
 
 def isRflProof (proof : Expr) : MetaM Bool := do
-  trace[Meta.debug] "isRflProof: {proof}"
   if let .const declName .. := proof then
     isRflTheorem declName
   else
@@ -383,17 +382,16 @@ where
       else
         return none
 
-def SimpTheorems.addDeclToUnfold (d : SimpTheorems) (declName : Name) : MetaM SimpTheorems :=
-  withLCtx {} {} do
-    if let some eqns ← getEqnsFor? declName then
-      let mut d := d
-      for eqn in eqns do
-        d ← SimpTheorems.addConst d eqn
-      if hasSmartUnfoldingDecl (← getEnv) declName then
-        d := d.addDeclToUnfoldCore declName
-      return d
-    else
-      return d.addDeclToUnfoldCore declName
+def SimpTheorems.addDeclToUnfold (d : SimpTheorems) (declName : Name) : MetaM SimpTheorems := do
+  if let some eqns ← getEqnsFor? declName then
+    let mut d := d
+    for eqn in eqns do
+      d ← SimpTheorems.addConst d eqn
+    if hasSmartUnfoldingDecl (← getEnv) declName then
+      d := d.addDeclToUnfoldCore declName
+    return d
+  else
+    return d.addDeclToUnfoldCore declName
 
 abbrev SimpTheoremsArray := Array SimpTheorems
 
diff --git a/stage0/src/Lean/Parser/Term.lean b/stage0/src/Lean/Parser/Term.lean
index 254c7ffbab..1e3b9413a0 100644
--- a/stage0/src/Lean/Parser/Term.lean
+++ b/stage0/src/Lean/Parser/Term.lean
@@ -144,7 +144,7 @@ def matchAltExpr := matchAlt
 def matchAlts (rhsParser : Parser := termParser) : Parser :=
   leading_parser withPosition $ many1Indent (ppLine >> matchAlt rhsParser)
 
-def matchDiscr := leading_parser optional (atomic (ident >> ":")) >> termParser
+def matchDiscr := leading_parser optional (atomic (ident >> " : ")) >> termParser
 
 def trueVal  := leading_parser nonReservedSymbol "true"
 def falseVal := leading_parser nonReservedSymbol "false"
diff --git a/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean b/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean
index 388264ca96..641d998556 100644
--- a/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean
+++ b/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean
@@ -383,27 +383,34 @@ def delabAppMatch : Delab := whenPPOption getPPNotation <| whenPPOption getPPMat
       return { matcherTy := (← getConstInfo c).instantiateTypeLevelParams us, info := info : AppMatchState })
     (fun st => do
       if st.params.size < st.info.numParams then
-        pure { st with params := st.params.push (← getExpr) }
+        return { st with params := st.params.push (← getExpr) }
       else if st.motive.isNone then
-         -- store motive argument separately
-         let lamMotive ← getExpr
-         let piMotive ← lambdaTelescope lamMotive fun xs body => mkForallFVars xs body
-         -- TODO: pp.analyze has not analyzed `piMotive`, only `lamMotive`
-         -- Thus the binder types won't have any annotations
-         let piStx ← withTheReader SubExpr (fun cfg => { cfg with expr := piMotive }) delab
-         let named ← getPPOption getPPAnalysisNamedArg
-         pure { st with motive := (piStx, lamMotive), motiveNamed := named }
+        -- store motive argument separately
+        let lamMotive ← getExpr
+        let piMotive ← lambdaTelescope lamMotive fun xs body => mkForallFVars xs body
+        -- TODO: pp.analyze has not analyzed `piMotive`, only `lamMotive`
+        -- Thus the binder types won't have any annotations
+        let piStx ← withTheReader SubExpr (fun cfg => { cfg with expr := piMotive }) delab
+        let named ← getPPOption getPPAnalysisNamedArg
+        return { st with motive := (piStx, lamMotive), motiveNamed := named }
       else if st.discrs.size < st.info.numDiscrs then
-        pure { st with discrs := st.discrs.push (← delab) }
+        let idx := st.discrs.size
+        let discr ← delab
+        if let some hName := st.info.discrInfos[idx].hName? then
+          -- TODO: we should check whether the corresponding binder name, matches `hName`.
+          -- If it does not we should pretty print this `match` as a regular application.
+          return { st with discrs := st.discrs.push (← `(matchDiscr| $(mkIdent hName):ident : $discr:term)) }
+        else
+          return { st with discrs := st.discrs.push (← `(matchDiscr| $discr:term)) }
       else if st.rhss.size < st.info.altNumParams.size then
         /- We save the variables names here to be able to implement safe_shadowing.
            The pattern delaboration must use the names saved here. -/
         let (varNames, rhs) ← skippingBinders st.info.altNumParams[st.rhss.size] fun varNames => do
           let rhs ← delab
           return (varNames, rhs)
-        pure { st with rhss := st.rhss.push rhs, varNames := st.varNames.push varNames }
+        return { st with rhss := st.rhss.push rhs, varNames := st.varNames.push varNames }
       else
-        pure { st with moreArgs := st.moreArgs.push (← delab) })
+        return { st with moreArgs := st.moreArgs.push (← delab) })
 
   if st.discrs.size < st.info.numDiscrs || st.rhss.size < st.info.altNumParams.size then
     -- underapplied
@@ -421,9 +428,9 @@ def delabAppMatch : Delab := whenPPOption getPPNotation <| whenPPOption getPPMat
       let opts ← getOptions
       -- TODO: disable the match if other implicits are needed?
       if ← pure st.motiveNamed <||> shouldShowMotive lamMotive opts then
-        `(match (motive := $piStx) $[$st.discrs:term],* with $[| $pats,* => $st.rhss]*)
+        `(match (motive := $piStx) $[$st.discrs:matchDiscr],* with $[| $pats,* => $st.rhss]*)
       else
-        `(match $[$st.discrs:term],* with $[| $pats,* => $st.rhss]*)
+        `(match $[$st.discrs:matchDiscr],* with $[| $pats,* => $st.rhss]*)
     return Syntax.mkApp stx st.moreArgs
 
 /--
diff --git a/stage0/src/Lean/PrettyPrinter/Formatter.lean b/stage0/src/Lean/PrettyPrinter/Formatter.lean
index 519dfdbd6b..216ded06ab 100644
--- a/stage0/src/Lean/PrettyPrinter/Formatter.lean
+++ b/stage0/src/Lean/PrettyPrinter/Formatter.lean
@@ -234,6 +234,8 @@ def categoryFormatterCore (cat : Name) : Formatter := do
       -- format only last choice
       -- TODO: We could use elaborator data here to format the chosen child when available
       formatterForKind (← getCur).getKind
+  else if cat == `rawStx then
+    withAntiquot.formatter (mkAntiquot.formatter' cat.toString none) (push stx.formatStx *> goLeft)
   else
     withAntiquot.formatter (mkAntiquot.formatter' cat.toString none) (formatterForKind stx.getKind)
   modify fun st => { st with mustBeGrouped := true, isUngrouped := !st.mustBeGrouped }
diff --git a/stage0/src/Lean/PrettyPrinter/Parenthesizer.lean b/stage0/src/Lean/PrettyPrinter/Parenthesizer.lean
index 134e58cb90..0f9b3cf148 100644
--- a/stage0/src/Lean/PrettyPrinter/Parenthesizer.lean
+++ b/stage0/src/Lean/PrettyPrinter/Parenthesizer.lean
@@ -350,6 +350,10 @@ def level.parenthesizer : CategoryParenthesizer | prec => do
   maybeParenthesize `level false (fun stx => Unhygienic.run `(level|($stx))) prec $
     parenthesizeCategoryCore `level prec
 
+@[builtinCategoryParenthesizer rawStx]
+def rawStx.parenthesizer : CategoryParenthesizer | _ => do
+  goLeft
+
 @[combinatorParenthesizer Lean.Parser.error]
 def error.parenthesizer (msg : String) : Parenthesizer :=
   pure ()
diff --git a/stage0/src/runtime/stack_overflow.cpp b/stage0/src/runtime/stack_overflow.cpp
index 74a49058ba..0e5656d61b 100644
--- a/stage0/src/runtime/stack_overflow.cpp
+++ b/stage0/src/runtime/stack_overflow.cpp
@@ -73,7 +73,8 @@ bool is_within_stack_guard(void * addr) {
 
 extern "C" LEAN_EXPORT void segv_handler(int signum, siginfo_t * info, void *) {
     if (is_within_stack_guard(info->si_addr)) {
-        fprintf(stderr, "\nStack overflow detected. Aborting.\n");
+        char const msg[] = "\nStack overflow detected. Aborting.\n";
+        write(STDERR_FILENO, msg, sizeof(msg) - 1);
         abort();
     } else {
         // reset signal handler and return; see comments in Rust code
diff --git a/stage0/stdlib/Init/Data/Array/Subarray.c b/stage0/stdlib/Init/Data/Array/Subarray.c
index 6ac1d026cf..21f40ac24e 100644
--- a/stage0/stdlib/Init/Data/Array/Subarray.c
+++ b/stage0/stdlib/Init/Data/Array/Subarray.c
@@ -25,6 +25,8 @@ lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__15;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__18;
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__9;
+LEAN_EXPORT lean_object* l_Subarray_get_x21(lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_getD___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at_Array_ofSubarray___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__5;
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Subarray_any___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
@@ -40,6 +42,7 @@ LEAN_EXPORT lean_object* l_Std_Format_joinSep___at_instReprSubarray___spec__1(le
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_forM___spec__1___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__2;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Subarray_any___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_size___rarg___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_foldr(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__1;
@@ -58,6 +61,7 @@ static lean_object* l_Array_term_____x5b___x3a___x5d___closed__23;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__14;
 LEAN_EXPORT lean_object* l_Subarray_forM(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_getD(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_instReprSubarray___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b_x3a___x5d__1(lean_object*, lean_object*, lean_object*);
@@ -81,10 +85,12 @@ static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__
 LEAN_EXPORT lean_object* l_Subarray_popFront(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__13;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__19;
+LEAN_EXPORT lean_object* l_Subarray_size(lean_object*);
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__12;
 LEAN_EXPORT lean_object* l_instReprSubarray___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_popFront___rarg(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b_x3a___x5d__1___closed__2;
+lean_object* lean_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_anyM(lean_object*, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__6;
 LEAN_EXPORT lean_object* l_Subarray_all___rarg___boxed(lean_object*, lean_object*);
@@ -112,19 +118,23 @@ LEAN_EXPORT lean_object* l_Subarray_forInUnsafe(lean_object*, lean_object*, lean
 lean_object* l_Array_foldlMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b_x3a___x5d__1___closed__1;
 static lean_object* l_instReprSubarray___rarg___closed__11;
+LEAN_EXPORT lean_object* l_Subarray_get_x21___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_term_____x5b___x3a___x5d;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b_x3a___x5d__1___closed__4;
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_foldl___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_get(lean_object*);
 lean_object* l_List_toString___rarg(lean_object*, lean_object*);
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__11;
+LEAN_EXPORT lean_object* l_Subarray_get___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_foldl(lean_object*, lean_object*);
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__16;
 LEAN_EXPORT lean_object* l_Subarray_all(lean_object*);
 static lean_object* l_instReprSubarray___rarg___closed__6;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Subarray_allM___spec__1___rarg___lambda__1(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Subarray_foldr___rarg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_getOp___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_ofSubarray(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__13;
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__24;
@@ -133,6 +143,7 @@ static lean_object* l_Array_term_____x5b_x3a___x5d___closed__4;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__6;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__21;
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_getD___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_term_____x5b_x3a___x5d___closed__2;
 LEAN_EXPORT lean_object* l_Array_extract(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__9;
@@ -150,6 +161,7 @@ LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Subarray_all___spec__1(lean
 LEAN_EXPORT lean_object* l_Subarray_foldrM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__7;
 static lean_object* l_Array_term_____x5b_x3a___x5d___closed__1;
+LEAN_EXPORT lean_object* l_Subarray_getOp(lean_object*);
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__20;
 static lean_object* l_instReprSubarray___rarg___closed__5;
 LEAN_EXPORT lean_object* l_instAppendSubarray___rarg(lean_object*, lean_object*);
@@ -162,6 +174,7 @@ static lean_object* l_instReprSubarray___rarg___closed__3;
 LEAN_EXPORT lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_instAppendSubarray(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__12;
+LEAN_EXPORT lean_object* l_Subarray_get_x21___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__11;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__2(lean_object*, lean_object*);
@@ -171,9 +184,11 @@ LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Subarray_allM___spec__1___r
 LEAN_EXPORT lean_object* l_Subarray_instForInSubarray(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__4;
 static lean_object* l_Array_term_____x5b_x3a___x5d___closed__6;
+LEAN_EXPORT lean_object* l_Subarray_getOp___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_instToStringSubarray___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_get___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_foldr___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_term_____x5b_x3a___x5d;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__17;
@@ -216,6 +231,7 @@ static lean_object* l_instReprSubarray___rarg___closed__13;
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__18;
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__5;
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__11;
+LEAN_EXPORT lean_object* l_Subarray_size___rarg(lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a___x5d__1___closed__12;
 LEAN_EXPORT lean_object* l_Subarray_allM(lean_object*, lean_object*);
 static lean_object* l_Array_term_____x5b___x3a___x5d___closed__3;
@@ -230,6 +246,168 @@ static lean_object* l_Array_term_____x5b___x3a___x5d___closed__14;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 static lean_object* l_Array___aux__Init__Data__Array__Subarray______macroRules__Array__term_____x5b___x3a_x5d__1___closed__9;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_foldl___spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Subarray_size___rarg(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_2 = lean_ctor_get(x_1, 2);
+x_3 = lean_ctor_get(x_1, 1);
+x_4 = lean_nat_sub(x_2, x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_size(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Subarray_size___rarg___boxed), 1, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_size___rarg___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Subarray_size___rarg(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_get___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; 
+x_3 = lean_ctor_get(x_1, 0);
+x_4 = lean_ctor_get(x_1, 1);
+x_5 = lean_nat_add(x_4, x_2);
+x_6 = lean_array_fget(x_3, x_5);
+lean_dec(x_5);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_get(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Subarray_get___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_get___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Subarray_get___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_getD___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = l_Subarray_size___rarg(x_1);
+x_5 = lean_nat_dec_lt(x_2, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
+{
+lean_inc(x_3);
+return x_3;
+}
+else
+{
+lean_object* x_6; 
+x_6 = l_Subarray_get___rarg(x_1, x_2);
+return x_6;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_getD(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Subarray_getD___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_getD___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Subarray_getD___rarg(x_1, x_2, x_3);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_get_x21___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = l_Subarray_size___rarg(x_2);
+x_5 = lean_nat_dec_lt(x_3, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
+{
+lean_inc(x_1);
+return x_1;
+}
+else
+{
+lean_object* x_6; 
+x_6 = l_Subarray_get___rarg(x_2, x_3);
+return x_6;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_get_x21(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Subarray_get_x21___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_get_x21___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Subarray_get_x21___rarg(x_1, x_2, x_3);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_getOp___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Subarray_get_x21___rarg(x_1, x_2, x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_getOp(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Subarray_getOp___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Subarray_getOp___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Subarray_getOp___rarg(x_1, x_2, x_3);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_Subarray_popFront___rarg(lean_object* x_1) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Meta.c b/stage0/stdlib/Init/Meta.c
index f12ef55925..2dd16a2b14 100644
--- a/stage0/stdlib/Init/Meta.c
+++ b/stage0/stdlib/Init/Meta.c
@@ -49,7 +49,6 @@ static lean_object* l___private_Init_Meta_0__Lean_Meta_reprEtaStructMode____x40_
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__7;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_updateFirst___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__89;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__23;
 LEAN_EXPORT uint8_t l_Lean_Meta_DSimp_Config_decide___default;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeDecimalLitAux___boxed(lean_object*, lean_object*, lean_object*);
@@ -61,6 +60,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeAfterExp
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_mkSepArray___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__5;
 LEAN_EXPORT uint8_t lean_is_inaccessible_user_name(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__6;
 static lean_object* l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__2;
 static lean_object* l_Lean_versionString___closed__1;
@@ -83,12 +83,12 @@ LEAN_EXPORT uint8_t l_Lean_Meta_DSimp_Config_autoUnfold___default;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_updateFirst___at_Lean_Syntax_setHeadInfoAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__21;
 static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__14;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__12;
 extern lean_object* l_Lean_nullKind;
 LEAN_EXPORT lean_object* l_Lean_Syntax_getSepArgs___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__38;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpArith___closed__8;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__12;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__7;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexDigit(lean_object*, lean_object*);
@@ -160,6 +160,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeAfterDot
 LEAN_EXPORT lean_object* l_Lean_Syntax_toNat___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpArith___closed__6;
 LEAN_EXPORT uint8_t l_Lean_Meta_Simp_Config_memoize___default;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__4;
 static lean_object* l_Lean_toolchain___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Syntax_getHead_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1(lean_object*, lean_object*, lean_object*);
@@ -184,9 +185,11 @@ LEAN_EXPORT lean_object* l_Lean___aux__Init__Meta______macroRules__Lean__termEva
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___lambda__2___closed__1;
 static lean_object* l_repr___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__3___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__42;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__4;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__63;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__7;
 lean_object* lean_string_utf8_prev(lean_object*, lean_object*);
@@ -201,7 +204,6 @@ static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__12;
 static lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__5;
 lean_object* l_id___rarg___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeOctalLitAux(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__17;
 static lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__3;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_findAux___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -212,8 +214,8 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_getHead_x3f__
 uint8_t l_Char_isDigit(uint32_t);
 LEAN_EXPORT lean_object* l_Lean_Name_reprPrec(lean_object*, lean_object*);
 static lean_object* l_Lean_instQuoteBool___closed__7;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__4;
 LEAN_EXPORT lean_object* l_Lean_Name_escapePart(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__2;
 LEAN_EXPORT lean_object* l_Lean_withHeadRefOnly___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeExp(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -224,7 +226,6 @@ static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__16;
 static lean_object* l_Lean_Parser_Tactic_dsimpKind___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeBinLitAux(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
 LEAN_EXPORT uint32_t l_Lean_idEndEscape;
 LEAN_EXPORT lean_object* l_Lean_Syntax_SepArray_instCoeTailSepArrayArraySyntax(lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprEtaStructMode____x40_Init_Meta___hyg_8712____closed__6;
@@ -244,10 +245,12 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 LEAN_EXPORT uint8_t l_Lean_isIdBeginEscape(uint32_t);
 static lean_object* l_List_foldr___at_Lean_Syntax_decodeNameLit___spec__1___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_EtaStructMode_toCtorIdx(uint8_t);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6;
 LEAN_EXPORT uint8_t l_Lean_Name_escapePart___lambda__1(uint32_t);
 static lean_object* l_Lean_instQuoteProd___rarg___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Syntax_mkScientificLit(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__54;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___closed__1;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__62;
 extern lean_object* l_Lean_Parser_Tactic_config;
@@ -257,12 +260,10 @@ static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Me
 static lean_object* l_Lean_Parser_Tactic_dsimpKind___closed__9;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__79;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__9;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8;
 LEAN_EXPORT lean_object* l___private_Init_Data_String_Basic_0__Substring_takeWhileAux___at___private_Init_Meta_0__Lean_Syntax_splitNameLitAux___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpAllArith___closed__6;
 LEAN_EXPORT lean_object* l_Lean_isIdFirst___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux___at_Array_filterSepElems___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprTransparencyMode____x40_Init_Meta___hyg_8545____closed__3;
 lean_object* lean_array_push(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Name_toString___boxed(lean_object*, lean_object*);
@@ -271,7 +272,7 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__27;
 static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__7;
 lean_object* lean_string_append(lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 static lean_object* l_Lean_Parser_Tactic_dsimpKind___closed__4;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__47;
@@ -279,7 +280,6 @@ LEAN_EXPORT lean_object* l_Lean_version_getSpecialDesc___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__90;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexDigit___boxed(lean_object*, lean_object*);
 lean_object* lean_get_githash(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_setTailInfo(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__6;
 LEAN_EXPORT lean_object* l_Lean_instQuoteArray(lean_object*);
@@ -300,10 +300,10 @@ lean_object* l___private_Init_Data_Repr_0__reprSourceInfo____x40_Init_Data_Repr_
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__13;
 static lean_object* l_repr___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__3___closed__9;
 LEAN_EXPORT lean_object* l_Array_filterSepElemsM___at_Array_filterSepElems___spec__1(lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__2;
 LEAN_EXPORT uint8_t l_Lean_Meta_Simp_Config_contextual___default;
 LEAN_EXPORT lean_object* l_Lean_Meta_TransparencyMode_toCtorIdx(uint8_t);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__11;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__23;
 LEAN_EXPORT lean_object* l_Lean_instQuoteList___rarg(lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
@@ -335,10 +335,10 @@ LEAN_EXPORT lean_object* l_Lean_withHeadRefOnly___rarg___lambda__1(lean_object*,
 LEAN_EXPORT lean_object* l_Lean_instQuoteBool___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__36;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__25;
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_version_specialDesc;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprTransparencyMode____x40_Init_Meta___hyg_8545____closed__7;
 static lean_object* l_Lean_Parser_Tactic_commandDeclare__simp__like__tactic_______________closed__3;
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__5;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__34;
 lean_object* lean_nat_add(lean_object*, lean_object*);
@@ -351,13 +351,12 @@ LEAN_EXPORT lean_object* l_Array_mapSepElems(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_DSimp_instBEqConfig___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__14;
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__5;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__6;
 static lean_object* l_Lean_versionStringCore___closed__2;
 static lean_object* l_Lean_Parser_Tactic_simpAllArith___closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__58;
 LEAN_EXPORT lean_object* l_Lean_Name_instReprName;
 static lean_object* l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__5;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__6;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Name_toStringWithSep(lean_object*, uint8_t, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__7;
 LEAN_EXPORT lean_object* l_Lean_Syntax_SepArray_ofElems(lean_object*, lean_object*);
@@ -366,13 +365,13 @@ static lean_object* l_Lean_Name_escapePart___closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__19;
 static lean_object* l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__7;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__69;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 static lean_object* l_Lean_termEval__prio_____closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__22;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__82;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__93;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8;
 static lean_object* l_Lean_version_major___closed__1;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
 LEAN_EXPORT lean_object* l_Lean_Meta_EtaStructMode_toCtorIdx___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__33;
 static lean_object* l_Lean_instQuoteSubstring___closed__1;
@@ -383,7 +382,6 @@ lean_object* lean_string_utf8_next(lean_object*, lean_object*);
 static lean_object* l_Lean_Name_isInaccessibleUserName___closed__1;
 static lean_object* l_Lean_versionStringCore___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__78;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__91;
 static lean_object* l_Lean_termEval__prio_____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Name_toStringWithSep_maybeEscape(uint8_t, lean_object*);
@@ -399,6 +397,7 @@ static lean_object* l_Lean_Name_reprPrec___closed__6;
 static lean_object* l_repr___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__3___closed__11;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit_loop___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__11;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 LEAN_EXPORT lean_object* l_Lean_Syntax_getSubstring_x3f(lean_object*, uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Syntax_SepArray_getElems___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Lean_Syntax_getTailInfo_x3f___spec__1(lean_object*, lean_object*, lean_object*);
@@ -409,7 +408,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Simp_Config_maxSteps___default;
 static lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__6;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_version_getMinor___boxed(lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
 static lean_object* l_Lean_evalPrio___closed__1;
 uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
 static uint8_t l_Lean_version_isRelease___closed__1;
@@ -453,7 +451,6 @@ uint8_t l_instDecidableNot___rarg(uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_Simp_neutralConfig;
 uint8_t l_String_contains(lean_object*, uint32_t);
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__1;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_getEscapedNameParts_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_mkStrLit___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__61;
@@ -464,6 +461,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_expandInterpolatedStr(lean_object*, lean_
 static lean_object* l_Lean_termEval__prec_____closed__7;
 static lean_object* l_Lean_Parser_Tactic_simpAllArith___closed__9;
 extern lean_object* l_Lean_numLitKind;
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__3;
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__2;
 LEAN_EXPORT lean_object* l_Lean_instQuoteString(lean_object*);
@@ -533,7 +531,6 @@ static lean_object* l_Lean_Parser_Tactic_commandDeclare__simp__like__tactic_____
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__80;
 lean_object* l_String_capitalize(lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3;
 LEAN_EXPORT lean_object* l_Lean_NameGenerator_next(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeCharLit___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeNatLitVal_x3f(lean_object*);
@@ -554,20 +551,21 @@ LEAN_EXPORT lean_object* l_Lean_Meta_TransparencyMode_noConfusion___rarg___boxed
 static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__12;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__86;
 lean_object* l_Lean_Syntax_setKind(lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__18;
 LEAN_EXPORT lean_object* lean_name_append_index_after(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Simp_instReprConfig___closed__1;
 LEAN_EXPORT lean_object* l_Array_getSepElems___rarg(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__18;
 extern lean_object* l_Lean_reservedMacroScope;
 static lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__6;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__46;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__1;
 static lean_object* l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__10;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__15;
 static lean_object* l_Lean_Parser_Tactic_dsimpAutoUnfold___closed__8;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1;
 static lean_object* l_Lean_Syntax_unsetTrailing___closed__2;
 static lean_object* l_Lean_Parser_Tactic_simpArith___closed__10;
 static lean_object* l_Lean_NameGenerator_namePrefix___default___closed__1;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__15;
 static lean_object* l_Lean_Meta_DSimp_instInhabitedConfig___closed__1;
 LEAN_EXPORT lean_object* l_Lean_mkNullNode(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__12;
@@ -590,6 +588,7 @@ LEAN_EXPORT lean_object* l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1__
 static lean_object* l___private_Init_Meta_0__Lean_Syntax_splitNameLitAux___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__11;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__30;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__42;
 LEAN_EXPORT lean_object* l_Lean_instQuoteSubstring___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__63;
@@ -607,10 +606,10 @@ static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Me
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_quoteNameMk(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_splitNameLitAux(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_mkSepArray___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 static lean_object* l_Lean_versionStringCore___closed__4;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrQuotedChar___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__92;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__3;
 extern lean_object* l_Lean_Parser_Tactic_rwRuleSeq;
 extern lean_object* l_Lean_charLitKind;
@@ -618,14 +617,14 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 static lean_object* l_Lean_Syntax_instBEqSyntax___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__15;
 static lean_object* l_repr___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__3___closed__13;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
 LEAN_EXPORT lean_object* l_Lean_NameGenerator_idx___default;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__4;
 static lean_object* l_Lean_Parser_Tactic_simpAllArith___closed__5;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__46;
 LEAN_EXPORT lean_object* l_Lean_Meta_EtaStructMode_noConfusion___rarg___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_dsimpAutoUnfold___closed__6;
 static lean_object* l_Lean_Meta_instBEqTransparencyMode___closed__1;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__4;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__37;
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId(lean_object*);
@@ -650,11 +649,12 @@ LEAN_EXPORT lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux___rar
 static lean_object* l_Lean___aux__Init__Meta______macroRules__Lean__Parser__Syntax__subPrio__1___closed__2;
 static lean_object* l_Lean_Parser_Tactic_commandDeclare__simp__like__tactic_______________closed__13;
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeAfterExp(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__60;
 static lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__1;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7;
 LEAN_EXPORT lean_object* l_Lean_mkOptionalNode(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_version_getPatch___boxed(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__74;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__70;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077_(lean_object*, lean_object*);
@@ -667,10 +667,10 @@ LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexLitAux___
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux(lean_object*);
 static lean_object* l_Lean_Name_reprPrec___closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__2;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
 static lean_object* l___private_Init_Meta_0__Lean_quoteNameMk___closed__5;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprEtaStructMode____x40_Init_Meta___hyg_8712____closed__18;
 lean_object* l_panic___at___private_Init_Prelude_0__Lean_assembleParts___spec__1(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_versionString___closed__10;
 static lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__4;
@@ -678,13 +678,13 @@ LEAN_EXPORT lean_object* l_Lean_versionString;
 static lean_object* l_Lean_version_patch___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__43;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_15373_(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739_(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556_(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17936_(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875_(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322_(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17129_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_15374_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17937_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17130_(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__47;
 uint8_t l_Substring_beq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Name_toStringWithSep___boxed(lean_object*, lean_object*, lean_object*);
@@ -735,6 +735,7 @@ static lean_object* l_Lean_Syntax_expandInterpolatedStr___lambda__1___closed__4;
 size_t lean_usize_of_nat(lean_object*);
 static lean_object* l_Lean_Parser_Tactic_commandDeclare__simp__like__tactic_______________closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__56;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__94;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__8;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit(lean_object*);
@@ -750,11 +751,11 @@ static lean_object* l_Lean_NameGenerator_namePrefix___default___closed__2;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_commandDeclare__simp__like__tactic_______________closed__21;
 LEAN_EXPORT uint8_t l_Lean_isIdEndEscape(uint32_t);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__5;
 static lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__4;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_version_getMajor(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__17;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__66;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 static lean_object* l_repr___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__3___closed__7;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__44;
@@ -774,9 +775,11 @@ static lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__1
 static lean_object* l_Lean___aux__Init__Meta______macroRules__Lean__Parser__Syntax__addPrio__1___closed__1;
 uint8_t l_Char_isAlpha(uint32_t);
 static lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__8;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 LEAN_EXPORT lean_object* l_Lean_Option_hasQuote(lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Syntax_isAtom(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_getSepElems___spec__1(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__4;
 static lean_object* l_Lean_Parser_Tactic_commandDeclare__simp__like__tactic_______________closed__5;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__15;
@@ -792,9 +795,9 @@ static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_In
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__9;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__95;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__12;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__5;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__9;
 lean_object* l_Lean_mkAtomFrom(lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__4;
 static lean_object* l_Lean_termEval__prio_____closed__8;
 LEAN_EXPORT lean_object* l_Lean_Syntax_mkNumLit(lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedNameGenerator___closed__1;
@@ -806,6 +809,7 @@ static lean_object* l_Lean_versionString___closed__7;
 static lean_object* l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__13;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__1;
 extern lean_object* l_Lean_groupKind;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Syntax_unsetTrailing(lean_object*);
 static lean_object* l_Lean_termEval__prio_____closed__7;
 LEAN_EXPORT lean_object* l_Lean_isLetterLike___boxed(lean_object*);
@@ -822,7 +826,6 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_expandMacros___spec__1
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprTransparencyMode____x40_Init_Meta___hyg_8545____closed__9;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__7;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__4;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__16;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__22;
@@ -884,7 +887,6 @@ LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_quoteList(lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withHeadRefOnly(lean_object*);
 lean_object* l_String_quote(lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
 uint8_t l_Char_isAlphanum(uint32_t);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Syntax_copyHeadTailInfoFrom___boxed(lean_object*, lean_object*);
@@ -893,7 +895,7 @@ static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__22;
 LEAN_EXPORT lean_object* l_Lean_Meta_Simp_instReprConfig;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedNameGenerator;
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__6(lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 static lean_object* l_Lean_mkHole___closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__10;
 static lean_object* l_Lean_evalPrec___closed__2;
@@ -915,13 +917,11 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrQuotedChar___boxed__const__1;
 static lean_object* l___private_Init_Meta_0__Lean_quoteNameMk___closed__8;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__88;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___closed__1;
 static lean_object* l_Lean_toolchain___closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__13;
 static lean_object* l___private_Init_Meta_0__Lean_quoteNameMk___closed__1;
 LEAN_EXPORT lean_object* l_Array_filterSepElems(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_repr___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__3___closed__16;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__1;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613_(lean_object*, lean_object*);
@@ -1002,7 +1002,6 @@ uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Simp_instBEqConfig;
 static lean_object* l_Lean_termEval__prec_____closed__2;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__21;
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Simp_Config_iota___default;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__31;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__76;
@@ -1019,6 +1018,7 @@ static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Me
 static lean_object* l_Lean_Meta_Simp_neutralConfig___closed__1;
 LEAN_EXPORT uint8_t l_Lean_Syntax_isNone(lean_object*);
 lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__28;
 LEAN_EXPORT lean_object* l_List_beq___at_Lean_Syntax_structEq___spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeAfterDot___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1085,6 +1085,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_decodeQuotedChar___boxed__const__3;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__2;
 static lean_object* l_Lean_toolchain___closed__7;
 static lean_object* l_Lean___aux__Init__Meta______macroRules__Lean__Parser__Syntax__addPrec__1___closed__3;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__6;
 LEAN_EXPORT lean_object* l_Lean_Syntax_isInterpolatedStrLit_x3f___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__75;
 LEAN_EXPORT lean_object* l_Lean_Syntax_SepArray_instCoeTailSepArrayArraySyntax___boxed(lean_object*);
@@ -1127,7 +1128,6 @@ static lean_object* l_Lean_versionString___closed__6;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__37;
 LEAN_EXPORT lean_object* lean_name_append_before(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_version_getPatch(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_toolchain;
 static lean_object* l_Lean_mkOptionalNode___closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__42;
@@ -1140,7 +1140,6 @@ static lean_object* l_Lean_origin___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold;
 LEAN_EXPORT lean_object* l_Lean_instQuoteArray___rarg(lean_object*, lean_object*);
 lean_object* lean_nat_mod(lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__33;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_dsimpAutoUnfold;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__10;
@@ -1158,13 +1157,13 @@ LEAN_EXPORT uint8_t l_Lean_Meta_Simp_Config_proj___default;
 LEAN_EXPORT lean_object* l_Lean_Meta_instBEqTransparencyMode;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__12;
 LEAN_EXPORT lean_object* l_Lean_Syntax_instCoeArraySyntaxSepArray(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__11;
 LEAN_EXPORT lean_object* l_Lean_Syntax_find_x3f(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__83;
 static lean_object* l_Lean_Parser_Tactic_tacticErw_______closed__12;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__90;
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeStrLitAux___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__7;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__12;
 lean_object* l_String_drop(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Init_Meta_0__Lean_Meta_beqEtaStructMode____x40_Init_Meta___hyg_8696_(uint8_t, uint8_t);
@@ -1174,8 +1173,8 @@ static lean_object* l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__9;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__17;
 LEAN_EXPORT lean_object* l_Lean_monadNameGeneratorLift___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpArith___closed__1;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_object* l_Nat_min(lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
 static lean_object* l_Lean_Syntax_expandInterpolatedStr___closed__1;
 static lean_object* l___private_Init_Meta_0__Lean_quoteList___rarg___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Syntax_expandInterpolatedStr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1187,12 +1186,12 @@ static lean_object* l_Lean_Parser_Tactic_simpArith___closed__5;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__8;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__14;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__36;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__10;
 static lean_object* l_Lean_Parser_Tactic_simpArith___closed__3;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__32;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__73;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__12;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
 LEAN_EXPORT lean_object* l_Lean_Name_getRoot___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeBinLitAux___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Name_getRoot(lean_object*);
@@ -1202,8 +1201,9 @@ static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_I
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__22;
 static lean_object* l_Lean_evalPrec___closed__3;
 LEAN_EXPORT lean_object* l_Lean_mkSepArray___boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__7;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__10;
 static lean_object* l_Lean_Name_reprPrec___closed__3;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__10;
 static lean_object* l___private_Init_Meta_0__Lean_quoteList___rarg___closed__2;
 LEAN_EXPORT uint8_t l_Lean_Name_toString_maybePseudoSyntax(lean_object*);
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____spec__5(lean_object*, lean_object*);
@@ -1211,13 +1211,11 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 static lean_object* l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__2;
 static lean_object* l_Lean_instQuoteName___closed__1;
 static lean_object* l_Lean_termEval__prec_____closed__9;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__6;
 LEAN_EXPORT lean_object* l_Lean_Meta_TransparencyMode_noConfusion___rarg___lambda__1___boxed(lean_object*);
 static lean_object* l_Array_getSepElems___rarg___closed__1;
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__5;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_getSepElems___spec__1___rarg(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprTransparencyMode____x40_Init_Meta___hyg_8545____closed__23;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
 static lean_object* l_Lean_Parser_Tactic_simpAllArith___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Syntax_findAux(lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprEtaStructMode____x40_Init_Meta___hyg_8712____closed__7;
@@ -1226,7 +1224,7 @@ LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_beqConfig____x4
 LEAN_EXPORT lean_object* l_Lean_Syntax_decodeStrLitAux(lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_utf8_at_end(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instQuoteSyntax;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__28;
 static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__2;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__7;
@@ -1234,7 +1232,6 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 LEAN_EXPORT lean_object* l_Lean_mkNode(lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_quoteList___rarg___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__78;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__91;
 lean_object* lean_uint32_to_nat(uint32_t);
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__15;
@@ -1260,6 +1257,7 @@ static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__24;
 LEAN_EXPORT uint8_t l_Lean_Meta_Simp_Config_autoUnfold___default;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit___boxed(lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__19;
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_evalPrio(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Meta_Simp_defaultMaxSteps;
@@ -1268,6 +1266,7 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__8;
 static lean_object* l_Lean___aux__Init__Meta______macroRules__Lean__Parser__Syntax__addPrec__1___closed__4;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___closed__34;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___closed__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_String_Basic_0__Substring_takeWhileAux___at___private_Init_Meta_0__Lean_Syntax_splitNameLitAux___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Name_reprSyntax____x40_Init_Meta___hyg_1077____closed__22;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(lean_object*, size_t, size_t, lean_object*);
@@ -1284,26 +1283,27 @@ static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__4;
 static lean_object* l_Lean_Meta_Simp_instInhabitedConfig___closed__1;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprEtaStructMode____x40_Init_Meta___hyg_8712____closed__3;
 static lean_object* l_Lean_Parser_Tactic_simpAllKind___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__3;
 static lean_object* l_Lean___aux__Init__Meta______macroRules__Lean__Parser__Syntax__addPrec__1___closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__29;
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Lean_Syntax_updateLast___at_Lean_Syntax_setTailInfoAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
 LEAN_EXPORT uint8_t l_Lean_isIdRest(uint32_t);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__51;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__commandDeclare__simp__like__tactic______________1___lambda__1___closed__35;
 static lean_object* l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_DSimp_instReprConfig;
 static lean_object* l_Lean_Parser_Tactic_simpAutoUnfold___closed__9;
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__1;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_mkLit(lean_object*, lean_object*, lean_object*);
 lean_object* l_Char_ofNat(lean_object*);
+static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__27;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Array_mapSepElemsMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprTransparencyMode____x40_Init_Meta___hyg_8545____closed__6;
 static lean_object* l_Lean_versionStringCore___closed__7;
-static lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3;
 static lean_object* l___private_Init_Meta_0__Lean_Meta_reprEtaStructMode____x40_Init_Meta___hyg_8712____closed__5;
 lean_object* l_Repr_addAppParen(lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_simpArith___closed__2;
@@ -29276,7 +29276,7 @@ x_1 = l_Lean_Parser_Tactic_simpAutoUnfold___closed__25;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -29284,7 +29284,7 @@ x_1 = lean_mk_string("simp ");
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
@@ -29292,7 +29292,7 @@ x_5 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tact
 x_6 = l_Lean_Syntax_setKind(x_1, x_5);
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = l_Lean_Syntax_getArg(x_6, x_7);
-x_9 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___closed__1;
+x_9 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___closed__1;
 x_10 = l_Lean_mkAtomFrom(x_8, x_9);
 x_11 = l_Lean_Syntax_setArg(x_6, x_7, x_10);
 x_12 = l_Lean_mkOptionalNode___closed__2;
@@ -29311,7 +29311,7 @@ lean_ctor_set(x_19, 1, x_4);
 return x_19;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -29321,7 +29321,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -29331,7 +29331,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -29339,22 +29339,22 @@ x_1 = lean_mk_string("Lean.Meta.Simp.Config");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__4() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__4;
+x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__4;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -29362,7 +29362,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__6() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -29370,17 +29370,17 @@ x_1 = lean_mk_string("Simp");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__26;
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__6;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__6;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8() {
 _start:
 {
 lean_object* x_1; 
@@ -29388,41 +29388,41 @@ x_1 = lean_mk_string("Config");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7;
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__10() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__10;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__10;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__12() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -29431,13 +29431,13 @@ x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l___private_Init_Meta_0__Lean_Meta_DSimp_reprConfig____x40_Init_Meta___hyg_9081____closed__19;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__12;
+x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__12;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -29445,7 +29445,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -29455,7 +29455,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__15() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__15() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -29464,13 +29464,13 @@ x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_instQuoteBool___closed__6;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__15;
+x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__15;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -29478,7 +29478,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -29488,7 +29488,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__18() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__18() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -29500,19 +29500,19 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__18;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__18;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
@@ -29526,7 +29526,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740_(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; lean_object* x_8; uint8_t x_9; 
@@ -29590,12 +29590,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -29672,11 +29672,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -29691,10 +29691,10 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -29732,7 +29732,7 @@ x_97 = lean_array_push(x_96, x_61);
 lean_inc(x_97);
 x_98 = lean_array_push(x_97, x_68);
 x_99 = lean_array_push(x_98, x_93);
-x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_101 = lean_array_push(x_99, x_100);
 x_102 = lean_array_push(x_101, x_74);
 lean_inc(x_95);
@@ -29745,14 +29745,14 @@ lean_ctor_set(x_105, 2, x_103);
 x_106 = lean_array_push(x_50, x_57);
 x_107 = lean_array_push(x_106, x_59);
 x_108 = lean_array_push(x_107, x_105);
-x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_110 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_110, 0, x_38);
 lean_ctor_set(x_110, 1, x_109);
 lean_ctor_set(x_110, 2, x_108);
 x_111 = lean_array_push(x_35, x_22);
 x_112 = lean_array_push(x_111, x_110);
-x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_114 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_114, 0, x_38);
 lean_ctor_set(x_114, 1, x_113);
@@ -29803,7 +29803,7 @@ x_141 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_141, 0, x_38);
 lean_ctor_set(x_141, 1, x_8);
 lean_ctor_set(x_141, 2, x_140);
-x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_141, x_2, x_12);
+x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_141, x_2, x_12);
 lean_dec(x_2);
 return x_142;
 }
@@ -29861,12 +29861,12 @@ lean_inc(x_146);
 x_164 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_164, 0, x_146);
 lean_ctor_set(x_164, 1, x_163);
-x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 lean_inc(x_148);
 lean_inc(x_149);
 x_166 = l_Lean_addMacroScope(x_149, x_165, x_148);
-x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
-x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
+x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
+x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 lean_inc(x_146);
 x_169 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_169, 0, x_146);
@@ -29943,11 +29943,11 @@ x_203 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_203, 0, x_173);
 lean_ctor_set(x_203, 1, x_178);
 lean_ctor_set(x_203, 2, x_202);
-x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 lean_inc(x_148);
 lean_inc(x_149);
 x_205 = l_Lean_addMacroScope(x_149, x_204, x_148);
-x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_146);
 x_207 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_207, 0, x_146);
@@ -29962,10 +29962,10 @@ x_212 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_212, 0, x_173);
 lean_ctor_set(x_212, 1, x_211);
 lean_ctor_set(x_212, 2, x_210);
-x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_214 = l_Lean_addMacroScope(x_149, x_213, x_148);
-x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_146);
 x_217 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_217, 0, x_146);
@@ -30001,7 +30001,7 @@ x_231 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_232 = lean_array_push(x_231, x_196);
 x_233 = lean_array_push(x_232, x_203);
 x_234 = lean_array_push(x_233, x_228);
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_236 = lean_array_push(x_234, x_235);
 x_237 = lean_array_push(x_236, x_209);
 x_238 = lean_array_push(x_237, x_230);
@@ -30013,14 +30013,14 @@ lean_ctor_set(x_240, 2, x_238);
 x_241 = lean_array_push(x_185, x_192);
 x_242 = lean_array_push(x_241, x_194);
 x_243 = lean_array_push(x_242, x_240);
-x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_245 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_245, 0, x_173);
 lean_ctor_set(x_245, 1, x_244);
 lean_ctor_set(x_245, 2, x_243);
 x_246 = lean_array_push(x_170, x_157);
 x_247 = lean_array_push(x_246, x_245);
-x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_173);
 lean_ctor_set(x_249, 1, x_248);
@@ -30047,17 +30047,17 @@ x_262 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_262, 0, x_173);
 lean_ctor_set(x_262, 1, x_8);
 lean_ctor_set(x_262, 2, x_261);
-x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_262, x_2, x_147);
+x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_262, x_2, x_147);
 lean_dec(x_2);
 return x_263;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 return x_5;
 }
@@ -30192,7 +30192,7 @@ x_1 = l_Lean_Parser_Tactic_simpArith___closed__10;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -30201,13 +30201,13 @@ x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_9613____closed__13;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__1;
+x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__1;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -30215,7 +30215,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -30225,7 +30225,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557_(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; lean_object* x_8; uint8_t x_9; 
@@ -30289,12 +30289,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -30371,11 +30371,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -30390,10 +30390,10 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -30431,7 +30431,7 @@ x_97 = lean_array_push(x_96, x_61);
 lean_inc(x_97);
 x_98 = lean_array_push(x_97, x_68);
 x_99 = lean_array_push(x_98, x_93);
-x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_101 = lean_array_push(x_99, x_100);
 x_102 = lean_array_push(x_101, x_74);
 lean_inc(x_95);
@@ -30444,14 +30444,14 @@ lean_ctor_set(x_105, 2, x_103);
 x_106 = lean_array_push(x_50, x_57);
 x_107 = lean_array_push(x_106, x_59);
 x_108 = lean_array_push(x_107, x_105);
-x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_110 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_110, 0, x_38);
 lean_ctor_set(x_110, 1, x_109);
 lean_ctor_set(x_110, 2, x_108);
 x_111 = lean_array_push(x_35, x_22);
 x_112 = lean_array_push(x_111, x_110);
-x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_114 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_114, 0, x_38);
 lean_ctor_set(x_114, 1, x_113);
@@ -30502,7 +30502,7 @@ x_141 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_141, 0, x_38);
 lean_ctor_set(x_141, 1, x_8);
 lean_ctor_set(x_141, 2, x_140);
-x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_141, x_2, x_12);
+x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_141, x_2, x_12);
 lean_dec(x_2);
 return x_142;
 }
@@ -30560,12 +30560,12 @@ lean_inc(x_146);
 x_164 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_164, 0, x_146);
 lean_ctor_set(x_164, 1, x_163);
-x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 lean_inc(x_148);
 lean_inc(x_149);
 x_166 = l_Lean_addMacroScope(x_149, x_165, x_148);
-x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
-x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
+x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
+x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 lean_inc(x_146);
 x_169 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_169, 0, x_146);
@@ -30642,11 +30642,11 @@ x_203 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_203, 0, x_173);
 lean_ctor_set(x_203, 1, x_178);
 lean_ctor_set(x_203, 2, x_202);
-x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_148);
 lean_inc(x_149);
 x_205 = l_Lean_addMacroScope(x_149, x_204, x_148);
-x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_146);
 x_207 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_207, 0, x_146);
@@ -30661,10 +30661,10 @@ x_212 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_212, 0, x_173);
 lean_ctor_set(x_212, 1, x_211);
 lean_ctor_set(x_212, 2, x_210);
-x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_214 = l_Lean_addMacroScope(x_149, x_213, x_148);
-x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_146);
 x_217 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_217, 0, x_146);
@@ -30700,7 +30700,7 @@ x_231 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_232 = lean_array_push(x_231, x_196);
 x_233 = lean_array_push(x_232, x_203);
 x_234 = lean_array_push(x_233, x_228);
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_236 = lean_array_push(x_234, x_235);
 x_237 = lean_array_push(x_236, x_209);
 x_238 = lean_array_push(x_237, x_230);
@@ -30712,14 +30712,14 @@ lean_ctor_set(x_240, 2, x_238);
 x_241 = lean_array_push(x_185, x_192);
 x_242 = lean_array_push(x_241, x_194);
 x_243 = lean_array_push(x_242, x_240);
-x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_245 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_245, 0, x_173);
 lean_ctor_set(x_245, 1, x_244);
 lean_ctor_set(x_245, 2, x_243);
 x_246 = lean_array_push(x_170, x_157);
 x_247 = lean_array_push(x_246, x_245);
-x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_173);
 lean_ctor_set(x_249, 1, x_248);
@@ -30746,7 +30746,7 @@ x_262 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_262, 0, x_173);
 lean_ctor_set(x_262, 1, x_8);
 lean_ctor_set(x_262, 2, x_261);
-x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_262, x_2, x_147);
+x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_262, x_2, x_147);
 lean_dec(x_2);
 return x_263;
 }
@@ -30882,7 +30882,7 @@ x_1 = l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__10;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_15373_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_15374_(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; lean_object* x_8; uint8_t x_9; 
@@ -30946,12 +30946,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -31028,11 +31028,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -31047,12 +31047,12 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 lean_inc(x_13);
 lean_inc(x_14);
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -31086,9 +31086,9 @@ x_95 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_95, 0, x_38);
 lean_ctor_set(x_95, 1, x_94);
 lean_ctor_set(x_95, 2, x_93);
-x_96 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_96 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 x_97 = l_Lean_addMacroScope(x_14, x_96, x_13);
-x_98 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_98 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_11);
 x_99 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_99, 0, x_11);
@@ -31131,7 +31131,7 @@ x_116 = lean_array_push(x_115, x_61);
 lean_inc(x_116);
 x_117 = lean_array_push(x_116, x_68);
 x_118 = lean_array_push(x_117, x_112);
-x_119 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_119 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_120 = lean_array_push(x_118, x_119);
 x_121 = lean_array_push(x_120, x_74);
 lean_inc(x_114);
@@ -31144,14 +31144,14 @@ lean_ctor_set(x_124, 2, x_122);
 x_125 = lean_array_push(x_50, x_57);
 x_126 = lean_array_push(x_125, x_59);
 x_127 = lean_array_push(x_126, x_124);
-x_128 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_128 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_129 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_129, 0, x_38);
 lean_ctor_set(x_129, 1, x_128);
 lean_ctor_set(x_129, 2, x_127);
 x_130 = lean_array_push(x_35, x_22);
 x_131 = lean_array_push(x_130, x_129);
-x_132 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_132 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_133 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_133, 0, x_38);
 lean_ctor_set(x_133, 1, x_132);
@@ -31202,7 +31202,7 @@ x_160 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_160, 0, x_38);
 lean_ctor_set(x_160, 1, x_8);
 lean_ctor_set(x_160, 2, x_159);
-x_161 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_160, x_2, x_12);
+x_161 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_160, x_2, x_12);
 lean_dec(x_2);
 return x_161;
 }
@@ -31260,12 +31260,12 @@ lean_inc(x_165);
 x_183 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_183, 0, x_165);
 lean_ctor_set(x_183, 1, x_182);
-x_184 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9;
+x_184 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9;
 lean_inc(x_167);
 lean_inc(x_168);
 x_185 = l_Lean_addMacroScope(x_168, x_184, x_167);
-x_186 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5;
-x_187 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11;
+x_186 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5;
+x_187 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11;
 lean_inc(x_165);
 x_188 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_188, 0, x_165);
@@ -31342,11 +31342,11 @@ x_222 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_222, 0, x_192);
 lean_ctor_set(x_222, 1, x_197);
 lean_ctor_set(x_222, 2, x_221);
-x_223 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_223 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_167);
 lean_inc(x_168);
 x_224 = l_Lean_addMacroScope(x_168, x_223, x_167);
-x_225 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_225 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_165);
 x_226 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_226, 0, x_165);
@@ -31361,12 +31361,12 @@ x_231 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_231, 0, x_192);
 lean_ctor_set(x_231, 1, x_230);
 lean_ctor_set(x_231, 2, x_229);
-x_232 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_232 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 lean_inc(x_167);
 lean_inc(x_168);
 x_233 = l_Lean_addMacroScope(x_168, x_232, x_167);
-x_234 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_234 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_165);
 x_236 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_236, 0, x_165);
@@ -31400,9 +31400,9 @@ x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_192);
 lean_ctor_set(x_249, 1, x_248);
 lean_ctor_set(x_249, 2, x_247);
-x_250 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_250 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 x_251 = l_Lean_addMacroScope(x_168, x_250, x_167);
-x_252 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_252 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_165);
 x_253 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_253, 0, x_165);
@@ -31443,7 +31443,7 @@ x_269 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_270 = lean_array_push(x_269, x_215);
 x_271 = lean_array_push(x_270, x_222);
 x_272 = lean_array_push(x_271, x_266);
-x_273 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_273 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_274 = lean_array_push(x_272, x_273);
 x_275 = lean_array_push(x_274, x_228);
 x_276 = lean_array_push(x_275, x_268);
@@ -31455,14 +31455,14 @@ lean_ctor_set(x_278, 2, x_276);
 x_279 = lean_array_push(x_204, x_211);
 x_280 = lean_array_push(x_279, x_213);
 x_281 = lean_array_push(x_280, x_278);
-x_282 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_282 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_283 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_283, 0, x_192);
 lean_ctor_set(x_283, 1, x_282);
 lean_ctor_set(x_283, 2, x_281);
 x_284 = lean_array_push(x_189, x_176);
 x_285 = lean_array_push(x_284, x_283);
-x_286 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_286 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_287 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_287, 0, x_192);
 lean_ctor_set(x_287, 1, x_286);
@@ -31489,7 +31489,7 @@ x_300 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_300, 0, x_192);
 lean_ctor_set(x_300, 1, x_8);
 lean_ctor_set(x_300, 2, x_299);
-x_301 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1(x_1, x_300, x_2, x_166);
+x_301 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1(x_1, x_300, x_2, x_166);
 lean_dec(x_2);
 return x_301;
 }
@@ -31667,7 +31667,7 @@ x_1 = l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__13;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -31675,7 +31675,7 @@ x_1 = lean_mk_string("simp_all ");
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
@@ -31683,7 +31683,7 @@ x_5 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tact
 x_6 = l_Lean_Syntax_setKind(x_1, x_5);
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = l_Lean_Syntax_getArg(x_6, x_7);
-x_9 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___closed__1;
+x_9 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___closed__1;
 x_10 = l_Lean_mkAtomFrom(x_8, x_9);
 x_11 = l_Lean_Syntax_setArg(x_6, x_7, x_10);
 x_12 = l_Lean_mkOptionalNode___closed__2;
@@ -31702,7 +31702,7 @@ lean_ctor_set(x_19, 1, x_4);
 return x_19;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -31710,22 +31710,22 @@ x_1 = lean_mk_string("Lean.Meta.Simp.ConfigCtx");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__2() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__2;
+x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -31733,7 +31733,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__4() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -31741,41 +31741,41 @@ x_1 = lean_mk_string("ConfigCtx");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7;
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__4;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__6() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__6;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__6;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323_(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; lean_object* x_8; uint8_t x_9; 
@@ -31839,12 +31839,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -31921,11 +31921,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -31940,10 +31940,10 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -31981,7 +31981,7 @@ x_97 = lean_array_push(x_96, x_61);
 lean_inc(x_97);
 x_98 = lean_array_push(x_97, x_68);
 x_99 = lean_array_push(x_98, x_93);
-x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_101 = lean_array_push(x_99, x_100);
 x_102 = lean_array_push(x_101, x_74);
 lean_inc(x_95);
@@ -31994,14 +31994,14 @@ lean_ctor_set(x_105, 2, x_103);
 x_106 = lean_array_push(x_50, x_57);
 x_107 = lean_array_push(x_106, x_59);
 x_108 = lean_array_push(x_107, x_105);
-x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_110 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_110, 0, x_38);
 lean_ctor_set(x_110, 1, x_109);
 lean_ctor_set(x_110, 2, x_108);
 x_111 = lean_array_push(x_35, x_22);
 x_112 = lean_array_push(x_111, x_110);
-x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_114 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_114, 0, x_38);
 lean_ctor_set(x_114, 1, x_113);
@@ -32052,7 +32052,7 @@ x_141 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_141, 0, x_38);
 lean_ctor_set(x_141, 1, x_8);
 lean_ctor_set(x_141, 2, x_140);
-x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_141, x_2, x_12);
+x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_141, x_2, x_12);
 lean_dec(x_2);
 return x_142;
 }
@@ -32110,12 +32110,12 @@ lean_inc(x_146);
 x_164 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_164, 0, x_146);
 lean_ctor_set(x_164, 1, x_163);
-x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 lean_inc(x_148);
 lean_inc(x_149);
 x_166 = l_Lean_addMacroScope(x_149, x_165, x_148);
-x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
-x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
+x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 lean_inc(x_146);
 x_169 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_169, 0, x_146);
@@ -32192,11 +32192,11 @@ x_203 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_203, 0, x_173);
 lean_ctor_set(x_203, 1, x_178);
 lean_ctor_set(x_203, 2, x_202);
-x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 lean_inc(x_148);
 lean_inc(x_149);
 x_205 = l_Lean_addMacroScope(x_149, x_204, x_148);
-x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_146);
 x_207 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_207, 0, x_146);
@@ -32211,10 +32211,10 @@ x_212 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_212, 0, x_173);
 lean_ctor_set(x_212, 1, x_211);
 lean_ctor_set(x_212, 2, x_210);
-x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_214 = l_Lean_addMacroScope(x_149, x_213, x_148);
-x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_146);
 x_217 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_217, 0, x_146);
@@ -32250,7 +32250,7 @@ x_231 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_232 = lean_array_push(x_231, x_196);
 x_233 = lean_array_push(x_232, x_203);
 x_234 = lean_array_push(x_233, x_228);
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_236 = lean_array_push(x_234, x_235);
 x_237 = lean_array_push(x_236, x_209);
 x_238 = lean_array_push(x_237, x_230);
@@ -32262,14 +32262,14 @@ lean_ctor_set(x_240, 2, x_238);
 x_241 = lean_array_push(x_185, x_192);
 x_242 = lean_array_push(x_241, x_194);
 x_243 = lean_array_push(x_242, x_240);
-x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_245 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_245, 0, x_173);
 lean_ctor_set(x_245, 1, x_244);
 lean_ctor_set(x_245, 2, x_243);
 x_246 = lean_array_push(x_170, x_157);
 x_247 = lean_array_push(x_246, x_245);
-x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_173);
 lean_ctor_set(x_249, 1, x_248);
@@ -32296,17 +32296,17 @@ x_262 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_262, 0, x_173);
 lean_ctor_set(x_262, 1, x_8);
 lean_ctor_set(x_262, 2, x_261);
-x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_262, x_2, x_147);
+x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_262, x_2, x_147);
 lean_dec(x_2);
 return x_263;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 return x_5;
 }
@@ -32427,7 +32427,7 @@ x_1 = l_Lean_Parser_Tactic_simpAllArith___closed__9;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17129_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17130_(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; lean_object* x_8; uint8_t x_9; 
@@ -32491,12 +32491,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -32573,11 +32573,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -32592,10 +32592,10 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -32633,7 +32633,7 @@ x_97 = lean_array_push(x_96, x_61);
 lean_inc(x_97);
 x_98 = lean_array_push(x_97, x_68);
 x_99 = lean_array_push(x_98, x_93);
-x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_101 = lean_array_push(x_99, x_100);
 x_102 = lean_array_push(x_101, x_74);
 lean_inc(x_95);
@@ -32646,14 +32646,14 @@ lean_ctor_set(x_105, 2, x_103);
 x_106 = lean_array_push(x_50, x_57);
 x_107 = lean_array_push(x_106, x_59);
 x_108 = lean_array_push(x_107, x_105);
-x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_110 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_110, 0, x_38);
 lean_ctor_set(x_110, 1, x_109);
 lean_ctor_set(x_110, 2, x_108);
 x_111 = lean_array_push(x_35, x_22);
 x_112 = lean_array_push(x_111, x_110);
-x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_114 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_114, 0, x_38);
 lean_ctor_set(x_114, 1, x_113);
@@ -32704,7 +32704,7 @@ x_141 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_141, 0, x_38);
 lean_ctor_set(x_141, 1, x_8);
 lean_ctor_set(x_141, 2, x_140);
-x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_141, x_2, x_12);
+x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_141, x_2, x_12);
 lean_dec(x_2);
 return x_142;
 }
@@ -32762,12 +32762,12 @@ lean_inc(x_146);
 x_164 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_164, 0, x_146);
 lean_ctor_set(x_164, 1, x_163);
-x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 lean_inc(x_148);
 lean_inc(x_149);
 x_166 = l_Lean_addMacroScope(x_149, x_165, x_148);
-x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
-x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
+x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 lean_inc(x_146);
 x_169 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_169, 0, x_146);
@@ -32844,11 +32844,11 @@ x_203 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_203, 0, x_173);
 lean_ctor_set(x_203, 1, x_178);
 lean_ctor_set(x_203, 2, x_202);
-x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_148);
 lean_inc(x_149);
 x_205 = l_Lean_addMacroScope(x_149, x_204, x_148);
-x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_146);
 x_207 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_207, 0, x_146);
@@ -32863,10 +32863,10 @@ x_212 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_212, 0, x_173);
 lean_ctor_set(x_212, 1, x_211);
 lean_ctor_set(x_212, 2, x_210);
-x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_214 = l_Lean_addMacroScope(x_149, x_213, x_148);
-x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_146);
 x_217 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_217, 0, x_146);
@@ -32902,7 +32902,7 @@ x_231 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_232 = lean_array_push(x_231, x_196);
 x_233 = lean_array_push(x_232, x_203);
 x_234 = lean_array_push(x_233, x_228);
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_236 = lean_array_push(x_234, x_235);
 x_237 = lean_array_push(x_236, x_209);
 x_238 = lean_array_push(x_237, x_230);
@@ -32914,14 +32914,14 @@ lean_ctor_set(x_240, 2, x_238);
 x_241 = lean_array_push(x_185, x_192);
 x_242 = lean_array_push(x_241, x_194);
 x_243 = lean_array_push(x_242, x_240);
-x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_245 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_245, 0, x_173);
 lean_ctor_set(x_245, 1, x_244);
 lean_ctor_set(x_245, 2, x_243);
 x_246 = lean_array_push(x_170, x_157);
 x_247 = lean_array_push(x_246, x_245);
-x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_173);
 lean_ctor_set(x_249, 1, x_248);
@@ -32948,7 +32948,7 @@ x_262 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_262, 0, x_173);
 lean_ctor_set(x_262, 1, x_8);
 lean_ctor_set(x_262, 2, x_261);
-x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_262, x_2, x_147);
+x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_262, x_2, x_147);
 lean_dec(x_2);
 return x_263;
 }
@@ -33070,7 +33070,7 @@ x_1 = l_Lean_Parser_Tactic_simpAllArithAutoUnfold___closed__9;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17936_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_17937_(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; lean_object* x_8; uint8_t x_9; 
@@ -33134,12 +33134,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -33216,11 +33216,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -33235,12 +33235,12 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 lean_inc(x_13);
 lean_inc(x_14);
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -33274,9 +33274,9 @@ x_95 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_95, 0, x_38);
 lean_ctor_set(x_95, 1, x_94);
 lean_ctor_set(x_95, 2, x_93);
-x_96 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_96 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 x_97 = l_Lean_addMacroScope(x_14, x_96, x_13);
-x_98 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_98 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_11);
 x_99 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_99, 0, x_11);
@@ -33319,7 +33319,7 @@ x_116 = lean_array_push(x_115, x_61);
 lean_inc(x_116);
 x_117 = lean_array_push(x_116, x_68);
 x_118 = lean_array_push(x_117, x_112);
-x_119 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_119 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_120 = lean_array_push(x_118, x_119);
 x_121 = lean_array_push(x_120, x_74);
 lean_inc(x_114);
@@ -33332,14 +33332,14 @@ lean_ctor_set(x_124, 2, x_122);
 x_125 = lean_array_push(x_50, x_57);
 x_126 = lean_array_push(x_125, x_59);
 x_127 = lean_array_push(x_126, x_124);
-x_128 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_128 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_129 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_129, 0, x_38);
 lean_ctor_set(x_129, 1, x_128);
 lean_ctor_set(x_129, 2, x_127);
 x_130 = lean_array_push(x_35, x_22);
 x_131 = lean_array_push(x_130, x_129);
-x_132 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_132 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_133 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_133, 0, x_38);
 lean_ctor_set(x_133, 1, x_132);
@@ -33390,7 +33390,7 @@ x_160 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_160, 0, x_38);
 lean_ctor_set(x_160, 1, x_8);
 lean_ctor_set(x_160, 2, x_159);
-x_161 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_160, x_2, x_12);
+x_161 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_160, x_2, x_12);
 lean_dec(x_2);
 return x_161;
 }
@@ -33448,12 +33448,12 @@ lean_inc(x_165);
 x_183 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_183, 0, x_165);
 lean_ctor_set(x_183, 1, x_182);
-x_184 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5;
+x_184 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5;
 lean_inc(x_167);
 lean_inc(x_168);
 x_185 = l_Lean_addMacroScope(x_168, x_184, x_167);
-x_186 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3;
-x_187 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7;
+x_186 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3;
+x_187 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7;
 lean_inc(x_165);
 x_188 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_188, 0, x_165);
@@ -33530,11 +33530,11 @@ x_222 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_222, 0, x_192);
 lean_ctor_set(x_222, 1, x_197);
 lean_ctor_set(x_222, 2, x_221);
-x_223 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3;
+x_223 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3;
 lean_inc(x_167);
 lean_inc(x_168);
 x_224 = l_Lean_addMacroScope(x_168, x_223, x_167);
-x_225 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2;
+x_225 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2;
 lean_inc(x_165);
 x_226 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_226, 0, x_165);
@@ -33549,12 +33549,12 @@ x_231 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_231, 0, x_192);
 lean_ctor_set(x_231, 1, x_230);
 lean_ctor_set(x_231, 2, x_229);
-x_232 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_232 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 lean_inc(x_167);
 lean_inc(x_168);
 x_233 = l_Lean_addMacroScope(x_168, x_232, x_167);
-x_234 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_234 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_165);
 x_236 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_236, 0, x_165);
@@ -33588,9 +33588,9 @@ x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_192);
 lean_ctor_set(x_249, 1, x_248);
 lean_ctor_set(x_249, 2, x_247);
-x_250 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_250 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 x_251 = l_Lean_addMacroScope(x_168, x_250, x_167);
-x_252 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_252 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_165);
 x_253 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_253, 0, x_165);
@@ -33631,7 +33631,7 @@ x_269 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_270 = lean_array_push(x_269, x_215);
 x_271 = lean_array_push(x_270, x_222);
 x_272 = lean_array_push(x_271, x_266);
-x_273 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_273 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_274 = lean_array_push(x_272, x_273);
 x_275 = lean_array_push(x_274, x_228);
 x_276 = lean_array_push(x_275, x_268);
@@ -33643,14 +33643,14 @@ lean_ctor_set(x_278, 2, x_276);
 x_279 = lean_array_push(x_204, x_211);
 x_280 = lean_array_push(x_279, x_213);
 x_281 = lean_array_push(x_280, x_278);
-x_282 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_282 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_283 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_283, 0, x_192);
 lean_ctor_set(x_283, 1, x_282);
 lean_ctor_set(x_283, 2, x_281);
 x_284 = lean_array_push(x_189, x_176);
 x_285 = lean_array_push(x_284, x_283);
-x_286 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_286 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_287 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_287, 0, x_192);
 lean_ctor_set(x_287, 1, x_286);
@@ -33677,7 +33677,7 @@ x_300 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_300, 0, x_192);
 lean_ctor_set(x_300, 1, x_8);
 lean_ctor_set(x_300, 2, x_299);
-x_301 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1(x_1, x_300, x_2, x_166);
+x_301 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1(x_1, x_300, x_2, x_166);
 lean_dec(x_2);
 return x_301;
 }
@@ -33813,7 +33813,7 @@ x_1 = l_Lean_Parser_Tactic_dsimpAutoUnfold___closed__10;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -33821,7 +33821,7 @@ x_1 = lean_mk_string("dsimp ");
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
@@ -33829,7 +33829,7 @@ x_5 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tact
 x_6 = l_Lean_Syntax_setKind(x_1, x_5);
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = l_Lean_Syntax_getArg(x_6, x_7);
-x_9 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___closed__1;
+x_9 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___closed__1;
 x_10 = l_Lean_mkAtomFrom(x_8, x_9);
 x_11 = l_Lean_Syntax_setArg(x_6, x_7, x_10);
 x_12 = l_Lean_mkOptionalNode___closed__2;
@@ -33848,7 +33848,7 @@ lean_ctor_set(x_19, 1, x_4);
 return x_19;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -33856,22 +33856,22 @@ x_1 = lean_mk_string("Lean.Meta.DSimp.Config");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__2() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__2;
+x_3 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -33879,7 +33879,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__4() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -33887,51 +33887,51 @@ x_1 = lean_mk_string("DSimp");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__5() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Tactic__tacticErw______1___closed__26;
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__4;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__5;
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8;
+x_1 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__5;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__7() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8() {
+static lean_object* _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__7;
+x_2 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__7;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876_(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; lean_object* x_8; uint8_t x_9; 
@@ -33995,12 +33995,12 @@ lean_inc(x_11);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_11);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6;
+x_30 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6;
 lean_inc(x_13);
 lean_inc(x_14);
 x_31 = l_Lean_addMacroScope(x_14, x_30, x_13);
-x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3;
-x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8;
+x_32 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3;
+x_33 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8;
 lean_inc(x_11);
 x_34 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_34, 0, x_11);
@@ -34077,11 +34077,11 @@ x_68 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_68, 0, x_38);
 lean_ctor_set(x_68, 1, x_43);
 lean_ctor_set(x_68, 2, x_67);
-x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_69 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 lean_inc(x_13);
 lean_inc(x_14);
 x_70 = l_Lean_addMacroScope(x_14, x_69, x_13);
-x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_71 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_11);
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_11);
@@ -34096,10 +34096,10 @@ x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_38);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
-x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_78 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_79 = l_Lean_addMacroScope(x_14, x_78, x_13);
-x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_80 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_81 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_11);
 x_82 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_82, 0, x_11);
@@ -34137,7 +34137,7 @@ x_97 = lean_array_push(x_96, x_61);
 lean_inc(x_97);
 x_98 = lean_array_push(x_97, x_68);
 x_99 = lean_array_push(x_98, x_93);
-x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_100 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_101 = lean_array_push(x_99, x_100);
 x_102 = lean_array_push(x_101, x_74);
 lean_inc(x_95);
@@ -34150,14 +34150,14 @@ lean_ctor_set(x_105, 2, x_103);
 x_106 = lean_array_push(x_50, x_57);
 x_107 = lean_array_push(x_106, x_59);
 x_108 = lean_array_push(x_107, x_105);
-x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_109 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_110 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_110, 0, x_38);
 lean_ctor_set(x_110, 1, x_109);
 lean_ctor_set(x_110, 2, x_108);
 x_111 = lean_array_push(x_35, x_22);
 x_112 = lean_array_push(x_111, x_110);
-x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_113 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_114 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_114, 0, x_38);
 lean_ctor_set(x_114, 1, x_113);
@@ -34208,7 +34208,7 @@ x_141 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_141, 0, x_38);
 lean_ctor_set(x_141, 1, x_8);
 lean_ctor_set(x_141, 2, x_140);
-x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1(x_1, x_141, x_2, x_12);
+x_142 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1(x_1, x_141, x_2, x_12);
 lean_dec(x_2);
 return x_142;
 }
@@ -34266,12 +34266,12 @@ lean_inc(x_146);
 x_164 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_164, 0, x_146);
 lean_ctor_set(x_164, 1, x_163);
-x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6;
+x_165 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6;
 lean_inc(x_148);
 lean_inc(x_149);
 x_166 = l_Lean_addMacroScope(x_149, x_165, x_148);
-x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3;
-x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8;
+x_167 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3;
+x_168 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8;
 lean_inc(x_146);
 x_169 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_169, 0, x_146);
@@ -34348,11 +34348,11 @@ x_203 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_203, 0, x_173);
 lean_ctor_set(x_203, 1, x_178);
 lean_ctor_set(x_203, 2, x_202);
-x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14;
+x_204 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14;
 lean_inc(x_148);
 lean_inc(x_149);
 x_205 = l_Lean_addMacroScope(x_149, x_204, x_148);
-x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13;
+x_206 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13;
 lean_inc(x_146);
 x_207 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_207, 0, x_146);
@@ -34367,10 +34367,10 @@ x_212 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_212, 0, x_173);
 lean_ctor_set(x_212, 1, x_211);
 lean_ctor_set(x_212, 2, x_210);
-x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17;
+x_213 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17;
 x_214 = l_Lean_addMacroScope(x_149, x_213, x_148);
-x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16;
-x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19;
+x_215 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16;
+x_216 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19;
 lean_inc(x_146);
 x_217 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_217, 0, x_146);
@@ -34406,7 +34406,7 @@ x_231 = l_Lean_Parser_Tactic___aux__Init__Meta______macroRules__Lean__Parser__Ta
 x_232 = lean_array_push(x_231, x_196);
 x_233 = lean_array_push(x_232, x_203);
 x_234 = lean_array_push(x_233, x_228);
-x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20;
+x_235 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20;
 x_236 = lean_array_push(x_234, x_235);
 x_237 = lean_array_push(x_236, x_209);
 x_238 = lean_array_push(x_237, x_230);
@@ -34418,14 +34418,14 @@ lean_ctor_set(x_240, 2, x_238);
 x_241 = lean_array_push(x_185, x_192);
 x_242 = lean_array_push(x_241, x_194);
 x_243 = lean_array_push(x_242, x_240);
-x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2;
+x_244 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2;
 x_245 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_245, 0, x_173);
 lean_ctor_set(x_245, 1, x_244);
 lean_ctor_set(x_245, 2, x_243);
 x_246 = lean_array_push(x_170, x_157);
 x_247 = lean_array_push(x_246, x_245);
-x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1;
+x_248 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1;
 x_249 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_249, 0, x_173);
 lean_ctor_set(x_249, 1, x_248);
@@ -34452,17 +34452,17 @@ x_262 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_262, 0, x_173);
 lean_ctor_set(x_262, 1, x_8);
 lean_ctor_set(x_262, 2, x_261);
-x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1(x_1, x_262, x_2, x_147);
+x_263 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1(x_1, x_262, x_2, x_147);
 lean_dec(x_2);
 return x_263;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 return x_5;
 }
@@ -35867,48 +35867,48 @@ l_Lean_Parser_Tactic_simpAutoUnfold___closed__25 = _init_l_Lean_Parser_Tactic_si
 lean_mark_persistent(l_Lean_Parser_Tactic_simpAutoUnfold___closed__25);
 l_Lean_Parser_Tactic_simpAutoUnfold = _init_l_Lean_Parser_Tactic_simpAutoUnfold();
 lean_mark_persistent(l_Lean_Parser_Tactic_simpAutoUnfold);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____lambda__1___closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__2);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__3);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__4 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__4();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__4);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__5);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__6 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__6();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__6);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__7);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__8);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__9);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__10 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__10();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__10);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__11);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__12 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__12();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__12);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__13);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__14);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__15 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__15();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__15);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__16);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__17);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__18 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__18();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__18);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__19);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13739____closed__20);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____lambda__1___closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__2);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__3);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__4 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__4();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__4);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__5);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__6 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__6();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__6);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__7);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__8);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__9);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__10 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__10();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__10);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__11);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__12 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__12();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__12);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__13);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__14);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__15 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__15();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__15);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__16);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__17);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__18 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__18();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__18);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__19);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_13740____closed__20);
 l_Lean_Parser_Tactic_simpArith___closed__1 = _init_l_Lean_Parser_Tactic_simpArith___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_simpArith___closed__1);
 l_Lean_Parser_Tactic_simpArith___closed__2 = _init_l_Lean_Parser_Tactic_simpArith___closed__2();
@@ -35931,12 +35931,12 @@ l_Lean_Parser_Tactic_simpArith___closed__10 = _init_l_Lean_Parser_Tactic_simpAri
 lean_mark_persistent(l_Lean_Parser_Tactic_simpArith___closed__10);
 l_Lean_Parser_Tactic_simpArith = _init_l_Lean_Parser_Tactic_simpArith();
 lean_mark_persistent(l_Lean_Parser_Tactic_simpArith);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__2);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14556____closed__3);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__2);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_14557____closed__3);
 l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__1 = _init_l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__1);
 l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__2 = _init_l_Lean_Parser_Tactic_simpArithAutoUnfold___closed__2();
@@ -35987,22 +35987,22 @@ l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__13 = _init_l_Lean_Parser_Tactic
 lean_mark_persistent(l_Lean_Parser_Tactic_simpAllAutoUnfold___closed__13);
 l_Lean_Parser_Tactic_simpAllAutoUnfold = _init_l_Lean_Parser_Tactic_simpAllAutoUnfold();
 lean_mark_persistent(l_Lean_Parser_Tactic_simpAllAutoUnfold);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____lambda__1___closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__2();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__2);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__3);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__4 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__4();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__4);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__5);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__6 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__6();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__6);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16322____closed__7);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____lambda__1___closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__2();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__2);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__3);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__4 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__4();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__4);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__5);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__6 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__6();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__6);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_16323____closed__7);
 l_Lean_Parser_Tactic_simpAllArith___closed__1 = _init_l_Lean_Parser_Tactic_simpAllArith___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_simpAllArith___closed__1);
 l_Lean_Parser_Tactic_simpAllArith___closed__2 = _init_l_Lean_Parser_Tactic_simpAllArith___closed__2();
@@ -36065,24 +36065,24 @@ l_Lean_Parser_Tactic_dsimpAutoUnfold___closed__10 = _init_l_Lean_Parser_Tactic_d
 lean_mark_persistent(l_Lean_Parser_Tactic_dsimpAutoUnfold___closed__10);
 l_Lean_Parser_Tactic_dsimpAutoUnfold = _init_l_Lean_Parser_Tactic_dsimpAutoUnfold();
 lean_mark_persistent(l_Lean_Parser_Tactic_dsimpAutoUnfold);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____lambda__1___closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__1);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__2();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__2);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__3);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__4 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__4();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__4);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__5 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__5();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__5);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__6);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__7 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__7();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__7);
-l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8();
-lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18875____closed__8);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____lambda__1___closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__1);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__2 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__2();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__2);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__3);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__4 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__4();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__4);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__5 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__5();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__5);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__6);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__7 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__7();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__7);
+l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8 = _init_l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8();
+lean_mark_persistent(l_Lean_Parser_Tactic_expandSimp____x40_Init_Meta___hyg_18876____closed__8);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Notation.c b/stage0/stdlib/Init/Notation.c
index beccf0ab7e..715010a0d3 100644
--- a/stage0/stdlib/Init/Notation.c
+++ b/stage0/stdlib/Init/Notation.c
@@ -33,7 +33,6 @@ static lean_object* l_Lean_Parser_Syntax_addPrec___closed__17;
 static lean_object* l_term_x25_x5b___x7c___x5d___closed__2;
 static lean_object* l_Lean_Parser_Tactic_exact___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_tacticTrivial;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__1;
 static lean_object* l_Lean_Parser_Tactic_intros___closed__7;
 static lean_object* l_termDepIfThenElse___closed__26;
 static lean_object* l_term___x2f_x5c_____closed__1;
@@ -54,7 +53,6 @@ static lean_object* l_stx___x3c_x7c_x3e_____closed__9;
 static lean_object* l___aux__Init__Notation______macroRules__termDepIfThenElse__1___closed__14;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__Complement__complement__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_term___x3c_x24_x3e_____closed__2;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__2;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3e_x3e____1___closed__5;
 static lean_object* l_term___x2b_x2b_____closed__4;
 static lean_object* l_term___u2264_____closed__3;
@@ -124,7 +122,6 @@ static lean_object* l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___
 static lean_object* l_precMax___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_refine_x27;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x24_x3e____1___closed__7;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__8;
 static lean_object* l_Lean_Parser_Tactic_first___closed__9;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticTrivial__6___closed__6;
 static lean_object* l_boolIfThenElse___closed__13;
@@ -281,7 +278,6 @@ static lean_object* l_Lean_Parser_Tactic_simpPre___closed__4;
 static lean_object* l_stx___x2c_x2b___closed__3;
 static lean_object* l_term___x2a_x3e_____closed__6;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__HShiftRight__hShiftRight__1___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__9;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x2a_x3e____1___closed__2;
 static lean_object* l_Lean_Parser_Tactic_rwSeq___closed__8;
 static lean_object* l_Lean_Parser_Tactic_simpStar___closed__2;
@@ -345,6 +341,7 @@ static lean_object* l_term___x7c_x7c_x7c_____closed__2;
 static lean_object* l_Lean_Parser_Tactic_injection___closed__8;
 static lean_object* l_Lean_Parser_Tactic_changeWith___closed__5;
 static lean_object* l___aux__Init__Notation______macroRules__term___x2d____1___closed__9;
+static lean_object* l_Lean_rawStx_quot___closed__10;
 LEAN_EXPORT lean_object* l_prioMid;
 static lean_object* l_Lean_Parser_Tactic_rwSeq___closed__1;
 static lean_object* l___aux__Init__Notation______macroRules__term___x2d____1___closed__4;
@@ -474,6 +471,7 @@ static lean_object* l___aux__Init__Notation______macroRules__term___x2a_x3e____1
 static lean_object* l___aux__Init__Notation______macroRules__term___x3e_x3e_x3e____1___closed__2;
 static lean_object* l_term___u2208_____closed__6;
 static lean_object* l_Lean_Parser_Tactic_renameI___closed__2;
+static lean_object* l_Lean_rawStx_quot___closed__7;
 static lean_object* l_termDepIfThenElse___closed__7;
 static lean_object* l_Lean_Parser_Tactic_cases___closed__3;
 static lean_object* l_Lean_Parser_Tactic_generalizeArg___closed__5;
@@ -483,6 +481,7 @@ static lean_object* l_Lean___aux__Init__Notation______macroRules__term_x5b___x5d
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticShow____1___closed__1;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__prioLow__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticShow____1___closed__2;
+LEAN_EXPORT lean_object* l_Lean_rawStx_quot;
 static lean_object* l_Lean_Parser_Tactic_clear___closed__4;
 static lean_object* l_Lean_Parser_Tactic_tacticHave_____x3a_x3d_____closed__5;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__or__1___boxed(lean_object*, lean_object*, lean_object*);
@@ -504,7 +503,6 @@ LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__term___x2f_x5c
 LEAN_EXPORT lean_object* l_term___u2227__;
 static lean_object* l_term___x5e_____closed__5;
 lean_object* lean_string_utf8_byte_size(lean_object*);
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__6;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__HDiv__hDiv__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_precArg___closed__1;
 static lean_object* l_term___x3c_x3d_____closed__4;
@@ -773,6 +771,7 @@ static lean_object* l_Lean_Parser_Tactic_dsimp___closed__4;
 static lean_object* l___aux__Init__Notation______macroRules__stx___x3c_x7c_x3e____1___closed__1;
 static lean_object* l_Lean_Parser_Tactic_unfold___closed__3;
 static lean_object* l_term___u2218_____closed__2;
+static lean_object* l_Lean_rawStx_quot___closed__3;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__HXor__hXor__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___aux__Init__Notation______macroRules__term___u2209____1___closed__3;
 static lean_object* l_termDepIfThenElse___closed__32;
@@ -1039,7 +1038,6 @@ static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x7c_x3e_
 static lean_object* l_Lean_Parser_Tactic_rotateLeft___closed__6;
 static lean_object* l_term_xac_____closed__3;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticInfer__instance__1___closed__5;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__4;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__term___x3d____2(lean_object*, lean_object*, lean_object*);
 static lean_object* l_term_x7b_____x3a___x2f_x2f___x7d___closed__3;
 static lean_object* l___aux__Init__Notation______macroRules__stx___x2b__1___closed__3;
@@ -1063,6 +1061,7 @@ static lean_object* l_term___x3a_x3a_____closed__1;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticInfer__instance__1___closed__6;
 static lean_object* l_precLead___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_delta;
+static lean_object* l_Lean_rawStx_quot___closed__6;
 static lean_object* l_Lean_Parser_Tactic_casesTarget___closed__1;
 LEAN_EXPORT lean_object* l_term___x3e_x3d__;
 LEAN_EXPORT lean_object* l_prioDefault;
@@ -1228,7 +1227,6 @@ static lean_object* l_Lean_Parser_Tactic_tacticSuffices_____closed__7;
 static lean_object* l___aux__Init__Notation______macroRules__termIfLet___x3a_x3d__Then__Else____1___closed__2;
 static lean_object* l___aux__Init__Notation______macroRules__term___xd7____1___closed__5;
 static lean_object* l___aux__Init__Notation______macroRules__term___x2a____1___closed__4;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__10;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__term___x3a_x3a____1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__Function__comp__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l___aux__Init__Notation______macroRules__term___x5e_x5e_x5e____1___closed__6;
@@ -1389,6 +1387,7 @@ static lean_object* l_term___u2208_____closed__2;
 static lean_object* l_Lean_Parser_Tactic_tacticNext_______x3d_x3e_____closed__6;
 static lean_object* l___aux__Init__Notation______macroRules__termDepIfThenElse__1___closed__1;
 static lean_object* l_term___x5c_x2f_____closed__1;
+static lean_object* l_Lean_rawStx_quot___closed__9;
 static lean_object* l_Lean_Parser_Tactic_tacticRfl_x27___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_tacticLet__;
 static lean_object* l_term_x25_x5b___x7c___x5d___closed__9;
@@ -1453,9 +1452,11 @@ static lean_object* l_term___x3e_____closed__1;
 static lean_object* l_term_x25_x5b___x7c___x5d___closed__8;
 static lean_object* l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__7;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__And__1(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_rawStx_quot___closed__1;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__HAnd__hAnd__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_term___x5e_____closed__2;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__HMul__hMul__1___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_rawStx_quot___closed__2;
 static lean_object* l_Lean_Parser_Tactic_simp___closed__3;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c____1___closed__4;
 LEAN_EXPORT lean_object* l_prioHigh;
@@ -1518,6 +1519,7 @@ static lean_object* l_term___x2b_x2b_____closed__1;
 static lean_object* l_stx___x3c_x7c_x3e_____closed__7;
 static lean_object* l_Lean_Parser_Tactic_changeWith___closed__6;
 static lean_object* l_Lean_Parser_Tactic_simpPre___closed__2;
+static lean_object* l_Lean_rawStx_quot___closed__8;
 static lean_object* l_Lean_Parser_Tactic_fail___closed__3;
 static lean_object* l_Lean_Parser_Tactic_ac__refl___closed__1;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__term___x3e_x3d____2(lean_object*, lean_object*, lean_object*);
@@ -1570,6 +1572,7 @@ static lean_object* l___aux__Init__Notation______macroRules__stx___x3c_x7c_x3e__
 static lean_object* l_Lean___aux__Init__Notation______macroRules__term_x5b___x5d__1___closed__4;
 static lean_object* l_Lean_Parser_Tactic_simp___closed__15;
 static lean_object* l_Lean_Parser_Tactic_tacticExists___x2c_x2c___closed__2;
+static lean_object* l_Lean_rawStx_quot___closed__4;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__HShiftRight__hShiftRight__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_term___x3d_____closed__2;
 static lean_object* l_Lean_Parser_Tactic_refine___closed__4;
@@ -1658,12 +1661,12 @@ static lean_object* l___aux__Init__Notation______macroRules__term___x3d_x3d____1
 static lean_object* l___aux__Init__Notation______macroRules__stx_x21____1___closed__3;
 static lean_object* l_Lean_Parser_Tactic_tacticRepeat_____closed__6;
 LEAN_EXPORT lean_object* l_term_x7b_____x3a___x2f_x2f___x7d;
+static lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__term___x7c_x3e____1(lean_object*, lean_object*, lean_object*);
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c____1___closed__7;
 static lean_object* l_Lean_Parser_Tactic_case___closed__8;
 static lean_object* l_term___x7c_x7c_____closed__6;
 static lean_object* l_termWithout__expected__type_____closed__1;
-LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_rawStx_quot;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_change;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x2a_x3e____1___closed__4;
 static lean_object* l_Lean_Parser_Tactic_simp___closed__5;
@@ -1712,6 +1715,7 @@ static lean_object* l___aux__Init__Notation______macroRules__term___x7c_x7c_x7c_
 LEAN_EXPORT lean_object* l___aux__Init__Notation______unexpand__and__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_withReducibleAndInstances;
 static lean_object* l_Lean_Parser_Tactic_unfold___closed__6;
+static lean_object* l_Lean_rawStx_quot___closed__5;
 static lean_object* l_termIfLet___x3a_x3d__Then__Else_____closed__6;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x2a_x3e____1___closed__6;
 static lean_object* l_Lean_Parser_Tactic_ac__refl___closed__5;
@@ -1932,7 +1936,6 @@ static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x7c_x3e_
 static lean_object* l_Lean_Parser_Tactic_focus___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticRepeat____1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_term___x26_x26_x26_____closed__5;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__3;
 static lean_object* l___aux__Init__Notation______macroRules__term___x3c_x3d____1___closed__7;
 static lean_object* l_Lean_Parser_Tactic_rwSeq___closed__2;
 static lean_object* l_Lean_Parser_Tactic_changeWith___closed__3;
@@ -2234,7 +2237,6 @@ static lean_object* l_term___x2a_x3e_____closed__2;
 static lean_object* l_Lean_Parser_Tactic_letrec___closed__10;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__prio_x28___x29__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_split___closed__8;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__7;
 static lean_object* l_Lean_Parser_Tactic_tacticAdmit___closed__4;
 static lean_object* l___aux__Init__Notation______macroRules__term___x2b_x2b____1___closed__7;
 static lean_object* l_Lean_termThis___closed__2;
@@ -2275,7 +2277,6 @@ static lean_object* l_Lean_Parser_Tactic_rwSeq___closed__5;
 static lean_object* l_Lean_Parser_Tactic_anyGoals___closed__4;
 static lean_object* l_Lean_Parser_Tactic_unfold___closed__7;
 static lean_object* l_Lean_Parser_Tactic_tacticRfl_x27___closed__5;
-static lean_object* l_Lean_Parser_Tactic_rawStx_quot___closed__5;
 static lean_object* l_Lean_Parser_Tactic_tacticRepeat_____closed__4;
 static lean_object* l_Lean_Parser_Tactic_traceMessage___closed__7;
 LEAN_EXPORT lean_object* l___aux__Init__Notation______macroRules__term___u2265____2(lean_object*, lean_object*, lean_object*);
@@ -30755,7 +30756,7 @@ lean_dec(x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__1() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -30763,17 +30764,17 @@ x_1 = lean_mk_string("quot");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__2() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___aux__Init__Notation______macroRules__term___u2218____1___closed__2;
-x_2 = l_Lean_Parser_Tactic_rawStx_quot___closed__1;
+x_2 = l_Lean_rawStx_quot___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__3() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -30781,17 +30782,17 @@ x_1 = lean_mk_string("`(rawStx|");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__4() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Tactic_rawStx_quot___closed__3;
+x_1 = l_Lean_rawStx_quot___closed__3;
 x_2 = lean_alloc_ctor(5, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__5() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -30799,21 +30800,21 @@ x_1 = lean_mk_string("rawStx");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__6() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_rawStx_quot___closed__5;
+x_2 = l_Lean_rawStx_quot___closed__5;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__7() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic_rawStx_quot___closed__6;
+x_1 = l_Lean_rawStx_quot___closed__6;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -30821,12 +30822,12 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__8() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Syntax_addPrec___closed__10;
-x_2 = l_Lean_Parser_Tactic_rawStx_quot___closed__7;
+x_2 = l_Lean_rawStx_quot___closed__7;
 x_3 = l_prec_x28___x29___closed__8;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
@@ -30835,13 +30836,13 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__9() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Syntax_addPrec___closed__10;
-x_2 = l_Lean_Parser_Tactic_rawStx_quot___closed__4;
-x_3 = l_Lean_Parser_Tactic_rawStx_quot___closed__8;
+x_2 = l_Lean_rawStx_quot___closed__4;
+x_3 = l_Lean_rawStx_quot___closed__8;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -30849,13 +30850,13 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot___closed__10() {
+static lean_object* _init_l_Lean_rawStx_quot___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Tactic_rawStx_quot___closed__2;
+x_1 = l_Lean_rawStx_quot___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Tactic_rawStx_quot___closed__9;
+x_3 = l_Lean_rawStx_quot___closed__9;
 x_4 = lean_alloc_ctor(3, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -30863,11 +30864,11 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_rawStx_quot() {
+static lean_object* _init_l_Lean_rawStx_quot() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Tactic_rawStx_quot___closed__10;
+x_1 = l_Lean_rawStx_quot___closed__10;
 return x_1;
 }
 }
@@ -30933,7 +30934,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Syntax_addPrec___closed__10;
 x_2 = l_Lean_Parser_Tactic_withAnnotateState___closed__6;
-x_3 = l_Lean_Parser_Tactic_rawStx_quot___closed__7;
+x_3 = l_Lean_rawStx_quot___closed__7;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -34253,6 +34254,14 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Notation______macroR
 _start:
 {
 lean_object* x_1; 
+x_1 = lean_mk_string("with_annotate_state");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2() {
+_start:
+{
+lean_object* x_1; 
 x_1 = lean_mk_string("all_goals");
 return x_1;
 }
@@ -34277,293 +34286,259 @@ return x_7;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
 x_8 = lean_unsigned_to_nat(0u);
 x_9 = l_Lean_Syntax_getArg(x_1, x_8);
-x_10 = lean_unsigned_to_nat(2u);
+x_10 = lean_unsigned_to_nat(1u);
 x_11 = l_Lean_Syntax_getArg(x_1, x_10);
+x_12 = lean_unsigned_to_nat(2u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
 lean_dec(x_1);
-x_12 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_2, x_3);
-x_13 = !lean_is_exclusive(x_12);
-if (x_13 == 0)
+x_14 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_2, x_3);
+x_15 = !lean_is_exclusive(x_14);
+if (x_15 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_14 = lean_ctor_get(x_12, 0);
-x_15 = l_Lean_Parser_Tactic_focus___closed__1;
-lean_inc(x_14);
-x_16 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-x_17 = l_prec_x28___x29___closed__3;
-lean_inc(x_14);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_16 = lean_ctor_get(x_14, 0);
+x_17 = l_Lean_Parser_Tactic_focus___closed__1;
+lean_inc(x_16);
 x_18 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_18, 0, x_14);
+lean_ctor_set(x_18, 0, x_16);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l___aux__Init__Notation______macroRules__termDepIfThenElse__1___closed__9;
-lean_inc(x_14);
-x_20 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_20, 0, x_14);
-lean_ctor_set(x_20, 1, x_19);
-x_21 = l___aux__Init__Notation______macroRules__precMax__1___closed__4;
-x_22 = lean_array_push(x_21, x_20);
+x_19 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__10;
+x_20 = lean_array_push(x_19, x_9);
+x_21 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__12;
+x_22 = lean_array_push(x_20, x_21);
 x_23 = lean_box(2);
-x_24 = l___aux__Init__Notation______macroRules__stx___x2b__1___closed__8;
+x_24 = l_Lean_Parser_Tactic_first___closed__8;
 x_25 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_25, 0, x_23);
 lean_ctor_set(x_25, 1, x_24);
 lean_ctor_set(x_25, 2, x_22);
-x_26 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__10;
-x_27 = lean_array_push(x_26, x_9);
-x_28 = lean_array_push(x_27, x_25);
-x_29 = l_Lean_Parser_Tactic_first___closed__8;
-x_30 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_30, 0, x_23);
-lean_ctor_set(x_30, 1, x_29);
-lean_ctor_set(x_30, 2, x_28);
-x_31 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1;
-lean_inc(x_14);
-x_32 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_32, 0, x_14);
-lean_ctor_set(x_32, 1, x_31);
-x_33 = lean_array_push(x_26, x_11);
-x_34 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__12;
-x_35 = lean_array_push(x_33, x_34);
-x_36 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_36, 0, x_23);
-lean_ctor_set(x_36, 1, x_29);
-lean_ctor_set(x_36, 2, x_35);
-x_37 = lean_array_push(x_21, x_36);
-x_38 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_38, 0, x_23);
-lean_ctor_set(x_38, 1, x_24);
-lean_ctor_set(x_38, 2, x_37);
-x_39 = lean_array_push(x_21, x_38);
-x_40 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
-x_41 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_41, 0, x_23);
-lean_ctor_set(x_41, 1, x_40);
-lean_ctor_set(x_41, 2, x_39);
-x_42 = lean_array_push(x_21, x_41);
-x_43 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticNext_______x3d_x3e____1___closed__1;
-x_44 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_44, 0, x_23);
+x_26 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1;
+lean_inc(x_16);
+x_27 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_27, 0, x_16);
+lean_ctor_set(x_27, 1, x_26);
+x_28 = l_Lean_Parser_Tactic_skip___closed__1;
+lean_inc(x_16);
+x_29 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_29, 0, x_16);
+lean_ctor_set(x_29, 1, x_28);
+x_30 = l___aux__Init__Notation______macroRules__precMax__1___closed__4;
+x_31 = lean_array_push(x_30, x_29);
+x_32 = l_Lean_Parser_Tactic_skip___closed__2;
+x_33 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_33, 0, x_23);
+lean_ctor_set(x_33, 1, x_32);
+lean_ctor_set(x_33, 2, x_31);
+x_34 = l___aux__Init__Notation______unexpand__Function__comp__1___closed__3;
+x_35 = lean_array_push(x_34, x_27);
+x_36 = lean_array_push(x_35, x_11);
+x_37 = lean_array_push(x_36, x_33);
+x_38 = l_Lean_Parser_Tactic_withAnnotateState___closed__4;
+x_39 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_39, 0, x_23);
+lean_ctor_set(x_39, 1, x_38);
+lean_ctor_set(x_39, 2, x_37);
+x_40 = lean_array_push(x_19, x_39);
+x_41 = lean_array_push(x_40, x_21);
+x_42 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_42, 0, x_23);
+lean_ctor_set(x_42, 1, x_24);
+lean_ctor_set(x_42, 2, x_41);
+x_43 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2;
+x_44 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_44, 0, x_16);
 lean_ctor_set(x_44, 1, x_43);
-lean_ctor_set(x_44, 2, x_42);
-x_45 = lean_array_push(x_26, x_32);
-x_46 = lean_array_push(x_45, x_44);
-x_47 = l_Lean_Parser_Tactic_allGoals___closed__2;
-x_48 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_48, 0, x_23);
-lean_ctor_set(x_48, 1, x_47);
-lean_ctor_set(x_48, 2, x_46);
-x_49 = lean_array_push(x_26, x_48);
-x_50 = lean_array_push(x_49, x_34);
-x_51 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_51, 0, x_23);
-lean_ctor_set(x_51, 1, x_29);
-lean_ctor_set(x_51, 2, x_50);
-x_52 = lean_array_push(x_26, x_30);
-x_53 = lean_array_push(x_52, x_51);
-x_54 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_54, 0, x_23);
-lean_ctor_set(x_54, 1, x_24);
-lean_ctor_set(x_54, 2, x_53);
-x_55 = lean_array_push(x_21, x_54);
+x_45 = lean_array_push(x_19, x_13);
+x_46 = lean_array_push(x_45, x_21);
+x_47 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_47, 0, x_23);
+lean_ctor_set(x_47, 1, x_24);
+lean_ctor_set(x_47, 2, x_46);
+x_48 = lean_array_push(x_30, x_47);
+x_49 = l___aux__Init__Notation______macroRules__stx___x2b__1___closed__8;
+x_50 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_50, 0, x_23);
+lean_ctor_set(x_50, 1, x_49);
+lean_ctor_set(x_50, 2, x_48);
+x_51 = lean_array_push(x_30, x_50);
+x_52 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_53 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_53, 0, x_23);
+lean_ctor_set(x_53, 1, x_52);
+lean_ctor_set(x_53, 2, x_51);
+x_54 = lean_array_push(x_30, x_53);
+x_55 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticNext_______x3d_x3e____1___closed__1;
 x_56 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_56, 0, x_23);
-lean_ctor_set(x_56, 1, x_40);
-lean_ctor_set(x_56, 2, x_55);
-x_57 = lean_array_push(x_21, x_56);
-x_58 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_58, 0, x_23);
-lean_ctor_set(x_58, 1, x_43);
-lean_ctor_set(x_58, 2, x_57);
-x_59 = l_prec_x28___x29___closed__7;
-x_60 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_60, 0, x_14);
+lean_ctor_set(x_56, 1, x_55);
+lean_ctor_set(x_56, 2, x_54);
+x_57 = lean_array_push(x_19, x_44);
+x_58 = lean_array_push(x_57, x_56);
+x_59 = l_Lean_Parser_Tactic_allGoals___closed__2;
+x_60 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_60, 0, x_23);
 lean_ctor_set(x_60, 1, x_59);
-x_61 = l___aux__Init__Notation______unexpand__Function__comp__1___closed__3;
-x_62 = lean_array_push(x_61, x_18);
-x_63 = lean_array_push(x_62, x_58);
-x_64 = lean_array_push(x_63, x_60);
-x_65 = l_Lean_Parser_Tactic_paren___closed__1;
-x_66 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_66, 0, x_23);
-lean_ctor_set(x_66, 1, x_65);
-lean_ctor_set(x_66, 2, x_64);
-x_67 = lean_array_push(x_26, x_66);
-x_68 = lean_array_push(x_67, x_34);
+lean_ctor_set(x_60, 2, x_58);
+x_61 = lean_array_push(x_19, x_60);
+x_62 = lean_array_push(x_61, x_21);
+x_63 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_63, 0, x_23);
+lean_ctor_set(x_63, 1, x_24);
+lean_ctor_set(x_63, 2, x_62);
+x_64 = lean_array_push(x_34, x_25);
+x_65 = lean_array_push(x_64, x_42);
+x_66 = lean_array_push(x_65, x_63);
+x_67 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_67, 0, x_23);
+lean_ctor_set(x_67, 1, x_49);
+lean_ctor_set(x_67, 2, x_66);
+x_68 = lean_array_push(x_30, x_67);
 x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_23);
-lean_ctor_set(x_69, 1, x_29);
+lean_ctor_set(x_69, 1, x_52);
 lean_ctor_set(x_69, 2, x_68);
-x_70 = lean_array_push(x_21, x_69);
+x_70 = lean_array_push(x_30, x_69);
 x_71 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_71, 0, x_23);
-lean_ctor_set(x_71, 1, x_24);
+lean_ctor_set(x_71, 1, x_55);
 lean_ctor_set(x_71, 2, x_70);
-x_72 = lean_array_push(x_21, x_71);
-x_73 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_73, 0, x_23);
-lean_ctor_set(x_73, 1, x_40);
-lean_ctor_set(x_73, 2, x_72);
-x_74 = lean_array_push(x_21, x_73);
+x_72 = lean_array_push(x_19, x_18);
+x_73 = lean_array_push(x_72, x_71);
+x_74 = l_Lean_Parser_Tactic_focus___closed__2;
 x_75 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_75, 0, x_23);
-lean_ctor_set(x_75, 1, x_43);
-lean_ctor_set(x_75, 2, x_74);
-x_76 = lean_array_push(x_26, x_16);
-x_77 = lean_array_push(x_76, x_75);
-x_78 = l_Lean_Parser_Tactic_focus___closed__2;
-x_79 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_79, 0, x_23);
-lean_ctor_set(x_79, 1, x_78);
-lean_ctor_set(x_79, 2, x_77);
-lean_ctor_set(x_12, 0, x_79);
-return x_12;
+lean_ctor_set(x_75, 1, x_74);
+lean_ctor_set(x_75, 2, x_73);
+lean_ctor_set(x_14, 0, x_75);
+return x_14;
 }
 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; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
-x_80 = lean_ctor_get(x_12, 0);
-x_81 = lean_ctor_get(x_12, 1);
-lean_inc(x_81);
-lean_inc(x_80);
-lean_dec(x_12);
-x_82 = l_Lean_Parser_Tactic_focus___closed__1;
-lean_inc(x_80);
-x_83 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_83, 0, x_80);
-lean_ctor_set(x_83, 1, x_82);
-x_84 = l_prec_x28___x29___closed__3;
-lean_inc(x_80);
-x_85 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_85, 0, x_80);
-lean_ctor_set(x_85, 1, x_84);
-x_86 = l___aux__Init__Notation______macroRules__termDepIfThenElse__1___closed__9;
-lean_inc(x_80);
-x_87 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_87, 0, x_80);
-lean_ctor_set(x_87, 1, x_86);
-x_88 = l___aux__Init__Notation______macroRules__precMax__1___closed__4;
-x_89 = lean_array_push(x_88, x_87);
-x_90 = lean_box(2);
-x_91 = l___aux__Init__Notation______macroRules__stx___x2b__1___closed__8;
-x_92 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-lean_ctor_set(x_92, 2, x_89);
-x_93 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__10;
-x_94 = lean_array_push(x_93, x_9);
-x_95 = lean_array_push(x_94, x_92);
-x_96 = l_Lean_Parser_Tactic_first___closed__8;
-x_97 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_97, 0, x_90);
-lean_ctor_set(x_97, 1, x_96);
-lean_ctor_set(x_97, 2, x_95);
-x_98 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1;
-lean_inc(x_80);
-x_99 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_99, 0, x_80);
-lean_ctor_set(x_99, 1, x_98);
-x_100 = lean_array_push(x_93, x_11);
-x_101 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__12;
-x_102 = lean_array_push(x_100, x_101);
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_76 = lean_ctor_get(x_14, 0);
+x_77 = lean_ctor_get(x_14, 1);
+lean_inc(x_77);
+lean_inc(x_76);
+lean_dec(x_14);
+x_78 = l_Lean_Parser_Tactic_focus___closed__1;
+lean_inc(x_76);
+x_79 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_79, 0, x_76);
+lean_ctor_set(x_79, 1, x_78);
+x_80 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__10;
+x_81 = lean_array_push(x_80, x_9);
+x_82 = l___aux__Init__Notation______macroRules__stx___x2c_x2a__1___closed__12;
+x_83 = lean_array_push(x_81, x_82);
+x_84 = lean_box(2);
+x_85 = l_Lean_Parser_Tactic_first___closed__8;
+x_86 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_86, 0, x_84);
+lean_ctor_set(x_86, 1, x_85);
+lean_ctor_set(x_86, 2, x_83);
+x_87 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1;
+lean_inc(x_76);
+x_88 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_88, 0, x_76);
+lean_ctor_set(x_88, 1, x_87);
+x_89 = l_Lean_Parser_Tactic_skip___closed__1;
+lean_inc(x_76);
+x_90 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_90, 0, x_76);
+lean_ctor_set(x_90, 1, x_89);
+x_91 = l___aux__Init__Notation______macroRules__precMax__1___closed__4;
+x_92 = lean_array_push(x_91, x_90);
+x_93 = l_Lean_Parser_Tactic_skip___closed__2;
+x_94 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_94, 0, x_84);
+lean_ctor_set(x_94, 1, x_93);
+lean_ctor_set(x_94, 2, x_92);
+x_95 = l___aux__Init__Notation______unexpand__Function__comp__1___closed__3;
+x_96 = lean_array_push(x_95, x_88);
+x_97 = lean_array_push(x_96, x_11);
+x_98 = lean_array_push(x_97, x_94);
+x_99 = l_Lean_Parser_Tactic_withAnnotateState___closed__4;
+x_100 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_100, 0, x_84);
+lean_ctor_set(x_100, 1, x_99);
+lean_ctor_set(x_100, 2, x_98);
+x_101 = lean_array_push(x_80, x_100);
+x_102 = lean_array_push(x_101, x_82);
 x_103 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_103, 0, x_90);
-lean_ctor_set(x_103, 1, x_96);
+lean_ctor_set(x_103, 0, x_84);
+lean_ctor_set(x_103, 1, x_85);
 lean_ctor_set(x_103, 2, x_102);
-x_104 = lean_array_push(x_88, x_103);
-x_105 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_105, 0, x_90);
-lean_ctor_set(x_105, 1, x_91);
-lean_ctor_set(x_105, 2, x_104);
-x_106 = lean_array_push(x_88, x_105);
-x_107 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_104 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2;
+x_105 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_105, 0, x_76);
+lean_ctor_set(x_105, 1, x_104);
+x_106 = lean_array_push(x_80, x_13);
+x_107 = lean_array_push(x_106, x_82);
 x_108 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_108, 0, x_90);
-lean_ctor_set(x_108, 1, x_107);
-lean_ctor_set(x_108, 2, x_106);
-x_109 = lean_array_push(x_88, x_108);
-x_110 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticNext_______x3d_x3e____1___closed__1;
+lean_ctor_set(x_108, 0, x_84);
+lean_ctor_set(x_108, 1, x_85);
+lean_ctor_set(x_108, 2, x_107);
+x_109 = lean_array_push(x_91, x_108);
+x_110 = l___aux__Init__Notation______macroRules__stx___x2b__1___closed__8;
 x_111 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_111, 0, x_90);
+lean_ctor_set(x_111, 0, x_84);
 lean_ctor_set(x_111, 1, x_110);
 lean_ctor_set(x_111, 2, x_109);
-x_112 = lean_array_push(x_93, x_99);
-x_113 = lean_array_push(x_112, x_111);
-x_114 = l_Lean_Parser_Tactic_allGoals___closed__2;
-x_115 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_115, 0, x_90);
-lean_ctor_set(x_115, 1, x_114);
-lean_ctor_set(x_115, 2, x_113);
-x_116 = lean_array_push(x_93, x_115);
-x_117 = lean_array_push(x_116, x_101);
-x_118 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_118, 0, x_90);
-lean_ctor_set(x_118, 1, x_96);
-lean_ctor_set(x_118, 2, x_117);
-x_119 = lean_array_push(x_93, x_97);
-x_120 = lean_array_push(x_119, x_118);
+x_112 = lean_array_push(x_91, x_111);
+x_113 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_114 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_114, 0, x_84);
+lean_ctor_set(x_114, 1, x_113);
+lean_ctor_set(x_114, 2, x_112);
+x_115 = lean_array_push(x_91, x_114);
+x_116 = l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tacticNext_______x3d_x3e____1___closed__1;
+x_117 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_117, 0, x_84);
+lean_ctor_set(x_117, 1, x_116);
+lean_ctor_set(x_117, 2, x_115);
+x_118 = lean_array_push(x_80, x_105);
+x_119 = lean_array_push(x_118, x_117);
+x_120 = l_Lean_Parser_Tactic_allGoals___closed__2;
 x_121 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_121, 0, x_90);
-lean_ctor_set(x_121, 1, x_91);
-lean_ctor_set(x_121, 2, x_120);
-x_122 = lean_array_push(x_88, x_121);
-x_123 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_123, 0, x_90);
-lean_ctor_set(x_123, 1, x_107);
-lean_ctor_set(x_123, 2, x_122);
-x_124 = lean_array_push(x_88, x_123);
-x_125 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_125, 0, x_90);
-lean_ctor_set(x_125, 1, x_110);
-lean_ctor_set(x_125, 2, x_124);
-x_126 = l_prec_x28___x29___closed__7;
-x_127 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_127, 0, x_80);
-lean_ctor_set(x_127, 1, x_126);
-x_128 = l___aux__Init__Notation______unexpand__Function__comp__1___closed__3;
-x_129 = lean_array_push(x_128, x_85);
-x_130 = lean_array_push(x_129, x_125);
-x_131 = lean_array_push(x_130, x_127);
-x_132 = l_Lean_Parser_Tactic_paren___closed__1;
-x_133 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_133, 0, x_90);
-lean_ctor_set(x_133, 1, x_132);
-lean_ctor_set(x_133, 2, x_131);
-x_134 = lean_array_push(x_93, x_133);
-x_135 = lean_array_push(x_134, x_101);
+lean_ctor_set(x_121, 0, x_84);
+lean_ctor_set(x_121, 1, x_120);
+lean_ctor_set(x_121, 2, x_119);
+x_122 = lean_array_push(x_80, x_121);
+x_123 = lean_array_push(x_122, x_82);
+x_124 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_124, 0, x_84);
+lean_ctor_set(x_124, 1, x_85);
+lean_ctor_set(x_124, 2, x_123);
+x_125 = lean_array_push(x_95, x_86);
+x_126 = lean_array_push(x_125, x_103);
+x_127 = lean_array_push(x_126, x_124);
+x_128 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_128, 0, x_84);
+lean_ctor_set(x_128, 1, x_110);
+lean_ctor_set(x_128, 2, x_127);
+x_129 = lean_array_push(x_91, x_128);
+x_130 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_130, 0, x_84);
+lean_ctor_set(x_130, 1, x_113);
+lean_ctor_set(x_130, 2, x_129);
+x_131 = lean_array_push(x_91, x_130);
+x_132 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_132, 0, x_84);
+lean_ctor_set(x_132, 1, x_116);
+lean_ctor_set(x_132, 2, x_131);
+x_133 = lean_array_push(x_80, x_79);
+x_134 = lean_array_push(x_133, x_132);
+x_135 = l_Lean_Parser_Tactic_focus___closed__2;
 x_136 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_136, 0, x_90);
-lean_ctor_set(x_136, 1, x_96);
-lean_ctor_set(x_136, 2, x_135);
-x_137 = lean_array_push(x_88, x_136);
-x_138 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_138, 0, x_90);
-lean_ctor_set(x_138, 1, x_91);
-lean_ctor_set(x_138, 2, x_137);
-x_139 = lean_array_push(x_88, x_138);
-x_140 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_140, 0, x_90);
-lean_ctor_set(x_140, 1, x_107);
-lean_ctor_set(x_140, 2, x_139);
-x_141 = lean_array_push(x_88, x_140);
-x_142 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_142, 0, x_90);
-lean_ctor_set(x_142, 1, x_110);
-lean_ctor_set(x_142, 2, x_141);
-x_143 = lean_array_push(x_93, x_83);
-x_144 = lean_array_push(x_143, x_142);
-x_145 = l_Lean_Parser_Tactic_focus___closed__2;
-x_146 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_146, 0, x_90);
-lean_ctor_set(x_146, 1, x_145);
-lean_ctor_set(x_146, 2, x_144);
-x_147 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_147, 0, x_146);
-lean_ctor_set(x_147, 1, x_81);
-return x_147;
+lean_ctor_set(x_136, 0, x_84);
+lean_ctor_set(x_136, 1, x_135);
+lean_ctor_set(x_136, 2, 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_77);
+return x_137;
 }
 }
 }
@@ -48979,28 +48954,28 @@ l_Lean___aux__Init__Notation______macroRules__Lean__termThis__1___closed__2 = _i
 lean_mark_persistent(l_Lean___aux__Init__Notation______macroRules__Lean__termThis__1___closed__2);
 l_Lean___aux__Init__Notation______macroRules__Lean__termThis__1___closed__3 = _init_l_Lean___aux__Init__Notation______macroRules__Lean__termThis__1___closed__3();
 lean_mark_persistent(l_Lean___aux__Init__Notation______macroRules__Lean__termThis__1___closed__3);
-l_Lean_Parser_Tactic_rawStx_quot___closed__1 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__1();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__1);
-l_Lean_Parser_Tactic_rawStx_quot___closed__2 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__2();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__2);
-l_Lean_Parser_Tactic_rawStx_quot___closed__3 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__3();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__3);
-l_Lean_Parser_Tactic_rawStx_quot___closed__4 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__4();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__4);
-l_Lean_Parser_Tactic_rawStx_quot___closed__5 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__5();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__5);
-l_Lean_Parser_Tactic_rawStx_quot___closed__6 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__6();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__6);
-l_Lean_Parser_Tactic_rawStx_quot___closed__7 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__7();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__7);
-l_Lean_Parser_Tactic_rawStx_quot___closed__8 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__8();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__8);
-l_Lean_Parser_Tactic_rawStx_quot___closed__9 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__9();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__9);
-l_Lean_Parser_Tactic_rawStx_quot___closed__10 = _init_l_Lean_Parser_Tactic_rawStx_quot___closed__10();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot___closed__10);
-l_Lean_Parser_Tactic_rawStx_quot = _init_l_Lean_Parser_Tactic_rawStx_quot();
-lean_mark_persistent(l_Lean_Parser_Tactic_rawStx_quot);
+l_Lean_rawStx_quot___closed__1 = _init_l_Lean_rawStx_quot___closed__1();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__1);
+l_Lean_rawStx_quot___closed__2 = _init_l_Lean_rawStx_quot___closed__2();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__2);
+l_Lean_rawStx_quot___closed__3 = _init_l_Lean_rawStx_quot___closed__3();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__3);
+l_Lean_rawStx_quot___closed__4 = _init_l_Lean_rawStx_quot___closed__4();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__4);
+l_Lean_rawStx_quot___closed__5 = _init_l_Lean_rawStx_quot___closed__5();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__5);
+l_Lean_rawStx_quot___closed__6 = _init_l_Lean_rawStx_quot___closed__6();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__6);
+l_Lean_rawStx_quot___closed__7 = _init_l_Lean_rawStx_quot___closed__7();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__7);
+l_Lean_rawStx_quot___closed__8 = _init_l_Lean_rawStx_quot___closed__8();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__8);
+l_Lean_rawStx_quot___closed__9 = _init_l_Lean_rawStx_quot___closed__9();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__9);
+l_Lean_rawStx_quot___closed__10 = _init_l_Lean_rawStx_quot___closed__10();
+lean_mark_persistent(l_Lean_rawStx_quot___closed__10);
+l_Lean_rawStx_quot = _init_l_Lean_rawStx_quot();
+lean_mark_persistent(l_Lean_rawStx_quot);
 l_Lean_Parser_Tactic_withAnnotateState___closed__1 = _init_l_Lean_Parser_Tactic_withAnnotateState___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_withAnnotateState___closed__1);
 l_Lean_Parser_Tactic_withAnnotateState___closed__2 = _init_l_Lean_Parser_Tactic_withAnnotateState___closed__2();
@@ -49565,6 +49540,8 @@ l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e__ = _init_l_Lean_Parser_Tactic_tactic_
 lean_mark_persistent(l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e__);
 l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1 = _init_l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__1);
+l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2 = _init_l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2();
+lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Notation______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2);
 l_Lean_Parser_Tactic_refl___closed__1 = _init_l_Lean_Parser_Tactic_refl___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_refl___closed__1);
 l_Lean_Parser_Tactic_refl___closed__2 = _init_l_Lean_Parser_Tactic_refl___closed__2();
diff --git a/stage0/stdlib/Lean/Data/Json/Parser.c b/stage0/stdlib/Lean/Data/Json/Parser.c
index 85d2c7be25..e85747aa40 100644
--- a/stage0/stdlib/Lean/Data/Json/Parser.c
+++ b/stage0/stdlib/Lean/Data/Json/Parser.c
@@ -56,7 +56,6 @@ LEAN_EXPORT lean_object* l_Lean_Json_Parser_num___lambda__3___closed__3___boxed_
 static lean_object* l_Lean_Json_Parser_objectCore___closed__4;
 static lean_object* l_Lean_Json_Parser_num___lambda__5___closed__2;
 static lean_object* l_Lean_Json_Parser_str___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Json_Parser_strCore___lambda__1(lean_object*, uint32_t, lean_object*);
 static lean_object* l_Lean_Json_Parser_num___closed__3;
 static lean_object* l_Lean_Json_Parser_anyCore___rarg___closed__10;
 lean_object* l_Nat_repr(lean_object*);
@@ -76,7 +75,6 @@ LEAN_EXPORT lean_object* l_Lean_Json_Parser_arrayCore(lean_object*, lean_object*
 LEAN_EXPORT lean_object* l_Lean_Json_Parser_strCore(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Json_Parser_num___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_uint32_dec_eq(uint32_t, uint32_t);
-LEAN_EXPORT lean_object* l_Lean_Json_Parser_strCore___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Json_Parser_objectCore___closed__2;
 static lean_object* l_Lean_Json_Parser_num___lambda__5___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Json_Parser_escapedChar___boxed__const__3;
@@ -1096,15 +1094,6 @@ return x_22;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Json_Parser_strCore___lambda__1(lean_object* x_1, uint32_t x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_string_push(x_1, x_2);
-x_5 = l_Lean_Json_Parser_strCore(x_4, x_3);
-return x_5;
-}
-}
 static lean_object* _init_l_Lean_Json_Parser_strCore___closed__1() {
 _start:
 {
@@ -1173,73 +1162,67 @@ return x_19;
 else
 {
 lean_object* x_20; 
-x_20 = l_Lean_Json_Parser_strCore___lambda__1(x_1, x_6, x_9);
-return x_20;
+x_20 = lean_string_push(x_1, x_6);
+x_1 = x_20;
+x_2 = x_9;
+goto _start;
 }
 }
 }
 else
 {
-lean_object* x_21; 
-x_21 = l_Lean_Json_Parser_escapedChar(x_9);
-if (lean_obj_tag(x_21) == 0)
+lean_object* x_22; 
+x_22 = l_Lean_Json_Parser_escapedChar(x_9);
+if (lean_obj_tag(x_22) == 0)
 {
-lean_object* x_22; lean_object* x_23; uint32_t x_24; lean_object* x_25; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
+lean_object* x_23; lean_object* x_24; uint32_t x_25; lean_object* x_26; 
+x_23 = lean_ctor_get(x_22, 0);
 lean_inc(x_23);
-lean_dec(x_21);
-x_24 = lean_unbox_uint32(x_23);
-lean_dec(x_23);
-x_25 = l_Lean_Json_Parser_strCore___lambda__1(x_1, x_24, x_22);
-return x_25;
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = lean_unbox_uint32(x_24);
+lean_dec(x_24);
+x_26 = lean_string_push(x_1, x_25);
+x_1 = x_26;
+x_2 = x_23;
+goto _start;
 }
 else
 {
-uint8_t x_26; 
+uint8_t x_28; 
 lean_dec(x_1);
-x_26 = !lean_is_exclusive(x_21);
-if (x_26 == 0)
+x_28 = !lean_is_exclusive(x_22);
+if (x_28 == 0)
 {
-return x_21;
+return x_22;
 }
 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
-{
-lean_object* x_30; lean_object* x_31; 
-x_30 = l_String_Iterator_next(x_2);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_1);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_ctor_get(x_22, 0);
+x_30 = lean_ctor_get(x_22, 1);
+lean_inc(x_30);
+lean_inc(x_29);
+lean_dec(x_22);
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_29);
+lean_ctor_set(x_31, 1, x_30);
 return x_31;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Json_Parser_strCore___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
+else
 {
-uint32_t x_4; lean_object* x_5; 
-x_4 = lean_unbox_uint32(x_2);
-lean_dec(x_2);
-x_5 = l_Lean_Json_Parser_strCore___lambda__1(x_1, x_4, x_3);
-return x_5;
+lean_object* x_32; lean_object* x_33; 
+x_32 = l_String_Iterator_next(x_2);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_33, 1, x_1);
+return x_33;
+}
+}
 }
 }
 static lean_object* _init_l_Lean_Json_Parser_str___closed__1() {
diff --git a/stage0/stdlib/Lean/Elab/Match.c b/stage0/stdlib/Lean/Elab/Match.c
index fffff23394..eab5510923 100644
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
@@ -39,6 +39,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize_addVar___bo
 uint8_t l_Lean_isAuxDiscrName(lean_object*);
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_addTermInfo_x27(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize_processVar___closed__1;
 lean_object* lean_erase_macro_scopes(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars_loop___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*);
@@ -58,16 +59,17 @@ lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndexToInclude_x3f_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Std_Data_HashMap_0__Std_numBucketsForCapacity(lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goIndex___closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_elabMatch_elabMatchDefault___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_ToDepElimPattern_normalize___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___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_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___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_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___spec__4(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 LEAN_EXPORT 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*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__4(lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_ToDepElimPattern_main___spec__4___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__4___boxed(lean_object**);
@@ -78,11 +80,11 @@ lean_object* lean_name_mk_string(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars_loop(lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__1;
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(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_getFVarsToGeneralize(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(size_t, size_t, lean_object*);
+uint64_t lean_uint64_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_go___lambda__1(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -148,9 +150,8 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatch
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_elabMatch_elabMatchDefault___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withExistingLocalDecls___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__7(lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabMatch_docString___closed__1;
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__2;
 LEAN_EXPORT lean_object* l_Lean_ForEachExpr_visit___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__8___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isApp(lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -184,17 +185,15 @@ lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__9___lambda__1___closed__2;
-LEAN_EXPORT lean_object* l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__3;
 LEAN_EXPORT 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);
 lean_object* lean_string_append(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__2;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPattern_main___spec__5(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__8___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_ofList(lean_object*);
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_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_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_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*);
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__2___closed__3;
 lean_object* l_Lean_Meta_isTypeCorrect(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -207,6 +206,7 @@ static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRange___c
 LEAN_EXPORT 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*);
 static lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___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*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_ToDepElimPattern_main_pack___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_Elab_Term_mkAuxName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___lambda__2___closed__1;
@@ -222,6 +222,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_assertAfter___spec__10(lea
 static lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault___closed__2;
 LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__6(lean_object*, lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___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*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(size_t, size_t, lean_object*);
 lean_object* l_Lean_MessageData_joinSep(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
@@ -230,9 +231,7 @@ LEAN_EXPORT lean_object* l_Array_sequenceMap___at_Lean_Elab_Term_precheckMatch__
 static lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize_addVar___closed__2;
 lean_object* l_Lean_Meta_Match_mkMatcher(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_replaceFVars(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__5(lean_object*, size_t, size_t, lean_object*);
-LEAN_EXPORT uint8_t l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__1___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -240,9 +239,11 @@ LEAN_EXPORT lean_object* l_Std_PersistentArray_forIn___at___private_Lean_Elab_Ma
 uint8_t lean_usize_dec_lt(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_ForEachExpr_visit___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__8___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__12;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(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_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___spec__4(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__12___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_levelZero;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
@@ -250,9 +251,8 @@ LEAN_EXPORT lean_object* l_Lean_Elab_throwAbortTerm___at_Lean_Elab_Term_isAtomic
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goIndex___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(lean_object*, size_t, size_t, lean_object*);
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__5;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_precheckMatch___lambda__1(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_mkEqRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -279,10 +279,10 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElim
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___spec__5(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize_addVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_Discr_h_x3f___default;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRange___closed__4;
 lean_object* l_Lean_Core_withFreshMacroScope___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getDiscrs(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_expandMacrosInPatterns___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_Quotation_precheck(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -298,9 +298,9 @@ uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
 lean_object* l_List_mapTRAux___at_Lean_MessageData_instCoeListExprMessageData___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_tryPostponeIfNoneOrMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ResolveName_resolveNamespace_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__6;
 static lean_object* l_Lean_mkAuxDiscr___at___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___spec__1___rarg___closed__4;
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermEnsuringType(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -329,8 +329,8 @@ LEAN_EXPORT lean_object* l_Lean_ForEachExpr_visit___at___private_Lean_Elab_Match
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2___closed__2;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__14;
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___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_localDeclDependsOn(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__7(size_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__14;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Term_elabMatch(lean_object*);
@@ -349,7 +349,6 @@ lean_object* l_Lean_Elab_Term_getPatternVarNames(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at_Lean_Elab_Term_ToDepElimPattern_normalize___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_Context_userName___default;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_go___spec__1(lean_object*);
@@ -365,16 +364,19 @@ lean_object* l_Lean_Elab_Term_withMacroExpansion___rarg(lean_object*, lean_objec
 LEAN_EXPORT 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*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1;
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__1(lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshBinderName___at___private_Lean_Elab_Binders_0__Lean_Elab_Term_expandBinderIdent___spec__2___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__13;
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT 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_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__2___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__3___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__4(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkLambdaFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main(lean_object*);
@@ -393,8 +395,9 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElim
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_mkMatcher(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_Quotation_precheckAttribute;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPattern_main___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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*);
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__2___closed__2;
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_topSort_visit(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_precheckMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -438,6 +441,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAu
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___closed__1;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main_pack(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__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*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__7;
 extern lean_object* l_Lean_Elab_abortTermExceptionId;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__6(size_t, size_t, lean_object*);
@@ -446,7 +450,6 @@ LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0
 LEAN_EXPORT 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_EXPORT 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*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__3;
 uint8_t l_Lean_Name_isAtomic(lean_object*);
 uint8_t l_Lean_Environment_contains(lean_object*, lean_object*);
 LEAN_EXPORT 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*);
@@ -457,11 +460,10 @@ static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMa
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__6;
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRange___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabNoMatch___closed__1;
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__5;
 lean_object* l_Lean_Meta_erasePatternRefAnnotations___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_pure___at_Lean_Elab_liftMacroM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_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_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__2___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___closed__4;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__3(lean_object*, size_t, size_t, lean_object*);
@@ -472,23 +474,25 @@ lean_object* l_Lean_Elab_Term_resolveId_x3f(lean_object*, lean_object*, uint8_t,
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__8___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static uint64_t l_Lean_Elab_Term_instInhabitedDiscr___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___spec__5(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_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_Lean_MetavarContext_localDeclDependsOn(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__3;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkAuxDiscr___at___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_GeneralizeResult_toClear___default;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Term_precheckMatch___closed__2;
 static lean_object* l_Lean_Elab_Term_isAtomicDiscr_x3f___closed__2;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__3;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible(lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Elab_Term_elabMatch_elabMatchDefault___spec__6(lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_precheckMatch___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___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*);
@@ -503,10 +507,11 @@ lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
 extern lean_object* l_Lean_instInhabitedSyntax;
 lean_object* l_Lean_Meta_Match_instantiateAltLHSMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getLocalInstances(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchOptMotive(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__4;
 lean_object* l_Lean_Expr_consumeMData(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_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*, lean_object*, lean_object*);
@@ -516,6 +521,7 @@ lean_object* l_Lean_Core_transform___at_Lean_Core_betaReduce___spec__1(lean_obje
 LEAN_EXPORT 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_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_topSort(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_savePatternInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_instInhabitedDiscr___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* lean_whnf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_Match_toPattern___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -532,6 +538,7 @@ static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPatte
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__1;
 size_t lean_usize_of_nat(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__2;
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8(size_t, lean_object*, lean_object*, size_t, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__7;
 static lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___rarg___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -555,23 +562,23 @@ lean_object* l_Lean_LocalDecl_fvarId(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___spec__1___closed__2;
 static lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkUserNameFor___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_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_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(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_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goType___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___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_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goType___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize_processInaccessible(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__2;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_elabMatch___closed__2;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__2;
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__4___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___spec__1___closed__1;
 extern lean_object* l_Lean_Elab_Term_termElabAttribute;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Term_precheckMatch___closed__1;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_go___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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*);
-static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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_mkAtomFrom(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -589,14 +596,11 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(
 lean_object* l_Lean_Elab_Term_synthesizeSyntheticMVarsUsingDefault(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__2;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwAbortTerm___at_Lean_Elab_Term_isAtomicDiscr_x3f___spec__1___rarg(lean_object*);
 uint8_t l_Array_contains___at___private_Lean_Meta_Match_Value_0__Lean_Meta_isUIntTypeName___spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternElabConfig___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_redLength___rarg(lean_object*);
@@ -620,7 +624,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_withLocalInstances___at___private_Lean_Elab
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern(lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___rarg___closed__1;
 lean_object* l_Lean_mkHole(lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(size_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__5(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setArg(lean_object*, lean_object*, lean_object*);
@@ -640,7 +643,8 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPat
 uint8_t l_Lean_Expr_isMVar(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(lean_object*, lean_object*, 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*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(lean_object*, lean_object*, 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*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternElabConfig(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_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*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___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*);
@@ -660,12 +664,14 @@ lean_object* l_Lean_Meta_sortFVarIds(lean_object*, lean_object*, lean_object*, l
 static lean_object* l___regBuiltin_Lean_Elab_Term_precheckMatch___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_withMVar(lean_object*);
 lean_object* l_Lean_Elab_Term_SavedState_restore(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndexToInclude_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__10;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___rarg___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*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__3;
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_instInhabitedDiscr;
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__4(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__6(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_precheckMatch___closed__1;
@@ -674,6 +680,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generaliz
 uint8_t l_Lean_Name_isAnonymous(lean_object*);
 LEAN_EXPORT 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_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___rarg___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*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT 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*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_go___lambda__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goType___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -696,7 +703,8 @@ static lean_object* l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___closed__
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__6;
 uint8_t l_Lean_TagAttribute_hasTag(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_mkAuxDiscr___at___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___spec__1___rarg___closed__1;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_State_patternVars___default;
 lean_object* l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_sequenceMap___at___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___spec__1(lean_object*, lean_object*);
@@ -733,12 +741,12 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generaliz
 LEAN_EXPORT 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_EXPORT 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*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__13;
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__4;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___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* l_Lean_Elab_Term_elabType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(size_t, size_t, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_ToDepElimPattern_main___spec__4___closed__5;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__9(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*);
 uint8_t l_Lean_Expr_isFVar(lean_object*);
 static lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5___rarg___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -755,7 +763,6 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generaliz
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize___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_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___spec__2___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_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_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(size_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_TopSort_State_visitedMVars___default;
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withExistingLocalDecls___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__7___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -780,6 +787,7 @@ static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___l
 uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
 static lean_object* l_Lean_mkAuxDiscr___at___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___spec__1___rarg___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__5;
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___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*);
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__2___closed__1;
@@ -806,6 +814,7 @@ uint8_t l_Array_contains___at_Lean_Elab_Term_collectUnassignedMVars_go___spec__1
 LEAN_EXPORT lean_object* l_Lean_Elab_throwAbortTerm___at_Lean_Elab_Term_isAtomicDiscr_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_precheckMatch___lambda__3___closed__1;
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(size_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar(lean_object*, lean_object*);
 lean_object* l_Lean_mkPatternWithRef(lean_object*, lean_object*);
@@ -835,6 +844,7 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPat
 lean_object* l_Std_RBNode_findCore___at___private_Lean_MetavarContext_0__Lean_MetavarContext_MkBinding_elimApp___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_ToDepElimPattern_normalize___closed__2;
+static lean_object* l_Lean_Elab_Term_instInhabitedDiscr___closed__3;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar___closed__1;
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goType___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_precheckMatch___lambda__2(lean_object*);
@@ -843,6 +853,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_mkMatcher___boxed(lean_object*, lean_o
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__19;
 lean_object* l_Lean_Expr_getAppFn(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars(lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_ToDepElimPattern_isExplicitPatternVar___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPattern_normalize___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__4___closed__2;
@@ -859,21 +870,21 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElabo
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_match_ignoreUnusedAlts;
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRange___closed__3;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__4;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__4;
 lean_object* l_Lean_Meta_eraseInaccessibleAnnotations___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main_unpack___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__2___closed__1;
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_withLetDeclImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPattern_main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_reportMatcherResultErrors(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabNoMatch_declRange___closed__4;
+LEAN_EXPORT uint8_t l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__12(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__9;
 static lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___closed__2;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_ToDepElimPattern_main___spec__4___closed__6;
-LEAN_EXPORT 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*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT 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*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main_unpack_go___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
@@ -886,7 +897,6 @@ static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5___rarg(lean_object*);
 static lean_object* l_Lean_Elab_throwAbortTerm___at_Lean_Elab_Term_isAtomicDiscr_x3f___spec__1___rarg___closed__2;
 lean_object* l_Lean_Meta_setMVarTag(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(size_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRange___closed__5;
 lean_object* l_Lean_Meta_kabstract(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -895,8 +905,8 @@ LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Term_elabNoMatch_declRange(lea
 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_EXPORT lean_object* l_Lean_Elab_liftMacroM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(size_t, size_t, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_16060_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_16255_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972_(lean_object*);
 lean_object* l_Lean_mkSimpleThunk(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_isAtomicDiscr_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_elabNoMatch___closed__4;
@@ -904,8 +914,7 @@ lean_object* l_Lean_Meta_Match_counterExamplesToMessageData(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f(lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_insertAt___rarg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_saveState___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getPatternsVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRange___closed__7;
@@ -921,13 +930,14 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatch
 uint8_t l_Lean_isAuxFunDiscrName(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS(lean_object*);
 lean_object* l_Lean_mkInaccessible(lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__1(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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT 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*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndexToInclude_x3f_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_synthesizeInst___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__4___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternElabConfig___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -937,13 +947,15 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAu
 lean_object* l_Lean_Meta_instInhabitedMetaM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__9;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPattern_normalize___spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_precheckMatch___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_checkCompatibleApps___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___closed__1;
 lean_object* l_runST___rarg(lean_object*);
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(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_Lean_Meta_check(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_unpackMatchTypePatterns(lean_object*);
 static lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___rarg___closed__2;
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
@@ -956,10 +968,10 @@ static lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___closed__1;
 lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Meta_ForEachExpr_visit___spec__1(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__16;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___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*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___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*, lean_object*, lean_object*);
 extern lean_object* l_Lean_matchPatternAttr;
 uint8_t l_Lean_Syntax_isIdent(lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Term_elabNoMatch(lean_object*);
 static lean_object* _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__1() {
 _start:
@@ -1732,50 +1744,102 @@ lean_dec(x_1);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+static lean_object* _init_l_Lean_Elab_Term_Discr_h_x3f___default() {
 _start:
 {
-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; 
-x_15 = lean_expr_instantiate1(x_1, x_2);
-x_16 = lean_array_push(x_5, x_2);
-x_17 = lean_box(x_6);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_16);
-lean_ctor_set(x_18, 1, x_17);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_3);
-lean_ctor_set(x_19, 1, x_18);
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
+static uint64_t _init_l_Lean_Elab_Term_instInhabitedDiscr___closed__1() {
+_start:
+{
+lean_object* x_1; uint64_t x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = lean_uint64_of_nat(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Elab_Term_instInhabitedDiscr___closed__2() {
+_start:
+{
+lean_object* x_1; uint64_t x_2; lean_object* x_3; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = l_Lean_Elab_Term_instInhabitedDiscr___closed__1;
+x_3 = lean_alloc_ctor(0, 1, 8);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set_uint64(x_3, sizeof(void*)*1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Term_instInhabitedDiscr___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_instInhabitedDiscr___closed__2;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Term_instInhabitedDiscr() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Elab_Term_instInhabitedDiscr___closed__3;
+return x_1;
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+_start:
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_16 = lean_expr_instantiate1(x_1, x_2);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_2);
+lean_ctor_set(x_17, 1, x_3);
+x_18 = lean_array_push(x_6, x_17);
+x_19 = lean_box(x_7);
 x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_15);
+lean_ctor_set(x_20, 0, x_18);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_21, 0, x_20);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_4);
+lean_ctor_set(x_21, 1, x_20);
 x_22 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_14);
-return x_22;
+lean_ctor_set(x_22, 0, x_16);
+lean_ctor_set(x_22, 1, x_21);
+x_23 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_23, 0, x_22);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_15);
+return x_24;
 }
 }
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___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, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-uint8_t x_15; 
-lean_dec(x_7);
-x_15 = l_Lean_Expr_hasLooseBVars(x_1);
-if (x_15 == 0)
+uint8_t x_16; 
+lean_dec(x_8);
+x_16 = l_Lean_Expr_hasLooseBVars(x_1);
+if (x_16 == 0)
 {
-lean_object* x_16; lean_object* x_17; 
-x_16 = lean_box(0);
-x_17 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_16, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-return x_17;
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_box(0);
+x_18 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_17, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+return x_18;
 }
 else
 {
-uint8_t x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = 1;
-x_19 = lean_box(0);
-x_20 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_18, x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-return x_20;
+uint8_t x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = 1;
+x_20 = lean_box(0);
+x_21 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_19, x_20, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+return x_21;
 }
 }
 }
@@ -2073,7 +2137,7 @@ lean_dec(x_34);
 x_54 = lean_box(0);
 x_55 = lean_unbox(x_28);
 lean_dec(x_28);
-x_56 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_49, x_30, x_32, x_27, x_55, x_54, x_6, x_7, x_8, x_9, x_10, x_11, x_53);
+x_56 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_49, x_38, x_30, x_32, x_27, x_55, x_54, x_6, x_7, x_8, x_9, x_10, x_11, x_53);
 lean_dec(x_32);
 lean_dec(x_35);
 x_57 = lean_ctor_get(x_56, 0);
@@ -2129,7 +2193,7 @@ lean_inc(x_76);
 lean_dec(x_74);
 x_77 = lean_unbox(x_28);
 lean_dec(x_28);
-x_78 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_49, x_30, x_32, x_27, x_77, x_75, x_6, x_7, x_8, x_9, x_10, x_11, x_76);
+x_78 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_49, x_38, x_30, x_32, x_27, x_77, x_75, x_6, x_7, x_8, x_9, x_10, x_11, x_76);
 lean_dec(x_32);
 lean_dec(x_35);
 x_79 = lean_ctor_get(x_78, 0);
@@ -2276,7 +2340,7 @@ lean_dec(x_34);
 x_116 = lean_box(0);
 x_117 = lean_unbox(x_28);
 lean_dec(x_28);
-x_118 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_111, x_30, x_32, x_27, x_117, x_116, x_6, x_7, x_8, x_9, x_10, x_11, x_115);
+x_118 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_111, x_38, x_30, x_32, x_27, x_117, x_116, x_6, x_7, x_8, x_9, x_10, x_11, x_115);
 lean_dec(x_32);
 lean_dec(x_35);
 x_119 = lean_ctor_get(x_118, 0);
@@ -2332,7 +2396,7 @@ lean_inc(x_138);
 lean_dec(x_136);
 x_139 = lean_unbox(x_28);
 lean_dec(x_28);
-x_140 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_111, x_30, x_32, x_27, x_139, x_137, x_6, x_7, x_8, x_9, x_10, x_11, x_138);
+x_140 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_35, x_111, x_38, x_30, x_32, x_27, x_139, x_137, x_6, x_7, x_8, x_9, x_10, x_11, x_138);
 lean_dec(x_32);
 lean_dec(x_35);
 x_141 = lean_ctor_get(x_140, 0);
@@ -2593,41 +2657,41 @@ return x_33;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-uint8_t x_15; lean_object* x_16; 
-x_15 = lean_unbox(x_6);
-lean_dec(x_6);
-x_16 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_15, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
+uint8_t x_16; lean_object* x_17; 
+x_16 = lean_unbox(x_7);
 lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-return x_16;
-}
-}
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
-_start:
-{
-uint8_t x_15; lean_object* x_16; 
-x_15 = lean_unbox(x_6);
-lean_dec(x_6);
-x_16 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_1, x_2, x_3, x_4, x_5, x_15, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+x_17 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_16, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_4);
+lean_dec(x_5);
 lean_dec(x_1);
-return x_16;
+return x_17;
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+_start:
+{
+uint8_t x_16; lean_object* x_17; 
+x_16 = lean_unbox(x_7);
+lean_dec(x_7);
+x_17 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_16, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_5);
+lean_dec(x_1);
+return x_17;
 }
 }
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
@@ -2686,435 +2750,7 @@ return x_8;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6) {
-_start:
-{
-uint8_t x_7; 
-x_7 = lean_usize_dec_lt(x_5, x_4);
-if (x_7 == 0)
-{
-lean_dec(x_3);
-return x_6;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; size_t x_16; size_t x_17; 
-x_8 = lean_array_uget(x_6, x_5);
-x_9 = lean_unsigned_to_nat(0u);
-x_10 = lean_array_uset(x_6, x_5, x_9);
-x_11 = lean_ctor_get(x_8, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_8, 1);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_8, 2);
-lean_inc(x_13);
-x_14 = lean_array_get_size(x_12);
-x_15 = lean_nat_dec_lt(x_14, x_2);
-lean_dec(x_14);
-x_16 = 1;
-x_17 = lean_usize_add(x_5, x_16);
-if (x_15 == 0)
-{
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_8);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_19 = lean_ctor_get(x_8, 2);
-lean_dec(x_19);
-x_20 = lean_ctor_get(x_8, 1);
-lean_dec(x_20);
-x_21 = lean_ctor_get(x_8, 0);
-lean_dec(x_21);
-lean_inc(x_3);
-x_22 = l_Array_insertAt___rarg(x_12, x_2, x_3);
-lean_ctor_set(x_8, 1, x_22);
-x_23 = lean_array_uset(x_10, x_5, x_8);
-x_5 = x_17;
-x_6 = x_23;
-goto _start;
-}
-else
-{
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-lean_dec(x_8);
-lean_inc(x_3);
-x_25 = l_Array_insertAt___rarg(x_12, x_2, x_3);
-x_26 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_26, 0, x_11);
-lean_ctor_set(x_26, 1, x_25);
-lean_ctor_set(x_26, 2, x_13);
-x_27 = lean_array_uset(x_10, x_5, x_26);
-x_5 = x_17;
-x_6 = x_27;
-goto _start;
-}
-}
-else
-{
-lean_object* x_29; 
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-x_29 = lean_array_uset(x_10, x_5, x_8);
-x_5 = x_17;
-x_6 = x_29;
-goto _start;
-}
-}
-}
-}
-static lean_object* _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(2u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
-_start:
-{
-uint8_t x_15; 
-x_15 = !lean_is_exclusive(x_1);
-if (x_15 == 0)
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_16 = lean_ctor_get(x_1, 0);
-x_17 = lean_ctor_get(x_1, 1);
-x_18 = lean_ctor_get(x_1, 2);
-x_19 = lean_box(0);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-x_20 = l_Lean_Meta_kabstract(x_17, x_2, x_19, x_10, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_20) == 0)
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; uint8_t x_28; uint8_t x_29; lean_object* x_30; 
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
-lean_inc(x_22);
-lean_dec(x_20);
-x_23 = lean_expr_instantiate1(x_21, x_3);
-lean_dec(x_21);
-x_24 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
-x_25 = lean_array_push(x_24, x_3);
-x_26 = lean_array_push(x_25, x_7);
-x_27 = 0;
-x_28 = 1;
-x_29 = 1;
-x_30 = l_Lean_Meta_mkForallFVars(x_26, x_23, x_27, x_28, x_29, x_10, x_11, x_12, x_13, x_22);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-if (lean_obj_tag(x_30) == 0)
-{
-uint8_t x_31; 
-x_31 = !lean_is_exclusive(x_30);
-if (x_31 == 0)
-{
-lean_object* x_32; lean_object* x_33; size_t x_34; size_t x_35; lean_object* x_36; 
-x_32 = lean_ctor_get(x_30, 0);
-x_33 = lean_array_get_size(x_18);
-x_34 = lean_usize_of_nat(x_33);
-lean_dec(x_33);
-x_35 = 0;
-x_36 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1(x_4, x_5, x_6, x_34, x_35, x_18);
-lean_ctor_set(x_1, 2, x_36);
-lean_ctor_set(x_1, 1, x_32);
-lean_ctor_set_uint8(x_1, sizeof(void*)*3, x_28);
-lean_ctor_set(x_30, 0, x_1);
-return x_30;
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; size_t x_40; size_t x_41; lean_object* x_42; lean_object* x_43; 
-x_37 = lean_ctor_get(x_30, 0);
-x_38 = lean_ctor_get(x_30, 1);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_dec(x_30);
-x_39 = lean_array_get_size(x_18);
-x_40 = lean_usize_of_nat(x_39);
-lean_dec(x_39);
-x_41 = 0;
-x_42 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1(x_4, x_5, x_6, x_40, x_41, x_18);
-lean_ctor_set(x_1, 2, x_42);
-lean_ctor_set(x_1, 1, x_37);
-lean_ctor_set_uint8(x_1, sizeof(void*)*3, x_28);
-x_43 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_43, 0, x_1);
-lean_ctor_set(x_43, 1, x_38);
-return x_43;
-}
-}
-else
-{
-uint8_t x_44; 
-lean_free_object(x_1);
-lean_dec(x_18);
-lean_dec(x_16);
-lean_dec(x_6);
-x_44 = !lean_is_exclusive(x_30);
-if (x_44 == 0)
-{
-return x_30;
-}
-else
-{
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_30, 0);
-x_46 = lean_ctor_get(x_30, 1);
-lean_inc(x_46);
-lean_inc(x_45);
-lean_dec(x_30);
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_45);
-lean_ctor_set(x_47, 1, x_46);
-return x_47;
-}
-}
-}
-else
-{
-uint8_t x_48; 
-lean_free_object(x_1);
-lean_dec(x_18);
-lean_dec(x_16);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_3);
-x_48 = !lean_is_exclusive(x_20);
-if (x_48 == 0)
-{
-return x_20;
-}
-else
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_20, 0);
-x_50 = lean_ctor_get(x_20, 1);
-lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_20);
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-return x_51;
-}
-}
-}
-else
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_52 = lean_ctor_get(x_1, 0);
-x_53 = lean_ctor_get(x_1, 1);
-x_54 = lean_ctor_get(x_1, 2);
-lean_inc(x_54);
-lean_inc(x_53);
-lean_inc(x_52);
-lean_dec(x_1);
-x_55 = lean_box(0);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-x_56 = l_Lean_Meta_kabstract(x_53, x_2, x_55, x_10, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_56) == 0)
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; uint8_t x_64; uint8_t x_65; lean_object* x_66; 
-x_57 = lean_ctor_get(x_56, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_56, 1);
-lean_inc(x_58);
-lean_dec(x_56);
-x_59 = lean_expr_instantiate1(x_57, x_3);
-lean_dec(x_57);
-x_60 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
-x_61 = lean_array_push(x_60, x_3);
-x_62 = lean_array_push(x_61, x_7);
-x_63 = 0;
-x_64 = 1;
-x_65 = 1;
-x_66 = l_Lean_Meta_mkForallFVars(x_62, x_59, x_63, x_64, x_65, x_10, x_11, x_12, x_13, x_58);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-if (lean_obj_tag(x_66) == 0)
-{
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; size_t x_71; size_t x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-x_67 = lean_ctor_get(x_66, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get(x_66, 1);
-lean_inc(x_68);
-if (lean_is_exclusive(x_66)) {
- lean_ctor_release(x_66, 0);
- lean_ctor_release(x_66, 1);
- x_69 = x_66;
-} else {
- lean_dec_ref(x_66);
- x_69 = lean_box(0);
-}
-x_70 = lean_array_get_size(x_54);
-x_71 = lean_usize_of_nat(x_70);
-lean_dec(x_70);
-x_72 = 0;
-x_73 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1(x_4, x_5, x_6, x_71, x_72, x_54);
-x_74 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_74, 0, x_52);
-lean_ctor_set(x_74, 1, x_67);
-lean_ctor_set(x_74, 2, x_73);
-lean_ctor_set_uint8(x_74, sizeof(void*)*3, x_64);
-if (lean_is_scalar(x_69)) {
- x_75 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_75 = x_69;
-}
-lean_ctor_set(x_75, 0, x_74);
-lean_ctor_set(x_75, 1, x_68);
-return x_75;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-lean_dec(x_54);
-lean_dec(x_52);
-lean_dec(x_6);
-x_76 = lean_ctor_get(x_66, 0);
-lean_inc(x_76);
-x_77 = lean_ctor_get(x_66, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_66)) {
- lean_ctor_release(x_66, 0);
- lean_ctor_release(x_66, 1);
- x_78 = x_66;
-} else {
- lean_dec_ref(x_66);
- x_78 = lean_box(0);
-}
-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_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-lean_dec(x_54);
-lean_dec(x_52);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_3);
-x_80 = lean_ctor_get(x_56, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_56, 1);
-lean_inc(x_81);
-if (lean_is_exclusive(x_56)) {
- lean_ctor_release(x_56, 0);
- lean_ctor_release(x_56, 1);
- x_82 = x_56;
-} else {
- lean_dec_ref(x_56);
- x_82 = lean_box(0);
-}
-if (lean_is_scalar(x_82)) {
- x_83 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_83 = x_82;
-}
-lean_ctor_set(x_83, 0, x_80);
-lean_ctor_set(x_83, 1, x_81);
-return x_83;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
-_start:
-{
-lean_object* x_14; 
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_6);
-lean_inc(x_1);
-x_14 = l_Lean_Meta_mkEq(x_1, x_6, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_14) == 0)
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; 
-x_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_Lean_Syntax_getId(x_2);
-x_18 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___boxed), 14, 6);
-lean_closure_set(x_18, 0, x_3);
-lean_closure_set(x_18, 1, x_1);
-lean_closure_set(x_18, 2, x_6);
-lean_closure_set(x_18, 3, x_4);
-lean_closure_set(x_18, 4, x_5);
-lean_closure_set(x_18, 5, x_2);
-x_19 = 0;
-x_20 = l_Lean_Meta_withLocalDecl___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda_loop___spec__1___rarg(x_17, x_19, x_15, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_16);
-return x_20;
-}
-else
-{
-uint8_t x_21; 
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_21 = !lean_is_exclusive(x_14);
-if (x_21 == 0)
-{
-return x_14;
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_14, 0);
-x_23 = lean_ctor_get(x_14, 1);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_14);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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:
 {
 uint8_t x_13; 
@@ -3219,7 +2855,7 @@ lean_inc(x_23);
 x_25 = lean_infer_type(x_23, x_8, x_9, x_10, x_11, x_24);
 if (lean_obj_tag(x_25) == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
 x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
 x_27 = lean_ctor_get(x_25, 1);
@@ -3232,114 +2868,134 @@ lean_inc(x_29);
 x_30 = lean_ctor_get(x_28, 1);
 lean_inc(x_30);
 lean_dec(x_28);
-lean_inc(x_23);
-x_31 = lean_array_push(x_5, x_23);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_8);
 lean_inc(x_23);
-x_32 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkUserNameFor(x_23, x_6, x_7, x_8, x_9, x_10, x_11, x_30);
-if (lean_obj_tag(x_32) == 0)
+x_31 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkUserNameFor(x_23, x_6, x_7, x_8, x_9, x_10, x_11, x_30);
+if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; 
-x_33 = lean_ctor_get(x_32, 0);
+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; 
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
 lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-lean_dec(x_32);
-x_35 = lean_unsigned_to_nat(0u);
-x_36 = l_Lean_Syntax_getArg(x_18, x_35);
+lean_dec(x_31);
+x_34 = lean_unsigned_to_nat(0u);
+x_35 = l_Lean_Syntax_getArg(x_18, x_34);
 lean_dec(x_18);
-x_37 = l_Lean_Syntax_isNone(x_36);
-if (x_37 == 0)
+x_36 = l_Lean_Syntax_isNone(x_35);
+x_37 = lean_unsigned_to_nat(1u);
+x_38 = lean_nat_add(x_4, x_37);
+lean_dec(x_4);
+if (x_36 == 0)
 {
-lean_object* x_38; 
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_39 = l_Lean_Syntax_getArg(x_35, x_34);
+lean_dec(x_35);
+x_40 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_40, 0, x_39);
 lean_inc(x_23);
-x_38 = l_Lean_Meta_mkEqRefl(x_23, x_8, x_9, x_10, x_11, x_34);
-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; 
-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_push(x_31, x_39);
-x_42 = lean_unsigned_to_nat(1u);
-x_43 = lean_nat_add(x_4, x_42);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_23);
+lean_ctor_set(x_41, 1, x_40);
+x_42 = lean_array_push(x_5, x_41);
 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_43);
-x_44 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs(x_1, x_2, x_3, x_43, x_41, x_6, x_7, x_8, x_9, x_10, x_11, x_40);
-if (lean_obj_tag(x_44) == 0)
+x_43 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs(x_1, x_2, x_3, x_38, x_42, x_6, x_7, x_8, x_9, x_10, x_11, x_33);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_50; 
-x_45 = lean_ctor_get(x_44, 0);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_43, 1);
 lean_inc(x_45);
+lean_dec(x_43);
 x_46 = lean_ctor_get(x_44, 1);
 lean_inc(x_46);
-lean_dec(x_44);
-x_47 = l_Lean_Syntax_getArg(x_36, x_35);
-lean_dec(x_36);
-x_48 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__2), 13, 5);
-lean_closure_set(x_48, 0, x_23);
-lean_closure_set(x_48, 1, x_47);
-lean_closure_set(x_48, 2, x_45);
-lean_closure_set(x_48, 3, x_4);
-lean_closure_set(x_48, 4, x_43);
-x_49 = 0;
-x_50 = l_Lean_Meta_withLocalDecl___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda_loop___spec__1___rarg(x_33, x_49, x_29, x_48, x_6, x_7, x_8, x_9, x_10, x_11, x_46);
-return x_50;
-}
-else
+x_47 = lean_box(0);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+x_48 = l_Lean_Meta_kabstract(x_46, x_23, x_47, x_8, x_9, x_10, x_11, x_45);
+if (lean_obj_tag(x_48) == 0)
 {
-uint8_t x_51; 
-lean_dec(x_43);
-lean_dec(x_36);
-lean_dec(x_33);
-lean_dec(x_29);
-lean_dec(x_23);
-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_51 = !lean_is_exclusive(x_44);
+lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_49 = lean_ctor_get(x_48, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_48, 1);
+lean_inc(x_50);
+lean_dec(x_48);
+x_51 = l_Lean_Expr_hasLooseBVars(x_49);
 if (x_51 == 0)
 {
-return x_44;
+lean_object* x_52; lean_object* x_53; 
+x_52 = lean_box(0);
+x_53 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(x_32, x_29, x_49, x_44, x_52, x_6, x_7, x_8, x_9, x_10, x_11, x_50);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+return x_53;
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_52 = lean_ctor_get(x_44, 0);
-x_53 = lean_ctor_get(x_44, 1);
-lean_inc(x_53);
-lean_inc(x_52);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_54 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_markIsDep(x_44);
+x_55 = lean_box(0);
+x_56 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(x_32, x_29, x_49, x_54, x_55, x_6, x_7, x_8, x_9, x_10, x_11, x_50);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+return x_56;
+}
+}
+else
+{
+uint8_t x_57; 
 lean_dec(x_44);
-x_54 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_54, 0, x_52);
-lean_ctor_set(x_54, 1, x_53);
-return x_54;
+lean_dec(x_32);
+lean_dec(x_29);
+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_57 = !lean_is_exclusive(x_48);
+if (x_57 == 0)
+{
+return x_48;
+}
+else
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_48, 0);
+x_59 = lean_ctor_get(x_48, 1);
+lean_inc(x_59);
+lean_inc(x_58);
+lean_dec(x_48);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_59);
+return x_60;
 }
 }
 }
 else
 {
-uint8_t x_55; 
-lean_dec(x_36);
-lean_dec(x_33);
-lean_dec(x_31);
+uint8_t x_61; 
+lean_dec(x_32);
 lean_dec(x_29);
 lean_dec(x_23);
 lean_dec(x_11);
@@ -3348,202 +3004,165 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_55 = !lean_is_exclusive(x_38);
-if (x_55 == 0)
+x_61 = !lean_is_exclusive(x_43);
+if (x_61 == 0)
 {
-return x_38;
+return x_43;
 }
 else
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_56 = lean_ctor_get(x_38, 0);
-x_57 = lean_ctor_get(x_38, 1);
-lean_inc(x_57);
-lean_inc(x_56);
-lean_dec(x_38);
-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_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_43, 0);
+x_63 = lean_ctor_get(x_43, 1);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_dec(x_43);
+x_64 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_64, 0, x_62);
+lean_ctor_set(x_64, 1, x_63);
+return x_64;
 }
 }
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-lean_dec(x_36);
-x_59 = lean_unsigned_to_nat(1u);
-x_60 = lean_nat_add(x_4, x_59);
-lean_dec(x_4);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+lean_dec(x_35);
+x_65 = lean_box(0);
+lean_inc(x_23);
+x_66 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_66, 0, x_23);
+lean_ctor_set(x_66, 1, x_65);
+x_67 = lean_array_push(x_5, x_66);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-x_61 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs(x_1, x_2, x_3, x_60, x_31, x_6, x_7, x_8, x_9, x_10, x_11, x_34);
-if (lean_obj_tag(x_61) == 0)
+x_68 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs(x_1, x_2, x_3, x_38, x_67, x_6, x_7, x_8, x_9, x_10, x_11, x_33);
+if (lean_obj_tag(x_68) == 0)
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_62 = lean_ctor_get(x_61, 0);
-lean_inc(x_62);
-x_63 = lean_ctor_get(x_61, 1);
-lean_inc(x_63);
-lean_dec(x_61);
-x_64 = lean_ctor_get(x_62, 1);
-lean_inc(x_64);
-x_65 = lean_box(0);
+lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_69 = lean_ctor_get(x_68, 0);
+lean_inc(x_69);
+x_70 = lean_ctor_get(x_68, 1);
+lean_inc(x_70);
+lean_dec(x_68);
+x_71 = lean_ctor_get(x_69, 1);
+lean_inc(x_71);
+x_72 = lean_box(0);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
-x_66 = l_Lean_Meta_kabstract(x_64, x_23, x_65, x_8, x_9, x_10, x_11, x_63);
-if (lean_obj_tag(x_66) == 0)
+x_73 = l_Lean_Meta_kabstract(x_71, x_23, x_72, x_8, x_9, x_10, x_11, x_70);
+if (lean_obj_tag(x_73) == 0)
 {
-lean_object* x_67; lean_object* x_68; uint8_t x_69; 
-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_Expr_hasLooseBVars(x_67);
-if (x_69 == 0)
+lean_object* x_74; lean_object* x_75; uint8_t x_76; 
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_73, 1);
+lean_inc(x_75);
+lean_dec(x_73);
+x_76 = l_Lean_Expr_hasLooseBVars(x_74);
+if (x_76 == 0)
 {
-lean_object* x_70; lean_object* x_71; 
-x_70 = lean_box(0);
-x_71 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3(x_33, x_29, x_67, x_62, x_70, x_6, x_7, x_8, x_9, x_10, x_11, x_68);
+lean_object* x_77; lean_object* x_78; 
+x_77 = lean_box(0);
+x_78 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(x_32, x_29, x_74, x_69, x_77, x_6, x_7, x_8, x_9, x_10, x_11, x_75);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-return x_71;
-}
-else
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_markIsDep(x_62);
-x_73 = lean_box(0);
-x_74 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3(x_33, x_29, x_67, x_72, x_73, x_6, x_7, x_8, x_9, x_10, x_11, x_68);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-return x_74;
-}
-}
-else
-{
-uint8_t x_75; 
-lean_dec(x_62);
-lean_dec(x_33);
-lean_dec(x_29);
-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_75 = !lean_is_exclusive(x_66);
-if (x_75 == 0)
-{
-return x_66;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_66, 0);
-x_77 = lean_ctor_get(x_66, 1);
-lean_inc(x_77);
-lean_inc(x_76);
-lean_dec(x_66);
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_76);
-lean_ctor_set(x_78, 1, x_77);
 return x_78;
 }
-}
-}
 else
 {
-uint8_t x_79; 
-lean_dec(x_33);
-lean_dec(x_29);
-lean_dec(x_23);
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_markIsDep(x_69);
+x_80 = lean_box(0);
+x_81 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(x_32, x_29, x_74, x_79, x_80, x_6, x_7, x_8, x_9, x_10, x_11, x_75);
 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_79 = !lean_is_exclusive(x_61);
-if (x_79 == 0)
-{
-return x_61;
-}
-else
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_80 = lean_ctor_get(x_61, 0);
-x_81 = lean_ctor_get(x_61, 1);
-lean_inc(x_81);
-lean_inc(x_80);
-lean_dec(x_61);
-x_82 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_82, 0, x_80);
-lean_ctor_set(x_82, 1, x_81);
-return x_82;
-}
-}
+return x_81;
 }
 }
 else
 {
-uint8_t x_83; 
-lean_dec(x_31);
-lean_dec(x_29);
-lean_dec(x_23);
-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);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_83 = !lean_is_exclusive(x_32);
-if (x_83 == 0)
-{
-return x_32;
-}
-else
-{
-lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_84 = lean_ctor_get(x_32, 0);
-x_85 = lean_ctor_get(x_32, 1);
-lean_inc(x_85);
-lean_inc(x_84);
+uint8_t x_82; 
+lean_dec(x_69);
 lean_dec(x_32);
-x_86 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_86, 0, x_84);
-lean_ctor_set(x_86, 1, x_85);
-return x_86;
+lean_dec(x_29);
+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_82 = !lean_is_exclusive(x_73);
+if (x_82 == 0)
+{
+return x_73;
+}
+else
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_73, 0);
+x_84 = lean_ctor_get(x_73, 1);
+lean_inc(x_84);
+lean_inc(x_83);
+lean_dec(x_73);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_83);
+lean_ctor_set(x_85, 1, x_84);
+return x_85;
 }
 }
 }
 else
 {
-uint8_t x_87; 
+uint8_t x_86; 
+lean_dec(x_32);
+lean_dec(x_29);
+lean_dec(x_23);
+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_86 = !lean_is_exclusive(x_68);
+if (x_86 == 0)
+{
+return x_68;
+}
+else
+{
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_68, 0);
+x_88 = lean_ctor_get(x_68, 1);
+lean_inc(x_88);
+lean_inc(x_87);
+lean_dec(x_68);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_87);
+lean_ctor_set(x_89, 1, x_88);
+return x_89;
+}
+}
+}
+}
+else
+{
+uint8_t x_90; 
+lean_dec(x_29);
 lean_dec(x_23);
 lean_dec(x_18);
 lean_dec(x_11);
@@ -3557,29 +3176,65 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_87 = !lean_is_exclusive(x_25);
-if (x_87 == 0)
+x_90 = !lean_is_exclusive(x_31);
+if (x_90 == 0)
+{
+return x_31;
+}
+else
+{
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_31, 0);
+x_92 = lean_ctor_get(x_31, 1);
+lean_inc(x_92);
+lean_inc(x_91);
+lean_dec(x_31);
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
+}
+}
+}
+else
+{
+uint8_t x_94; 
+lean_dec(x_23);
+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_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_94 = !lean_is_exclusive(x_25);
+if (x_94 == 0)
 {
 return x_25;
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_88 = lean_ctor_get(x_25, 0);
-x_89 = lean_ctor_get(x_25, 1);
-lean_inc(x_89);
-lean_inc(x_88);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_25, 0);
+x_96 = lean_ctor_get(x_25, 1);
+lean_inc(x_96);
+lean_inc(x_95);
 lean_dec(x_25);
-x_90 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_90, 0, x_88);
-lean_ctor_set(x_90, 1, x_89);
-return x_90;
+x_97 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+return x_97;
 }
 }
 }
 else
 {
-uint8_t x_91; 
+uint8_t x_98; 
 lean_dec(x_18);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -3592,59 +3247,33 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_91 = !lean_is_exclusive(x_19);
-if (x_91 == 0)
+x_98 = !lean_is_exclusive(x_19);
+if (x_98 == 0)
 {
 return x_19;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_19, 0);
-x_93 = lean_ctor_get(x_19, 1);
-lean_inc(x_93);
-lean_inc(x_92);
+lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+x_99 = lean_ctor_get(x_19, 0);
+x_100 = lean_ctor_get(x_19, 1);
+lean_inc(x_100);
+lean_inc(x_99);
 lean_dec(x_19);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_92);
-lean_ctor_set(x_94, 1, x_93);
-return x_94;
+x_101 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_101, 0, x_99);
+lean_ctor_set(x_101, 1, x_100);
+return x_101;
 }
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-size_t x_7; size_t x_8; lean_object* x_9; 
-x_7 = lean_unbox_usize(x_4);
-lean_dec(x_4);
-x_8 = lean_unbox_usize(x_5);
-lean_dec(x_5);
-x_9 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___spec__1(x_1, x_2, x_3, x_7, x_8, x_6);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_9;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
-_start:
-{
-lean_object* x_15; 
-x_15 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_15;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+x_13 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___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_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -4731,7 +4360,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(175u);
+x_1 = lean_unsigned_to_nat(161u);
 x_2 = lean_unsigned_to_nat(32u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -4743,7 +4372,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(177u);
+x_1 = lean_unsigned_to_nat(163u);
 x_2 = lean_unsigned_to_nat(25u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -4771,7 +4400,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(175u);
+x_1 = lean_unsigned_to_nat(161u);
 x_2 = lean_unsigned_to_nat(36u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -4783,7 +4412,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabInaccessible_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(175u);
+x_1 = lean_unsigned_to_nat(161u);
 x_2 = lean_unsigned_to_nat(52u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -17371,6 +17000,15 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+static lean_object* _init_l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(2u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___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) {
 _start:
 {
@@ -17380,7 +17018,7 @@ 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; 
 x_11 = lean_array_uget(x_1, x_2);
-x_12 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
+x_12 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5;
 x_13 = lean_array_push(x_12, x_4);
 x_14 = lean_array_push(x_13, x_11);
 x_15 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__4;
@@ -17966,7 +17604,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__1;
 x_2 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__2;
-x_3 = lean_unsigned_to_nat(602u);
+x_3 = lean_unsigned_to_nat(588u);
 x_4 = lean_unsigned_to_nat(44u);
 x_5 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -26252,6 +25890,269 @@ lean_dec(x_2);
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+_start:
+{
+lean_object* x_15; lean_object* x_16; uint8_t x_17; lean_object* x_18; 
+x_15 = lean_box(0);
+x_16 = lean_box(0);
+x_17 = 1;
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_18 = l_Lean_Elab_Term_addTermInfo_x27(x_1, x_7, x_15, x_15, x_16, x_17, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_19 = lean_ctor_get(x_18, 1);
+lean_inc(x_19);
+lean_dec(x_18);
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_2, x_20);
+lean_dec(x_2);
+x_22 = lean_array_push(x_3, x_7);
+x_23 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___rarg(x_4, x_5, x_21, x_6, x_22, x_8, x_9, x_10, x_11, x_12, x_13, x_19);
+return x_23;
+}
+else
+{
+uint8_t x_24; 
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_24 = !lean_is_exclusive(x_18);
+if (x_24 == 0)
+{
+return x_18;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = lean_ctor_get(x_18, 0);
+x_26 = lean_ctor_get(x_18, 1);
+lean_inc(x_26);
+lean_inc(x_25);
+lean_dec(x_18);
+x_27 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_27, 0, x_25);
+lean_ctor_set(x_27, 1, x_26);
+return x_27;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___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, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+if (lean_obj_tag(x_4) == 0)
+{
+lean_object* x_13; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_13 = lean_apply_8(x_2, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_14 = lean_ctor_get(x_4, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_4, 1);
+lean_inc(x_15);
+lean_dec(x_4);
+x_16 = lean_array_get_size(x_1);
+x_17 = lean_nat_dec_lt(x_3, x_16);
+lean_dec(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; 
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_3);
+lean_dec(x_1);
+x_18 = lean_apply_8(x_2, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+return x_18;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_array_fget(x_1, x_3);
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; lean_object* x_22; 
+lean_dec(x_19);
+lean_dec(x_14);
+x_21 = lean_unsigned_to_nat(1u);
+x_22 = lean_nat_add(x_3, x_21);
+lean_dec(x_3);
+x_3 = x_22;
+x_4 = x_15;
+goto _start;
+}
+else
+{
+lean_object* x_24; uint8_t x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_20, 0);
+lean_inc(x_24);
+lean_dec(x_20);
+x_25 = 0;
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+x_26 = l_Lean_Meta_Match_Pattern_toExpr_visit(x_25, x_14, x_8, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_26) == 0)
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_27 = lean_ctor_get(x_26, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+x_29 = lean_ctor_get(x_19, 0);
+lean_inc(x_29);
+lean_dec(x_19);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+x_30 = l_Lean_Meta_mkEq(x_29, x_27, x_8, x_9, x_10, x_11, x_28);
+if (lean_obj_tag(x_30) == 0)
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; 
+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_33 = l_Lean_Syntax_getId(x_24);
+x_34 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___rarg___lambda__1), 14, 6);
+lean_closure_set(x_34, 0, x_24);
+lean_closure_set(x_34, 1, x_3);
+lean_closure_set(x_34, 2, x_5);
+lean_closure_set(x_34, 3, x_1);
+lean_closure_set(x_34, 4, x_2);
+lean_closure_set(x_34, 5, x_15);
+x_35 = 0;
+x_36 = l_Lean_Meta_withLocalDecl___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda_loop___spec__1___rarg(x_33, x_35, x_31, x_34, x_6, x_7, x_8, x_9, x_10, x_11, x_32);
+return x_36;
+}
+else
+{
+uint8_t x_37; 
+lean_dec(x_24);
+lean_dec(x_15);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_37 = !lean_is_exclusive(x_30);
+if (x_37 == 0)
+{
+return x_30;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_38 = lean_ctor_get(x_30, 0);
+x_39 = lean_ctor_get(x_30, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_30);
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
+}
+}
+}
+else
+{
+uint8_t x_41; 
+lean_dec(x_24);
+lean_dec(x_19);
+lean_dec(x_15);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_41 = !lean_is_exclusive(x_26);
+if (x_41 == 0)
+{
+return x_26;
+}
+else
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_26, 0);
+x_43 = lean_ctor_get(x_26, 1);
+lean_inc(x_43);
+lean_inc(x_42);
+lean_dec(x_26);
+x_44 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_44, 0, x_42);
+lean_ctor_set(x_44, 1, x_43);
+return x_44;
+}
+}
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___rarg), 12, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs___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, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_unsigned_to_nat(0u);
+x_12 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_13 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs_go___rarg(x_1, x_3, x_11, x_2, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_13;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs___rarg), 10, 0);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalInstances___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -26595,82 +26496,80 @@ return x_23;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; uint8_t x_20; 
-x_13 = l_List_redLength___rarg(x_1);
-x_14 = lean_mk_empty_array_with_capacity(x_13);
-lean_dec(x_13);
-x_15 = l_List_toArrayAux___rarg(x_1, x_14);
-x_16 = lean_array_get_size(x_15);
-x_17 = lean_usize_of_nat(x_16);
-lean_dec(x_16);
-x_18 = 0;
-x_19 = l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(x_17, x_18, x_15);
-x_20 = l_Array_isEmpty___rarg(x_19);
-if (x_20 == 0)
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+x_14 = l_List_redLength___rarg(x_1);
+x_15 = lean_mk_empty_array_with_capacity(x_14);
+lean_dec(x_14);
+x_16 = l_List_toArrayAux___rarg(x_1, x_15);
+x_17 = lean_array_get_size(x_16);
+x_18 = lean_usize_of_nat(x_17);
+lean_dec(x_17);
+x_19 = 0;
+x_20 = l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(x_18, x_19, x_16);
+x_21 = l_Array_append___rarg(x_20, x_2);
+x_22 = l_Array_isEmpty___rarg(x_21);
+if (x_22 == 0)
 {
-uint8_t x_21; uint8_t x_22; uint8_t x_23; lean_object* x_24; 
-x_21 = 0;
-x_22 = 1;
-x_23 = 1;
-x_24 = l_Lean_Meta_mkLambdaFVars(x_19, x_4, x_21, x_22, x_23, x_8, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_24) == 0)
+uint8_t x_23; uint8_t x_24; uint8_t x_25; lean_object* x_26; 
+x_23 = 0;
+x_24 = 1;
+x_25 = 1;
+x_26 = l_Lean_Meta_mkLambdaFVars(x_21, x_5, x_23, x_24, x_25, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_26) == 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);
-x_27 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2(x_2, x_3, x_25, x_6, x_7, x_8, x_9, x_10, x_11, x_26);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_26, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+x_29 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2(x_3, x_4, x_27, x_7, x_8, x_9, x_10, x_11, x_12, x_28);
 lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_6);
-return x_27;
+lean_dec(x_7);
+return x_29;
 }
 else
 {
-uint8_t x_28; 
+uint8_t x_30; 
 lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_6);
+lean_dec(x_7);
+lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-x_28 = !lean_is_exclusive(x_24);
-if (x_28 == 0)
+x_30 = !lean_is_exclusive(x_26);
+if (x_30 == 0)
 {
-return x_24;
+return x_26;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_24, 0);
-x_30 = lean_ctor_get(x_24, 1);
-lean_inc(x_30);
-lean_inc(x_29);
-lean_dec(x_24);
-x_31 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_30);
-return x_31;
-}
-}
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-lean_dec(x_19);
-x_32 = l_Lean_mkSimpleThunk(x_4);
-x_33 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2(x_2, x_3, x_32, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_6);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_26, 0);
+x_32 = lean_ctor_get(x_26, 1);
+lean_inc(x_32);
+lean_inc(x_31);
+lean_dec(x_26);
+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;
 }
 }
 }
+else
+{
+lean_object* x_34; lean_object* x_35; 
+lean_dec(x_21);
+x_34 = l_Lean_mkSimpleThunk(x_5);
+x_35 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2(x_3, x_4, x_34, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_10);
+lean_dec(x_7);
+return x_35;
+}
+}
+}
 static lean_object* _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4___closed__1() {
 _start:
 {
@@ -26688,424 +26587,432 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-uint8_t x_16; lean_object* x_17; 
-x_16 = 1;
+uint8_t x_17; lean_object* x_18; 
+x_17 = 1;
+lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-lean_inc(x_9);
-x_17 = l_Lean_Elab_Term_elabTermEnsuringType(x_1, x_2, x_16, x_16, x_3, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
-if (lean_obj_tag(x_17) == 0)
+x_18 = l_Lean_Elab_Term_elabTermEnsuringType(x_1, x_2, x_17, x_17, x_3, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+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; uint8_t x_26; 
-x_18 = lean_ctor_get(x_11, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 0);
+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; uint8_t x_27; 
+x_19 = lean_ctor_get(x_12, 0);
 lean_inc(x_19);
-x_20 = lean_ctor_get(x_17, 1);
+x_20 = lean_ctor_get(x_18, 0);
 lean_inc(x_20);
-lean_dec(x_17);
-x_21 = lean_ctor_get(x_11, 1);
+x_21 = lean_ctor_get(x_18, 1);
 lean_inc(x_21);
-x_22 = lean_ctor_get(x_11, 2);
+lean_dec(x_18);
+x_22 = lean_ctor_get(x_12, 1);
 lean_inc(x_22);
-x_23 = lean_ctor_get(x_11, 3);
+x_23 = lean_ctor_get(x_12, 2);
 lean_inc(x_23);
-x_24 = lean_ctor_get(x_11, 4);
+x_24 = lean_ctor_get(x_12, 3);
 lean_inc(x_24);
-x_25 = lean_ctor_get(x_11, 5);
+x_25 = lean_ctor_get(x_12, 4);
 lean_inc(x_25);
-x_26 = !lean_is_exclusive(x_18);
-if (x_26 == 0)
+x_26 = lean_ctor_get(x_12, 5);
+lean_inc(x_26);
+x_27 = !lean_is_exclusive(x_19);
+if (x_27 == 0)
 {
-lean_object* x_27; lean_object* x_28; 
-lean_ctor_set_uint8(x_18, 0, x_16);
-lean_ctor_set_uint8(x_18, 1, x_16);
-lean_ctor_set_uint8(x_18, 2, x_16);
-lean_ctor_set_uint8(x_18, 3, x_16);
-x_27 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_27, 0, x_18);
-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_25);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_5);
-lean_inc(x_4);
-x_28 = l_Lean_Meta_isExprDefEq(x_4, x_5, x_27, x_12, x_13, x_14, x_20);
-if (lean_obj_tag(x_28) == 0)
-{
-lean_object* x_29; uint8_t x_30; 
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc(x_29);
-x_30 = lean_unbox(x_29);
-lean_dec(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; uint8_t x_40; 
-lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-x_31 = lean_ctor_get(x_28, 1);
-lean_inc(x_31);
-lean_dec(x_28);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-x_32 = l_Lean_Meta_mkHasTypeButIsExpectedMsg(x_4, x_5, x_11, x_12, x_13, x_14, x_31);
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-lean_dec(x_32);
-x_35 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4___closed__2;
-x_36 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_33);
-x_37 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
-x_38 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_38, 0, x_36);
-lean_ctor_set(x_38, 1, x_37);
-x_39 = l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_38, x_9, x_10, x_11, x_12, x_13, x_14, x_34);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-x_40 = !lean_is_exclusive(x_39);
-if (x_40 == 0)
-{
-return x_39;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_41 = lean_ctor_get(x_39, 0);
-x_42 = lean_ctor_get(x_39, 1);
-lean_inc(x_42);
-lean_inc(x_41);
-lean_dec(x_39);
-x_43 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_43, 0, x_41);
-lean_ctor_set(x_43, 1, x_42);
-return x_43;
-}
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-lean_dec(x_5);
-lean_dec(x_4);
-x_44 = lean_ctor_get(x_28, 1);
-lean_inc(x_44);
-lean_dec(x_28);
-x_45 = lean_box(0);
-x_46 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(x_6, x_7, x_8, x_19, x_45, x_9, x_10, x_11, x_12, x_13, x_14, x_44);
-lean_dec(x_14);
-lean_dec(x_12);
-lean_dec(x_10);
-return x_46;
-}
-}
-else
-{
-uint8_t x_47; 
-lean_dec(x_19);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-x_47 = !lean_is_exclusive(x_28);
-if (x_47 == 0)
-{
-return x_28;
-}
-else
-{
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_28, 0);
-x_49 = lean_ctor_get(x_28, 1);
-lean_inc(x_49);
-lean_inc(x_48);
-lean_dec(x_28);
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-return x_50;
-}
-}
-}
-else
-{
-uint8_t x_51; uint8_t x_52; uint8_t x_53; uint8_t x_54; uint8_t x_55; uint8_t x_56; uint8_t x_57; uint8_t x_58; uint8_t x_59; uint8_t x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_51 = lean_ctor_get_uint8(x_18, 4);
-x_52 = lean_ctor_get_uint8(x_18, 5);
-x_53 = lean_ctor_get_uint8(x_18, 6);
-x_54 = lean_ctor_get_uint8(x_18, 7);
-x_55 = lean_ctor_get_uint8(x_18, 8);
-x_56 = lean_ctor_get_uint8(x_18, 9);
-x_57 = lean_ctor_get_uint8(x_18, 10);
-x_58 = lean_ctor_get_uint8(x_18, 11);
-x_59 = lean_ctor_get_uint8(x_18, 12);
-x_60 = lean_ctor_get_uint8(x_18, 13);
-lean_dec(x_18);
-x_61 = lean_alloc_ctor(0, 0, 14);
-lean_ctor_set_uint8(x_61, 0, x_16);
-lean_ctor_set_uint8(x_61, 1, x_16);
-lean_ctor_set_uint8(x_61, 2, x_16);
-lean_ctor_set_uint8(x_61, 3, x_16);
-lean_ctor_set_uint8(x_61, 4, x_51);
-lean_ctor_set_uint8(x_61, 5, x_52);
-lean_ctor_set_uint8(x_61, 6, x_53);
-lean_ctor_set_uint8(x_61, 7, x_54);
-lean_ctor_set_uint8(x_61, 8, x_55);
-lean_ctor_set_uint8(x_61, 9, x_56);
-lean_ctor_set_uint8(x_61, 10, x_57);
-lean_ctor_set_uint8(x_61, 11, x_58);
-lean_ctor_set_uint8(x_61, 12, x_59);
-lean_ctor_set_uint8(x_61, 13, x_60);
-x_62 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_62, 0, x_61);
-lean_ctor_set(x_62, 1, x_21);
-lean_ctor_set(x_62, 2, x_22);
-lean_ctor_set(x_62, 3, x_23);
-lean_ctor_set(x_62, 4, x_24);
-lean_ctor_set(x_62, 5, x_25);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_5);
-lean_inc(x_4);
-x_63 = l_Lean_Meta_isExprDefEq(x_4, x_5, x_62, x_12, x_13, x_14, x_20);
-if (lean_obj_tag(x_63) == 0)
-{
-lean_object* x_64; uint8_t x_65; 
-x_64 = lean_ctor_get(x_63, 0);
-lean_inc(x_64);
-x_65 = lean_unbox(x_64);
-lean_dec(x_64);
-if (x_65 == 0)
-{
-lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-x_66 = lean_ctor_get(x_63, 1);
-lean_inc(x_66);
-lean_dec(x_63);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-x_67 = l_Lean_Meta_mkHasTypeButIsExpectedMsg(x_4, x_5, x_11, x_12, x_13, x_14, x_66);
-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 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4___closed__2;
-x_71 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_71, 0, x_70);
-lean_ctor_set(x_71, 1, x_68);
-x_72 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
-x_73 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-x_74 = l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_73, x_9, x_10, x_11, x_12, x_13, x_14, x_69);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-if (lean_is_exclusive(x_74)) {
- lean_ctor_release(x_74, 0);
- lean_ctor_release(x_74, 1);
- x_77 = x_74;
-} else {
- lean_dec_ref(x_74);
- x_77 = lean_box(0);
-}
-if (lean_is_scalar(x_77)) {
- x_78 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_78 = x_77;
-}
-lean_ctor_set(x_78, 0, x_75);
-lean_ctor_set(x_78, 1, x_76);
-return x_78;
-}
-else
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-lean_dec(x_5);
-lean_dec(x_4);
-x_79 = lean_ctor_get(x_63, 1);
-lean_inc(x_79);
-lean_dec(x_63);
-x_80 = lean_box(0);
-x_81 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(x_6, x_7, x_8, x_19, x_80, x_9, x_10, x_11, x_12, x_13, x_14, x_79);
-lean_dec(x_14);
-lean_dec(x_12);
-lean_dec(x_10);
-return x_81;
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-lean_dec(x_19);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-x_82 = lean_ctor_get(x_63, 0);
-lean_inc(x_82);
-x_83 = lean_ctor_get(x_63, 1);
-lean_inc(x_83);
-if (lean_is_exclusive(x_63)) {
- lean_ctor_release(x_63, 0);
- lean_ctor_release(x_63, 1);
- x_84 = x_63;
-} else {
- lean_dec_ref(x_63);
- x_84 = lean_box(0);
-}
-if (lean_is_scalar(x_84)) {
- x_85 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_85 = x_84;
-}
-lean_ctor_set(x_85, 0, x_82);
-lean_ctor_set(x_85, 1, x_83);
-return x_85;
-}
-}
-}
-else
-{
-uint8_t x_86; 
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-x_86 = !lean_is_exclusive(x_17);
-if (x_86 == 0)
-{
-return x_17;
-}
-else
-{
-lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_87 = lean_ctor_get(x_17, 0);
-x_88 = lean_ctor_get(x_17, 1);
-lean_inc(x_88);
-lean_inc(x_87);
-lean_dec(x_17);
-x_89 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_89, 0, x_87);
-lean_ctor_set(x_89, 1, x_88);
-return x_89;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
-_start:
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_15 = lean_ctor_get(x_1, 2);
+lean_object* x_28; lean_object* x_29; 
+lean_ctor_set_uint8(x_19, 0, x_17);
+lean_ctor_set_uint8(x_19, 1, x_17);
+lean_ctor_set_uint8(x_19, 2, x_17);
+lean_ctor_set_uint8(x_19, 3, x_17);
+x_28 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_28, 0, x_19);
+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_26);
 lean_inc(x_15);
-lean_dec(x_1);
-lean_inc(x_7);
-x_16 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_16, 0, x_7);
-x_17 = lean_box(0);
-lean_inc(x_7);
-x_18 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4), 15, 8);
-lean_closure_set(x_18, 0, x_15);
-lean_closure_set(x_18, 1, x_16);
-lean_closure_set(x_18, 2, x_17);
-lean_closure_set(x_18, 3, x_7);
-lean_closure_set(x_18, 4, x_2);
-lean_closure_set(x_18, 5, x_3);
-lean_closure_set(x_18, 6, x_4);
-lean_closure_set(x_18, 7, x_5);
-x_19 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___rarg(x_6, x_7, x_18, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-return x_19;
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_5);
+lean_inc(x_4);
+x_29 = l_Lean_Meta_isExprDefEq(x_4, x_5, x_28, x_13, x_14, x_15, x_21);
+if (lean_obj_tag(x_29) == 0)
+{
+lean_object* x_30; uint8_t x_31; 
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_unbox(x_30);
+lean_dec(x_30);
+if (x_31 == 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; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 
+lean_dec(x_20);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+x_32 = lean_ctor_get(x_29, 1);
+lean_inc(x_32);
+lean_dec(x_29);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+x_33 = l_Lean_Meta_mkHasTypeButIsExpectedMsg(x_4, x_5, x_12, x_13, x_14, x_15, x_32);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
+lean_dec(x_33);
+x_36 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4___closed__2;
+x_37 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_34);
+x_38 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
+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___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_39, x_10, x_11, x_12, x_13, x_14, x_15, x_35);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+x_41 = !lean_is_exclusive(x_40);
+if (x_41 == 0)
+{
+return x_40;
+}
+else
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_40, 0);
+x_43 = lean_ctor_get(x_40, 1);
+lean_inc(x_43);
+lean_inc(x_42);
+lean_dec(x_40);
+x_44 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_44, 0, x_42);
+lean_ctor_set(x_44, 1, x_43);
+return x_44;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+lean_dec(x_5);
+lean_dec(x_4);
+x_45 = lean_ctor_get(x_29, 1);
+lean_inc(x_45);
+lean_dec(x_29);
+x_46 = lean_box(0);
+x_47 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(x_6, x_7, x_8, x_9, x_20, x_46, x_10, x_11, x_12, x_13, x_14, x_15, x_45);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_12);
+lean_dec(x_11);
+return x_47;
+}
+}
+else
+{
+uint8_t x_48; 
+lean_dec(x_20);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_48 = !lean_is_exclusive(x_29);
+if (x_48 == 0)
+{
+return x_29;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_29, 0);
+x_50 = lean_ctor_get(x_29, 1);
+lean_inc(x_50);
+lean_inc(x_49);
+lean_dec(x_29);
+x_51 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_51, 0, x_49);
+lean_ctor_set(x_51, 1, x_50);
+return x_51;
+}
+}
+}
+else
+{
+uint8_t x_52; uint8_t x_53; uint8_t x_54; uint8_t x_55; uint8_t x_56; uint8_t x_57; uint8_t x_58; uint8_t x_59; uint8_t x_60; uint8_t x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_52 = lean_ctor_get_uint8(x_19, 4);
+x_53 = lean_ctor_get_uint8(x_19, 5);
+x_54 = lean_ctor_get_uint8(x_19, 6);
+x_55 = lean_ctor_get_uint8(x_19, 7);
+x_56 = lean_ctor_get_uint8(x_19, 8);
+x_57 = lean_ctor_get_uint8(x_19, 9);
+x_58 = lean_ctor_get_uint8(x_19, 10);
+x_59 = lean_ctor_get_uint8(x_19, 11);
+x_60 = lean_ctor_get_uint8(x_19, 12);
+x_61 = lean_ctor_get_uint8(x_19, 13);
+lean_dec(x_19);
+x_62 = lean_alloc_ctor(0, 0, 14);
+lean_ctor_set_uint8(x_62, 0, x_17);
+lean_ctor_set_uint8(x_62, 1, x_17);
+lean_ctor_set_uint8(x_62, 2, x_17);
+lean_ctor_set_uint8(x_62, 3, x_17);
+lean_ctor_set_uint8(x_62, 4, x_52);
+lean_ctor_set_uint8(x_62, 5, x_53);
+lean_ctor_set_uint8(x_62, 6, x_54);
+lean_ctor_set_uint8(x_62, 7, x_55);
+lean_ctor_set_uint8(x_62, 8, x_56);
+lean_ctor_set_uint8(x_62, 9, x_57);
+lean_ctor_set_uint8(x_62, 10, x_58);
+lean_ctor_set_uint8(x_62, 11, x_59);
+lean_ctor_set_uint8(x_62, 12, x_60);
+lean_ctor_set_uint8(x_62, 13, x_61);
+x_63 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_63, 0, x_62);
+lean_ctor_set(x_63, 1, x_22);
+lean_ctor_set(x_63, 2, x_23);
+lean_ctor_set(x_63, 3, x_24);
+lean_ctor_set(x_63, 4, x_25);
+lean_ctor_set(x_63, 5, x_26);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_5);
+lean_inc(x_4);
+x_64 = l_Lean_Meta_isExprDefEq(x_4, x_5, x_63, x_13, x_14, x_15, x_21);
+if (lean_obj_tag(x_64) == 0)
+{
+lean_object* x_65; uint8_t x_66; 
+x_65 = lean_ctor_get(x_64, 0);
+lean_inc(x_65);
+x_66 = lean_unbox(x_65);
+lean_dec(x_65);
+if (x_66 == 0)
+{
+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_dec(x_20);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+x_67 = lean_ctor_get(x_64, 1);
+lean_inc(x_67);
+lean_dec(x_64);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+x_68 = l_Lean_Meta_mkHasTypeButIsExpectedMsg(x_4, x_5, x_12, x_13, x_14, x_15, x_67);
+x_69 = lean_ctor_get(x_68, 0);
+lean_inc(x_69);
+x_70 = lean_ctor_get(x_68, 1);
+lean_inc(x_70);
+lean_dec(x_68);
+x_71 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4___closed__2;
+x_72 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_72, 0, x_71);
+lean_ctor_set(x_72, 1, x_69);
+x_73 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
+x_74 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_74, 0, x_72);
+lean_ctor_set(x_74, 1, x_73);
+x_75 = l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_74, x_10, x_11, x_12, x_13, x_14, x_15, x_70);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+x_76 = lean_ctor_get(x_75, 0);
+lean_inc(x_76);
+x_77 = lean_ctor_get(x_75, 1);
+lean_inc(x_77);
+if (lean_is_exclusive(x_75)) {
+ lean_ctor_release(x_75, 0);
+ lean_ctor_release(x_75, 1);
+ x_78 = x_75;
+} else {
+ lean_dec_ref(x_75);
+ x_78 = lean_box(0);
+}
+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_80; lean_object* x_81; lean_object* x_82; 
+lean_dec(x_5);
+lean_dec(x_4);
+x_80 = lean_ctor_get(x_64, 1);
+lean_inc(x_80);
+lean_dec(x_64);
+x_81 = lean_box(0);
+x_82 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(x_6, x_7, x_8, x_9, x_20, x_81, x_10, x_11, x_12, x_13, x_14, x_15, x_80);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_12);
+lean_dec(x_11);
+return x_82;
+}
+}
+else
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+lean_dec(x_20);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_83 = lean_ctor_get(x_64, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_64, 1);
+lean_inc(x_84);
+if (lean_is_exclusive(x_64)) {
+ lean_ctor_release(x_64, 0);
+ lean_ctor_release(x_64, 1);
+ x_85 = x_64;
+} else {
+ lean_dec_ref(x_64);
+ x_85 = lean_box(0);
+}
+if (lean_is_scalar(x_85)) {
+ x_86 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_86 = x_85;
+}
+lean_ctor_set(x_86, 0, x_83);
+lean_ctor_set(x_86, 1, x_84);
+return x_86;
+}
+}
+}
+else
+{
+uint8_t x_87; 
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_87 = !lean_is_exclusive(x_18);
+if (x_87 == 0)
+{
+return x_18;
+}
+else
+{
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_18, 0);
+x_89 = lean_ctor_get(x_18, 1);
+lean_inc(x_89);
+lean_inc(x_88);
+lean_dec(x_18);
+x_90 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+return x_90;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-lean_dec(x_7);
-lean_inc(x_11);
-x_15 = l_Lean_Meta_instantiateMVars(x_1, x_10, x_11, x_12, x_13, x_14);
-x_16 = lean_ctor_get(x_15, 0);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_16 = lean_ctor_get(x_1, 2);
 lean_inc(x_16);
-x_17 = lean_ctor_get(x_15, 1);
-lean_inc(x_17);
-lean_dec(x_15);
-x_18 = l_Lean_Expr_getAppFn(x_16);
-x_19 = l_Lean_Expr_isMVar(x_18);
-lean_dec(x_18);
-if (x_19 == 0)
-{
-lean_object* x_20; 
-lean_inc(x_16);
-x_20 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(x_2, x_16, x_3, x_4, x_5, x_6, x_16, x_8, x_9, x_10, x_11, x_12, x_13, x_17);
+lean_dec(x_1);
+lean_inc(x_8);
+x_17 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_17, 0, x_8);
+x_18 = lean_box(0);
+lean_inc(x_8);
+x_19 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__4), 16, 9);
+lean_closure_set(x_19, 0, x_16);
+lean_closure_set(x_19, 1, x_17);
+lean_closure_set(x_19, 2, x_18);
+lean_closure_set(x_19, 3, x_8);
+lean_closure_set(x_19, 4, x_2);
+lean_closure_set(x_19, 5, x_3);
+lean_closure_set(x_19, 6, x_4);
+lean_closure_set(x_19, 7, x_5);
+lean_closure_set(x_19, 8, x_6);
+x_20 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear___rarg(x_7, x_8, x_19, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
 return x_20;
 }
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+_start:
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+lean_dec(x_8);
+lean_inc(x_12);
+x_16 = l_Lean_Meta_instantiateMVars(x_1, x_11, x_12, x_13, x_14, x_15);
+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 = l_Lean_Expr_getAppFn(x_17);
+x_20 = l_Lean_Expr_isMVar(x_19);
+lean_dec(x_19);
+if (x_20 == 0)
+{
+lean_object* x_21; 
+lean_inc(x_17);
+x_21 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(x_2, x_17, x_3, x_4, x_5, x_6, x_7, x_17, x_9, x_10, x_11, x_12, x_13, x_14, x_18);
+return x_21;
+}
 else
 {
-uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_21 = 0;
-x_22 = lean_box(0);
-lean_inc(x_10);
-x_23 = l_Lean_Meta_mkFreshTypeMVar(x_21, x_22, x_10, x_11, x_12, x_13, x_17);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
+uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_22 = 0;
+x_23 = lean_box(0);
+lean_inc(x_11);
+x_24 = l_Lean_Meta_mkFreshTypeMVar(x_22, x_23, x_11, x_12, x_13, x_14, x_18);
+x_25 = lean_ctor_get(x_24, 0);
 lean_inc(x_25);
-lean_dec(x_23);
-x_26 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(x_2, x_16, x_3, x_4, x_5, x_6, x_24, x_8, x_9, x_10, x_11, x_12, x_13, x_25);
-return x_26;
+x_26 = lean_ctor_get(x_24, 1);
+lean_inc(x_26);
+lean_dec(x_24);
+x_27 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(x_2, x_17, x_3, x_4, x_5, x_6, x_7, x_25, x_9, x_10, x_11, x_12, x_13, x_14, x_26);
+return x_27;
 }
 }
 }
@@ -27126,235 +27033,255 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-uint8_t x_14; lean_object* x_15; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_28 = lean_st_ref_get(x_12, x_13);
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_29, 3);
+uint8_t x_15; lean_object* x_16; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
+x_29 = lean_st_ref_get(x_13, x_14);
+x_30 = lean_ctor_get(x_29, 0);
 lean_inc(x_30);
-lean_dec(x_29);
-x_31 = lean_ctor_get_uint8(x_30, sizeof(void*)*1);
+x_31 = lean_ctor_get(x_30, 3);
+lean_inc(x_31);
 lean_dec(x_30);
-if (x_31 == 0)
+x_32 = lean_ctor_get_uint8(x_31, sizeof(void*)*1);
+lean_dec(x_31);
+if (x_32 == 0)
 {
-lean_object* x_32; uint8_t x_33; 
-x_32 = lean_ctor_get(x_28, 1);
-lean_inc(x_32);
-lean_dec(x_28);
-x_33 = 0;
-x_14 = x_33;
-x_15 = x_32;
-goto block_27;
+lean_object* x_33; uint8_t x_34; 
+x_33 = lean_ctor_get(x_29, 1);
+lean_inc(x_33);
+lean_dec(x_29);
+x_34 = 0;
+x_15 = x_34;
+x_16 = x_33;
+goto block_28;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
-x_34 = lean_ctor_get(x_28, 1);
-lean_inc(x_34);
-lean_dec(x_28);
-lean_inc(x_5);
-x_35 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_5, x_7, x_8, x_9, x_10, x_11, x_12, x_34);
-x_36 = lean_ctor_get(x_35, 0);
-lean_inc(x_36);
-x_37 = lean_ctor_get(x_35, 1);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+x_35 = lean_ctor_get(x_29, 1);
+lean_inc(x_35);
+lean_dec(x_29);
+lean_inc(x_6);
+x_36 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_6, x_8, x_9, x_10, x_11, x_12, x_13, x_35);
+x_37 = lean_ctor_get(x_36, 0);
 lean_inc(x_37);
-lean_dec(x_35);
-x_38 = lean_unbox(x_36);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
 lean_dec(x_36);
-x_14 = x_38;
-x_15 = x_37;
-goto block_27;
+x_39 = lean_unbox(x_37);
+lean_dec(x_37);
+x_15 = x_39;
+x_16 = x_38;
+goto block_28;
 }
-block_27:
+block_28:
 {
-if (x_14 == 0)
+if (x_15 == 0)
 {
-lean_object* x_16; lean_object* x_17; 
-x_16 = lean_box(0);
-x_17 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_16, x_7, x_8, x_9, x_10, x_11, x_12, x_15);
-return x_17;
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_box(0);
+x_18 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_17, x_8, x_9, x_10, x_11, x_12, x_13, x_16);
+return x_18;
 }
 else
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_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_inc(x_1);
-x_18 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_18, 0, x_1);
-x_19 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__7___closed__2;
-x_20 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_20, 1, x_18);
-x_21 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
-x_22 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_21);
-lean_inc(x_5);
-x_23 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_5, x_22, x_7, x_8, x_9, x_10, x_11, x_12, x_15);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
+x_19 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_19, 0, x_1);
+x_20 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__7___closed__2;
+x_21 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_19);
+x_22 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
+x_23 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+lean_inc(x_6);
+x_24 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_6, x_23, x_8, x_9, x_10, x_11, x_12, x_13, x_16);
+x_25 = lean_ctor_get(x_24, 0);
 lean_inc(x_25);
-lean_dec(x_23);
-x_26 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_24, x_7, x_8, x_9, x_10, x_11, x_12, x_25);
-return x_26;
+x_26 = lean_ctor_get(x_24, 1);
+lean_inc(x_26);
+lean_dec(x_24);
+x_27 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_25, x_8, x_9, x_10, x_11, x_12, x_13, x_26);
+return x_27;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_13 = lean_ctor_get(x_4, 1);
-lean_inc(x_13);
-lean_inc(x_13);
-x_14 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__7), 13, 6);
-lean_closure_set(x_14, 0, x_5);
-lean_closure_set(x_14, 1, x_1);
-lean_closure_set(x_14, 2, x_13);
-lean_closure_set(x_14, 3, x_4);
-lean_closure_set(x_14, 4, x_2);
-lean_closure_set(x_14, 5, x_3);
-x_15 = l_Lean_Meta_withLocalInstances___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__1___rarg(x_13, x_14, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_13);
-return x_15;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, 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; 
-x_13 = lean_ctor_get(x_1, 0);
-lean_inc(x_13);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 x_14 = lean_ctor_get(x_1, 1);
 lean_inc(x_14);
-x_15 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__8), 12, 3);
-lean_closure_set(x_15, 0, x_1);
-lean_closure_set(x_15, 1, x_2);
-lean_closure_set(x_15, 2, x_3);
-x_16 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS___rarg(x_13, x_5, x_14, x_4, x_15, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+lean_inc(x_14);
+x_15 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__7), 14, 7);
+lean_closure_set(x_15, 0, x_2);
+lean_closure_set(x_15, 1, x_3);
+lean_closure_set(x_15, 2, x_14);
+lean_closure_set(x_15, 3, x_6);
+lean_closure_set(x_15, 4, x_1);
+lean_closure_set(x_15, 5, x_4);
+lean_closure_set(x_15, 6, x_5);
+x_16 = l_Lean_Meta_withLocalInstances___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__1___rarg(x_14, x_15, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_14);
+return x_16;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+_start:
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_14 = lean_ctor_get(x_5, 2);
+lean_inc(x_14);
+x_15 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__8), 13, 5);
+lean_closure_set(x_15, 0, x_5);
+lean_closure_set(x_15, 1, x_6);
+lean_closure_set(x_15, 2, x_1);
+lean_closure_set(x_15, 3, x_2);
+lean_closure_set(x_15, 4, x_3);
+x_16 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withEqs___rarg(x_4, x_14, x_15, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 return x_16;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__9), 12, 4);
-lean_closure_set(x_14, 0, x_1);
-lean_closure_set(x_14, 1, x_2);
-lean_closure_set(x_14, 2, x_3);
-lean_closure_set(x_14, 3, x_4);
-x_15 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars___rarg(x_5, x_14, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_15;
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_1, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_1, 1);
+lean_inc(x_15);
+x_16 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__9), 13, 4);
+lean_closure_set(x_16, 0, x_1);
+lean_closure_set(x_16, 1, x_2);
+lean_closure_set(x_16, 2, x_3);
+lean_closure_set(x_16, 3, x_4);
+x_17 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS___rarg(x_14, x_6, x_15, x_5, x_16, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_17;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(lean_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_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-lean_object* x_11; 
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10), 13, 5);
+lean_closure_set(x_15, 0, x_1);
+lean_closure_set(x_15, 1, x_2);
+lean_closure_set(x_15, 2, x_3);
+lean_closure_set(x_15, 3, x_4);
+lean_closure_set(x_15, 4, x_5);
+x_16 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars___rarg(x_6, x_15, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+return x_16;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__12(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; 
+lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-lean_inc(x_4);
-x_11 = l_Lean_Elab_Term_collectPatternVars(x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_11) == 0)
+x_12 = l_Lean_Elab_Term_collectPatternVars(x_1, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_12) == 0)
 {
-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_18; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
+x_13 = lean_ctor_get(x_12, 0);
 lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_ctor_get(x_12, 0);
+x_14 = lean_ctor_get(x_12, 1);
 lean_inc(x_14);
-x_15 = lean_ctor_get(x_12, 1);
-lean_inc(x_15);
 lean_dec(x_12);
-x_16 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__8;
-x_34 = lean_st_ref_get(x_9, x_13);
-x_35 = lean_ctor_get(x_34, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_35, 3);
+x_15 = lean_ctor_get(x_13, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_13, 1);
+lean_inc(x_16);
+lean_dec(x_13);
+x_17 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__8;
+x_35 = lean_st_ref_get(x_10, x_14);
+x_36 = lean_ctor_get(x_35, 0);
 lean_inc(x_36);
-lean_dec(x_35);
-x_37 = lean_ctor_get_uint8(x_36, sizeof(void*)*1);
+x_37 = lean_ctor_get(x_36, 3);
+lean_inc(x_37);
 lean_dec(x_36);
-if (x_37 == 0)
+x_38 = lean_ctor_get_uint8(x_37, sizeof(void*)*1);
+lean_dec(x_37);
+if (x_38 == 0)
 {
-lean_object* x_38; uint8_t x_39; 
-x_38 = lean_ctor_get(x_34, 1);
-lean_inc(x_38);
-lean_dec(x_34);
-x_39 = 0;
-x_17 = x_39;
-x_18 = x_38;
-goto block_33;
+lean_object* x_39; uint8_t x_40; 
+x_39 = lean_ctor_get(x_35, 1);
+lean_inc(x_39);
+lean_dec(x_35);
+x_40 = 0;
+x_18 = x_40;
+x_19 = x_39;
+goto block_34;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
-x_40 = lean_ctor_get(x_34, 1);
-lean_inc(x_40);
-lean_dec(x_34);
-x_41 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_16, x_4, x_5, x_6, x_7, x_8, x_9, x_40);
-x_42 = lean_ctor_get(x_41, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_41, 1);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; 
+x_41 = lean_ctor_get(x_35, 1);
+lean_inc(x_41);
+lean_dec(x_35);
+x_42 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_17, x_5, x_6, x_7, x_8, x_9, x_10, x_41);
+x_43 = lean_ctor_get(x_42, 0);
 lean_inc(x_43);
-lean_dec(x_41);
-x_44 = lean_unbox(x_42);
+x_44 = lean_ctor_get(x_42, 1);
+lean_inc(x_44);
 lean_dec(x_42);
-x_17 = x_44;
-x_18 = x_43;
-goto block_33;
+x_45 = lean_unbox(x_43);
+lean_dec(x_43);
+x_18 = x_45;
+x_19 = x_44;
+goto block_34;
 }
-block_33:
+block_34:
 {
-if (x_17 == 0)
+if (x_18 == 0)
 {
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_box(0);
-x_20 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10(x_15, x_16, x_2, x_3, x_14, x_19, x_4, x_5, x_6, x_7, x_8, x_9, x_18);
-return x_20;
+lean_object* x_20; lean_object* x_21; 
+x_20 = lean_box(0);
+x_21 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(x_16, x_17, x_2, x_3, x_4, x_15, x_20, x_5, x_6, x_7, x_8, x_9, x_10, x_19);
+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; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-lean_inc(x_14);
-x_21 = lean_array_to_list(lean_box(0), x_14);
-x_22 = lean_box(0);
-x_23 = l_List_mapTRAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__2___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__3___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__4(x_21, x_22);
-x_24 = l_Lean_MessageData_ofList(x_23);
-lean_dec(x_23);
-x_25 = l_Lean_Elab_Term_ToDepElimPattern_main___rarg___lambda__2___closed__2;
-x_26 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_24);
-x_27 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
-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_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_16, x_28, x_4, x_5, x_6, x_7, x_8, x_9, x_18);
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+lean_inc(x_15);
+x_22 = lean_array_to_list(lean_box(0), x_15);
+x_23 = lean_box(0);
+x_24 = l_List_mapTRAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__2___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__3___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__4(x_22, x_23);
+x_25 = l_Lean_MessageData_ofList(x_24);
+lean_dec(x_24);
+x_26 = l_Lean_Elab_Term_ToDepElimPattern_main___rarg___lambda__2___closed__2;
+x_27 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_25);
+x_28 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
+x_29 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+x_30 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_17, x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_19);
+x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
-lean_dec(x_29);
-x_32 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10(x_15, x_16, x_2, x_3, x_14, x_30, x_4, x_5, x_6, x_7, x_8, x_9, x_31);
+x_32 = lean_ctor_get(x_30, 1);
+lean_inc(x_32);
 lean_dec(x_30);
-return x_32;
+x_33 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(x_16, x_17, x_2, x_3, x_4, x_15, x_31, x_5, x_6, x_7, x_8, x_9, x_10, x_32);
+lean_dec(x_31);
+return x_33;
 }
 }
 }
 else
 {
-uint8_t x_45; 
+uint8_t x_46; 
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -27363,62 +27290,64 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_45 = !lean_is_exclusive(x_11);
-if (x_45 == 0)
+x_46 = !lean_is_exclusive(x_12);
+if (x_46 == 0)
 {
-return x_11;
+return x_12;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_11, 0);
-x_47 = lean_ctor_get(x_11, 1);
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_12, 0);
+x_48 = lean_ctor_get(x_12, 1);
+lean_inc(x_48);
 lean_inc(x_47);
-lean_inc(x_46);
-lean_dec(x_11);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
+lean_dec(x_12);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+return x_49;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView(lean_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_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView(lean_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_11; lean_object* x_12; uint8_t x_13; 
-x_11 = lean_ctor_get(x_1, 0);
-lean_inc(x_11);
-lean_inc(x_2);
-x_12 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11), 10, 3);
-lean_closure_set(x_12, 0, x_1);
-lean_closure_set(x_12, 1, x_3);
-lean_closure_set(x_12, 2, x_2);
-x_13 = !lean_is_exclusive(x_8);
-if (x_13 == 0)
+lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_12 = lean_ctor_get(x_2, 0);
+lean_inc(x_12);
+lean_inc(x_3);
+x_13 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__12), 11, 4);
+lean_closure_set(x_13, 0, x_2);
+lean_closure_set(x_13, 1, x_4);
+lean_closure_set(x_13, 2, x_1);
+lean_closure_set(x_13, 3, x_3);
+x_14 = !lean_is_exclusive(x_9);
+if (x_14 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_14 = lean_ctor_get(x_8, 3);
-x_15 = l_Lean_replaceRef(x_11, x_14);
-lean_dec(x_14);
-lean_dec(x_11);
-lean_ctor_set(x_8, 3, x_15);
-x_16 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___rarg(x_2, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_16;
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_9, 3);
+x_16 = l_Lean_replaceRef(x_12, x_15);
+lean_dec(x_15);
+lean_dec(x_12);
+lean_ctor_set(x_9, 3, x_16);
+x_17 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___rarg(x_3, x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+return x_17;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_17 = lean_ctor_get(x_8, 0);
-x_18 = lean_ctor_get(x_8, 1);
-x_19 = lean_ctor_get(x_8, 2);
-x_20 = lean_ctor_get(x_8, 3);
-x_21 = lean_ctor_get(x_8, 4);
-x_22 = lean_ctor_get(x_8, 5);
-x_23 = lean_ctor_get(x_8, 6);
-x_24 = lean_ctor_get(x_8, 7);
-x_25 = lean_ctor_get(x_8, 8);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_18 = lean_ctor_get(x_9, 0);
+x_19 = lean_ctor_get(x_9, 1);
+x_20 = lean_ctor_get(x_9, 2);
+x_21 = lean_ctor_get(x_9, 3);
+x_22 = lean_ctor_get(x_9, 4);
+x_23 = lean_ctor_get(x_9, 5);
+x_24 = lean_ctor_get(x_9, 6);
+x_25 = lean_ctor_get(x_9, 7);
+x_26 = lean_ctor_get(x_9, 8);
+lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
@@ -27427,23 +27356,22 @@ lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
-lean_inc(x_17);
-lean_dec(x_8);
-x_26 = l_Lean_replaceRef(x_11, x_20);
-lean_dec(x_20);
-lean_dec(x_11);
-x_27 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_27, 0, x_17);
-lean_ctor_set(x_27, 1, x_18);
-lean_ctor_set(x_27, 2, x_19);
-lean_ctor_set(x_27, 3, x_26);
-lean_ctor_set(x_27, 4, x_21);
-lean_ctor_set(x_27, 5, x_22);
-lean_ctor_set(x_27, 6, x_23);
-lean_ctor_set(x_27, 7, x_24);
-lean_ctor_set(x_27, 8, x_25);
-x_28 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___rarg(x_2, x_12, x_4, x_5, x_6, x_7, x_27, x_9, x_10);
-return x_28;
+lean_dec(x_9);
+x_27 = l_Lean_replaceRef(x_12, x_21);
+lean_dec(x_21);
+lean_dec(x_12);
+x_28 = lean_alloc_ctor(0, 9, 0);
+lean_ctor_set(x_28, 0, x_18);
+lean_ctor_set(x_28, 1, x_19);
+lean_ctor_set(x_28, 2, x_20);
+lean_ctor_set(x_28, 3, x_27);
+lean_ctor_set(x_28, 4, x_22);
+lean_ctor_set(x_28, 5, x_23);
+lean_ctor_set(x_28, 6, x_24);
+lean_ctor_set(x_28, 7, x_25);
+lean_ctor_set(x_28, 8, x_26);
+x_29 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_withoutAuxDiscrs___rarg(x_3, x_13, x_5, x_6, x_7, x_8, x_28, x_10, x_11);
+return x_29;
 }
 }
 }
@@ -27485,27 +27413,28 @@ lean_dec(x_4);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
-_start:
-{
-lean_object* x_13; 
-x_13 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_7);
-lean_dec(x_5);
-return x_13;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
 lean_object* x_14; 
-x_14 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__10(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_14 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
 lean_dec(x_6);
 return x_14;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+_start:
+{
+lean_object* x_15; 
+x_15 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__11(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+lean_dec(x_7);
+return x_15;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndexToInclude_x3f_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
@@ -27765,7 +27694,34 @@ x_1 = 0;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(size_t x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_usize_dec_lt(x_2, x_1);
+if (x_4 == 0)
+{
+return x_3;
+}
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; 
+x_5 = lean_array_uget(x_3, x_2);
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_array_uset(x_3, x_2, x_6);
+x_8 = lean_ctor_get(x_5, 0);
+lean_inc(x_8);
+lean_dec(x_5);
+x_9 = 1;
+x_10 = lean_usize_add(x_2, x_9);
+x_11 = lean_array_uset(x_7, x_2, x_8);
+x_2 = x_10;
+x_3 = x_11;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -27801,7 +27757,35 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(size_t x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_usize_dec_lt(x_2, x_1);
+if (x_4 == 0)
+{
+return x_3;
+}
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; size_t x_10; size_t x_11; lean_object* x_12; 
+x_5 = lean_array_uget(x_3, x_2);
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_array_uset(x_3, x_2, x_6);
+x_8 = lean_box(0);
+x_9 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_9, 0, x_5);
+lean_ctor_set(x_9, 1, x_8);
+x_10 = 1;
+x_11 = lean_usize_add(x_2, x_10);
+x_12 = lean_array_uset(x_7, x_2, x_9);
+x_2 = x_11;
+x_3 = x_12;
+goto _start;
+}
+}
+}
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -27835,7 +27819,7 @@ return x_12;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; 
@@ -27867,7 +27851,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___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_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___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) {
 _start:
 {
 lean_object* x_11; lean_object* x_12; 
@@ -27878,7 +27862,7 @@ lean_ctor_set(x_12, 1, x_10);
 return x_12;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(size_t 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* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(size_t 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* x_12, lean_object* x_13) {
 _start:
 {
 uint8_t x_14; 
@@ -27914,7 +27898,7 @@ if (x_26 == 0)
 lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 lean_dec(x_24);
 x_27 = lean_box(0);
-x_28 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_22, x_27, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
+x_28 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_22, x_27, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
 x_29 = lean_ctor_get(x_28, 0);
 lean_inc(x_29);
 x_30 = lean_ctor_get(x_28, 1);
@@ -27934,7 +27918,7 @@ if (x_32 == 0)
 lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 lean_dec(x_24);
 x_33 = lean_box(0);
-x_34 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_22, x_33, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
+x_34 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_22, x_33, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
 x_35 = lean_ctor_get(x_34, 0);
 lean_inc(x_35);
 x_36 = lean_ctor_get(x_34, 1);
@@ -27950,12 +27934,12 @@ else
 size_t x_38; uint8_t x_39; 
 x_38 = lean_usize_of_nat(x_24);
 lean_dec(x_24);
-x_39 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(x_22, x_2, x_1, x_38);
+x_39 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(x_22, x_2, x_1, x_38);
 if (x_39 == 0)
 {
 lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
 x_40 = lean_box(0);
-x_41 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_22, x_40, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
+x_41 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_22, x_40, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
 x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
 x_43 = lean_ctor_get(x_41, 1);
@@ -27976,7 +27960,7 @@ x_47 = lean_ctor_get(x_45, 1);
 lean_inc(x_47);
 lean_dec(x_45);
 x_48 = lean_box(0);
-x_49 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_46, x_48, x_7, x_8, x_9, x_10, x_11, x_12, x_47);
+x_49 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_46, x_48, x_7, x_8, x_9, x_10, x_11, x_12, x_47);
 x_50 = lean_ctor_get(x_49, 0);
 lean_inc(x_50);
 x_51 = lean_ctor_get(x_49, 1);
@@ -28000,7 +27984,7 @@ x_55 = lean_ctor_get(x_53, 1);
 lean_inc(x_55);
 lean_dec(x_53);
 x_56 = lean_box(0);
-x_57 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_54, x_56, x_7, x_8, x_9, x_10, x_11, x_12, x_55);
+x_57 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_54, x_56, x_7, x_8, x_9, x_10, x_11, x_12, x_55);
 x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
 x_59 = lean_ctor_get(x_57, 1);
@@ -28048,7 +28032,7 @@ return x_65;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(size_t 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* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__7(size_t 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* x_12, lean_object* x_13) {
 _start:
 {
 uint8_t x_14; 
@@ -28084,7 +28068,7 @@ if (x_26 == 0)
 lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 lean_dec(x_24);
 x_27 = lean_box(0);
-x_28 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_22, x_27, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
+x_28 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_22, x_27, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
 x_29 = lean_ctor_get(x_28, 0);
 lean_inc(x_29);
 x_30 = lean_ctor_get(x_28, 1);
@@ -28104,7 +28088,7 @@ if (x_32 == 0)
 lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 lean_dec(x_24);
 x_33 = lean_box(0);
-x_34 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_22, x_33, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
+x_34 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_22, x_33, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
 x_35 = lean_ctor_get(x_34, 0);
 lean_inc(x_35);
 x_36 = lean_ctor_get(x_34, 1);
@@ -28120,12 +28104,12 @@ else
 size_t x_38; uint8_t x_39; 
 x_38 = lean_usize_of_nat(x_24);
 lean_dec(x_24);
-x_39 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(x_22, x_2, x_1, x_38);
+x_39 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(x_22, x_2, x_1, x_38);
 if (x_39 == 0)
 {
 lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
 x_40 = lean_box(0);
-x_41 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_22, x_40, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
+x_41 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_22, x_40, x_7, x_8, x_9, x_10, x_11, x_12, x_21);
 x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
 x_43 = lean_ctor_get(x_41, 1);
@@ -28146,7 +28130,7 @@ x_47 = lean_ctor_get(x_45, 1);
 lean_inc(x_47);
 lean_dec(x_45);
 x_48 = lean_box(0);
-x_49 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_46, x_48, x_7, x_8, x_9, x_10, x_11, x_12, x_47);
+x_49 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_46, x_48, x_7, x_8, x_9, x_10, x_11, x_12, x_47);
 x_50 = lean_ctor_get(x_49, 0);
 lean_inc(x_50);
 x_51 = lean_ctor_get(x_49, 1);
@@ -28170,7 +28154,7 @@ x_55 = lean_ctor_get(x_53, 1);
 lean_inc(x_55);
 lean_dec(x_53);
 x_56 = lean_box(0);
-x_57 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_6, x_54, x_56, x_7, x_8, x_9, x_10, x_11, x_12, x_55);
+x_57 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_6, x_54, x_56, x_7, x_8, x_9, x_10, x_11, x_12, x_55);
 x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
 x_59 = lean_ctor_get(x_57, 1);
@@ -28218,73 +28202,69 @@ return x_65;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(size_t x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8(size_t x_1, lean_object* x_2, lean_object* x_3, size_t 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_13; 
-x_13 = lean_usize_dec_lt(x_4, x_3);
-if (x_13 == 0)
+uint8_t x_15; 
+x_15 = lean_usize_dec_lt(x_6, x_5);
+if (x_15 == 0)
 {
-lean_object* x_14; 
+lean_object* x_16; 
+lean_dec(x_13);
+lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-x_14 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_14, 0, x_5);
-lean_ctor_set(x_14, 1, x_12);
-return x_14;
+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_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_43; 
-x_15 = lean_array_uget(x_5, x_4);
-x_16 = lean_unsigned_to_nat(0u);
-x_17 = lean_array_uset(x_5, x_4, x_16);
-x_18 = lean_ctor_get(x_15, 1);
-lean_inc(x_18);
+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_45; 
+x_17 = lean_array_uget(x_7, x_6);
+x_18 = lean_unsigned_to_nat(0u);
+x_19 = lean_array_uset(x_7, x_6, x_18);
+x_20 = lean_ctor_get(x_17, 1);
+lean_inc(x_20);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_43 = l_Lean_Elab_Term_getPatternsVars(x_18, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_43) == 0)
+x_45 = l_Lean_Elab_Term_getPatternsVars(x_20, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_45) == 0)
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; 
-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_array_get_size(x_2);
-x_47 = lean_nat_dec_le(x_46, x_46);
-if (x_47 == 0)
-{
-uint8_t x_48; 
-x_48 = lean_nat_dec_lt(x_16, x_46);
+lean_object* x_46; lean_object* x_47; uint8_t x_48; 
+x_46 = lean_ctor_get(x_45, 0);
+lean_inc(x_46);
+x_47 = lean_ctor_get(x_45, 1);
+lean_inc(x_47);
+lean_dec(x_45);
+x_48 = lean_nat_dec_le(x_3, x_3);
 if (x_48 == 0)
 {
-lean_object* x_49; 
+uint8_t x_49; 
+x_49 = lean_nat_dec_lt(x_18, x_3);
+if (x_49 == 0)
+{
+lean_object* x_50; 
 lean_dec(x_46);
-lean_dec(x_44);
-x_49 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_19 = x_49;
-x_20 = x_45;
-goto block_42;
+x_50 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_21 = x_50;
+x_22 = x_47;
+goto block_44;
 }
 else
 {
-size_t x_50; lean_object* x_51; lean_object* x_52; 
-x_50 = lean_usize_of_nat(x_46);
-lean_dec(x_46);
+lean_object* x_51; lean_object* x_52; 
 x_51 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-lean_inc(x_8);
-x_52 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(x_1, x_44, x_2, x_50, x_1, x_51, x_6, x_7, x_8, x_9, x_10, x_11, x_45);
-lean_dec(x_44);
+lean_inc(x_10);
+x_52 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(x_1, x_46, x_2, x_4, x_1, x_51, x_8, x_9, x_10, x_11, x_12, x_13, x_47);
+lean_dec(x_46);
 if (lean_obj_tag(x_52) == 0)
 {
 lean_object* x_53; lean_object* x_54; 
@@ -28293,22 +28273,22 @@ lean_inc(x_53);
 x_54 = lean_ctor_get(x_52, 1);
 lean_inc(x_54);
 lean_dec(x_52);
-x_19 = x_53;
-x_20 = x_54;
-goto block_42;
+x_21 = x_53;
+x_22 = x_54;
+goto block_44;
 }
 else
 {
 uint8_t x_55; 
-lean_dec(x_18);
+lean_dec(x_20);
+lean_dec(x_19);
 lean_dec(x_17);
-lean_dec(x_15);
+lean_dec(x_13);
+lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
 x_55 = !lean_is_exclusive(x_52);
 if (x_55 == 0)
 {
@@ -28333,153 +28313,150 @@ return x_58;
 else
 {
 uint8_t x_59; 
-x_59 = lean_nat_dec_lt(x_16, x_46);
+x_59 = lean_nat_dec_lt(x_18, x_3);
 if (x_59 == 0)
 {
 lean_object* x_60; 
 lean_dec(x_46);
-lean_dec(x_44);
 x_60 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_19 = x_60;
-x_20 = x_45;
-goto block_42;
+x_21 = x_60;
+x_22 = x_47;
+goto block_44;
 }
 else
 {
-size_t x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_usize_of_nat(x_46);
-lean_dec(x_46);
-x_62 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-lean_inc(x_8);
-x_63 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(x_1, x_44, x_2, x_61, x_1, x_62, x_6, x_7, x_8, x_9, x_10, x_11, x_45);
-lean_dec(x_44);
-if (lean_obj_tag(x_63) == 0)
-{
-lean_object* x_64; lean_object* x_65; 
-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_19 = x_64;
-x_20 = x_65;
-goto block_42;
-}
-else
-{
-uint8_t x_66; 
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
-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_66 = !lean_is_exclusive(x_63);
-if (x_66 == 0)
-{
-return x_63;
-}
-else
-{
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_67 = lean_ctor_get(x_63, 0);
-x_68 = lean_ctor_get(x_63, 1);
-lean_inc(x_68);
-lean_inc(x_67);
-lean_dec(x_63);
-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;
-}
-}
-}
-}
-}
-else
-{
-uint8_t x_70; 
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
-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_70 = !lean_is_exclusive(x_43);
-if (x_70 == 0)
-{
-return x_43;
-}
-else
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_71 = lean_ctor_get(x_43, 0);
-x_72 = lean_ctor_get(x_43, 1);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_dec(x_43);
-x_73 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-return x_73;
-}
-}
-block_42:
-{
-lean_object* x_21; lean_object* x_22; size_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
-x_21 = l_Array_reverse___rarg(x_19);
-x_22 = lean_array_get_size(x_21);
-x_23 = lean_usize_of_nat(x_22);
-lean_dec(x_22);
+lean_object* x_61; lean_object* x_62; 
+x_61 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
 lean_inc(x_10);
-x_24 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(x_23, x_1, x_21, x_6, x_7, x_8, x_9, x_10, x_11, x_20);
-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_15, 0);
-lean_inc(x_27);
-x_28 = l_Array_append___rarg(x_18, x_25);
-x_29 = !lean_is_exclusive(x_15);
-if (x_29 == 0)
+x_62 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__7(x_1, x_46, x_2, x_4, x_1, x_61, x_8, x_9, x_10, x_11, x_12, x_13, x_47);
+lean_dec(x_46);
+if (lean_obj_tag(x_62) == 0)
 {
-lean_object* x_30; lean_object* x_31; size_t x_32; size_t x_33; lean_object* x_34; 
-x_30 = lean_ctor_get(x_15, 1);
-lean_dec(x_30);
-x_31 = lean_ctor_get(x_15, 0);
-lean_dec(x_31);
-lean_ctor_set(x_15, 1, x_28);
-x_32 = 1;
-x_33 = lean_usize_add(x_4, x_32);
-x_34 = lean_array_uset(x_17, x_4, x_15);
-x_4 = x_33;
-x_5 = x_34;
-x_12 = x_26;
+lean_object* x_63; lean_object* x_64; 
+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_21 = x_63;
+x_22 = x_64;
+goto block_44;
+}
+else
+{
+uint8_t x_65; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_17);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+x_65 = !lean_is_exclusive(x_62);
+if (x_65 == 0)
+{
+return x_62;
+}
+else
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_66 = lean_ctor_get(x_62, 0);
+x_67 = lean_ctor_get(x_62, 1);
+lean_inc(x_67);
+lean_inc(x_66);
+lean_dec(x_62);
+x_68 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_68, 0, x_66);
+lean_ctor_set(x_68, 1, x_67);
+return x_68;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_69; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_17);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+x_69 = !lean_is_exclusive(x_45);
+if (x_69 == 0)
+{
+return x_45;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_45, 0);
+x_71 = lean_ctor_get(x_45, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_45);
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
+}
+}
+block_44:
+{
+lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_23 = l_Array_reverse___rarg(x_21);
+x_24 = lean_array_get_size(x_23);
+x_25 = lean_usize_of_nat(x_24);
+lean_dec(x_24);
+lean_inc(x_12);
+x_26 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(x_25, x_1, x_23, x_8, x_9, x_10, x_11, x_12, x_13, x_22);
+x_27 = lean_ctor_get(x_26, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+x_29 = lean_ctor_get(x_17, 0);
+lean_inc(x_29);
+x_30 = l_Array_append___rarg(x_20, x_27);
+x_31 = !lean_is_exclusive(x_17);
+if (x_31 == 0)
+{
+lean_object* x_32; lean_object* x_33; size_t x_34; size_t x_35; lean_object* x_36; 
+x_32 = lean_ctor_get(x_17, 1);
+lean_dec(x_32);
+x_33 = lean_ctor_get(x_17, 0);
+lean_dec(x_33);
+lean_ctor_set(x_17, 1, x_30);
+x_34 = 1;
+x_35 = lean_usize_add(x_6, x_34);
+x_36 = lean_array_uset(x_19, x_6, x_17);
+x_6 = x_35;
+x_7 = x_36;
+x_14 = x_28;
 goto _start;
 }
 else
 {
-lean_object* x_36; lean_object* x_37; size_t x_38; size_t x_39; lean_object* x_40; 
-x_36 = lean_ctor_get(x_15, 2);
-lean_inc(x_36);
-lean_dec(x_15);
-x_37 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_37, 0, x_27);
-lean_ctor_set(x_37, 1, x_28);
-lean_ctor_set(x_37, 2, x_36);
-x_38 = 1;
-x_39 = lean_usize_add(x_4, x_38);
-x_40 = lean_array_uset(x_17, x_4, x_37);
-x_4 = x_39;
-x_5 = x_40;
-x_12 = x_26;
+lean_object* x_38; lean_object* x_39; size_t x_40; size_t x_41; lean_object* x_42; 
+x_38 = lean_ctor_get(x_17, 2);
+lean_inc(x_38);
+lean_dec(x_17);
+x_39 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_39, 0, x_29);
+lean_ctor_set(x_39, 1, x_30);
+lean_ctor_set(x_39, 2, x_38);
+x_40 = 1;
+x_41 = lean_usize_add(x_6, x_40);
+x_42 = lean_array_uset(x_19, x_6, x_39);
+x_6 = x_41;
+x_7 = x_42;
+x_14 = x_28;
 goto _start;
 }
 }
@@ -28559,7 +28536,7 @@ size_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_objec
 x_34 = lean_usize_of_nat(x_20);
 lean_dec(x_20);
 x_35 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_36 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(x_19, x_3, x_34, x_35);
+x_36 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(x_19, x_3, x_34, x_35);
 lean_dec(x_19);
 x_37 = l_Array_unzip___rarg(x_36);
 lean_dec(x_36);
@@ -28617,87 +28594,89 @@ _start:
 lean_object* x_12; 
 if (lean_obj_tag(x_4) == 0)
 {
-lean_object* x_125; 
-x_125 = lean_box(0);
-x_12 = x_125;
-goto block_124;
+lean_object* x_131; 
+x_131 = lean_box(0);
+x_12 = x_131;
+goto block_130;
 }
 else
 {
-lean_object* x_126; uint8_t x_127; 
-x_126 = lean_ctor_get(x_4, 0);
-x_127 = lean_unbox(x_126);
-if (x_127 == 0)
+lean_object* x_132; uint8_t x_133; 
+x_132 = lean_ctor_get(x_4, 0);
+x_133 = lean_unbox(x_132);
+if (x_133 == 0)
 {
-lean_object* x_128; uint8_t x_129; lean_object* x_130; lean_object* x_131; 
+lean_object* x_134; uint8_t x_135; lean_object* x_136; lean_object* x_137; 
 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_128 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_129 = 0;
-x_130 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_130, 0, x_1);
-lean_ctor_set(x_130, 1, x_128);
-lean_ctor_set(x_130, 2, x_2);
-lean_ctor_set(x_130, 3, x_3);
-lean_ctor_set_uint8(x_130, sizeof(void*)*4, x_129);
-x_131 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_131, 0, x_130);
-lean_ctor_set(x_131, 1, x_11);
-return x_131;
+x_134 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_135 = 0;
+x_136 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_136, 0, x_1);
+lean_ctor_set(x_136, 1, x_134);
+lean_ctor_set(x_136, 2, x_2);
+lean_ctor_set(x_136, 3, x_3);
+lean_ctor_set_uint8(x_136, sizeof(void*)*4, x_135);
+x_137 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_137, 0, x_136);
+lean_ctor_set(x_137, 1, x_11);
+return x_137;
 }
 else
 {
-lean_object* x_132; 
-x_132 = lean_box(0);
-x_12 = x_132;
-goto block_124;
+lean_object* x_138; 
+x_138 = lean_box(0);
+x_12 = x_138;
+goto block_130;
 }
 }
-block_124:
+block_130:
 {
-lean_object* x_13; uint8_t x_14; lean_object* x_15; 
+lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; 
 lean_dec(x_12);
-x_13 = lean_box(0);
-x_14 = 1;
+x_13 = lean_array_get_size(x_1);
+x_14 = lean_usize_of_nat(x_13);
+x_15 = 0;
+lean_inc(x_1);
+x_16 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(x_14, x_15, x_1);
+x_17 = lean_box(0);
+x_18 = 1;
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_15 = l_Lean_Meta_getFVarsToGeneralize(x_1, x_13, x_14, x_7, x_8, x_9, x_10, x_11);
-if (lean_obj_tag(x_15) == 0)
+x_19 = l_Lean_Meta_getFVarsToGeneralize(x_16, x_17, x_18, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_19) == 0)
 {
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_15);
-if (x_16 == 0)
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_19);
+if (x_20 == 0)
 {
-lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_17 = lean_ctor_get(x_15, 0);
-x_18 = lean_ctor_get(x_15, 1);
-x_19 = l_Array_isEmpty___rarg(x_17);
-if (x_19 == 0)
+lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+x_21 = lean_ctor_get(x_19, 0);
+x_22 = lean_ctor_get(x_19, 1);
+x_23 = l_Array_isEmpty___rarg(x_21);
+if (x_23 == 0)
 {
-lean_object* x_20; size_t 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_free_object(x_15);
-x_20 = lean_array_get_size(x_17);
-x_21 = lean_usize_of_nat(x_20);
-lean_dec(x_20);
-x_22 = 0;
-lean_inc(x_17);
-x_23 = l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(x_21, x_22, x_17);
-x_24 = lean_array_get_size(x_1);
-x_25 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_25, 0, x_24);
-x_26 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
-lean_inc(x_1);
-lean_inc(x_23);
-x_27 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lambda__1___boxed), 12, 3);
-lean_closure_set(x_27, 0, x_23);
-lean_closure_set(x_27, 1, x_1);
-lean_closure_set(x_27, 2, x_26);
+lean_object* x_24; size_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+lean_free_object(x_19);
+x_24 = lean_array_get_size(x_21);
+x_25 = lean_usize_of_nat(x_24);
+lean_dec(x_24);
+lean_inc(x_21);
+x_26 = l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(x_25, x_15, x_21);
+x_27 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_27, 0, x_13);
+x_28 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
+lean_inc(x_26);
+x_29 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lambda__1___boxed), 12, 3);
+lean_closure_set(x_29, 0, x_26);
+lean_closure_set(x_29, 1, x_16);
+lean_closure_set(x_29, 2, x_28);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
@@ -28705,195 +28684,165 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_2);
-x_28 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_addAutoBoundImplicits_x27___spec__2___rarg(x_2, x_25, x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_18);
-if (lean_obj_tag(x_28) == 0)
+x_30 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_addAutoBoundImplicits_x27___spec__2___rarg(x_2, x_27, x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_22);
+if (lean_obj_tag(x_30) == 0)
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_28, 1);
-lean_inc(x_30);
-lean_dec(x_28);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+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);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-lean_inc(x_29);
-x_31 = l_Lean_Meta_isTypeCorrect(x_29, x_7, x_8, x_9, x_10, x_30);
-if (lean_obj_tag(x_31) == 0)
+lean_inc(x_31);
+x_33 = l_Lean_Meta_isTypeCorrect(x_31, x_7, x_8, x_9, x_10, x_32);
+if (lean_obj_tag(x_33) == 0)
 {
-lean_object* x_32; uint8_t x_33; 
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_unbox(x_32);
-lean_dec(x_32);
-if (x_33 == 0)
+lean_object* x_34; uint8_t x_35; 
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_unbox(x_34);
+lean_dec(x_34);
+if (x_35 == 0)
 {
-uint8_t x_34; 
-lean_dec(x_29);
-lean_dec(x_23);
-lean_dec(x_17);
+uint8_t x_36; 
+lean_dec(x_31);
+lean_dec(x_26);
+lean_dec(x_21);
 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_34 = !lean_is_exclusive(x_31);
-if (x_34 == 0)
+x_36 = !lean_is_exclusive(x_33);
+if (x_36 == 0)
 {
-lean_object* x_35; lean_object* x_36; uint8_t x_37; lean_object* x_38; 
-x_35 = lean_ctor_get(x_31, 0);
-lean_dec(x_35);
-x_36 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_37 = 0;
-x_38 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_38, 0, x_1);
-lean_ctor_set(x_38, 1, x_36);
-lean_ctor_set(x_38, 2, x_2);
-lean_ctor_set(x_38, 3, x_3);
-lean_ctor_set_uint8(x_38, sizeof(void*)*4, x_37);
-lean_ctor_set(x_31, 0, x_38);
-return x_31;
+lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; 
+x_37 = lean_ctor_get(x_33, 0);
+lean_dec(x_37);
+x_38 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_39 = 0;
+x_40 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_40, 0, x_1);
+lean_ctor_set(x_40, 1, x_38);
+lean_ctor_set(x_40, 2, x_2);
+lean_ctor_set(x_40, 3, x_3);
+lean_ctor_set_uint8(x_40, sizeof(void*)*4, x_39);
+lean_ctor_set(x_33, 0, x_40);
+return x_33;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; 
-x_39 = lean_ctor_get(x_31, 1);
-lean_inc(x_39);
-lean_dec(x_31);
-x_40 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_41 = 0;
-x_42 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_42, 0, x_1);
-lean_ctor_set(x_42, 1, x_40);
-lean_ctor_set(x_42, 2, x_2);
-lean_ctor_set(x_42, 3, x_3);
-lean_ctor_set_uint8(x_42, sizeof(void*)*4, x_41);
-x_43 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_43, 0, x_42);
-lean_ctor_set(x_43, 1, x_39);
-return x_43;
+lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; 
+x_41 = lean_ctor_get(x_33, 1);
+lean_inc(x_41);
+lean_dec(x_33);
+x_42 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_43 = 0;
+x_44 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_44, 0, x_1);
+lean_ctor_set(x_44, 1, x_42);
+lean_ctor_set(x_44, 2, x_2);
+lean_ctor_set(x_44, 3, x_3);
+lean_ctor_set_uint8(x_44, sizeof(void*)*4, x_43);
+x_45 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_41);
+return x_45;
 }
 }
 else
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; size_t x_47; lean_object* x_48; 
+lean_object* x_46; lean_object* x_47; size_t x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; size_t x_52; lean_object* x_53; 
 lean_dec(x_2);
-x_44 = lean_ctor_get(x_31, 1);
-lean_inc(x_44);
-lean_dec(x_31);
-lean_inc(x_23);
-x_45 = l_Array_append___rarg(x_1, x_23);
-x_46 = lean_array_get_size(x_3);
-x_47 = lean_usize_of_nat(x_46);
-lean_dec(x_46);
-x_48 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(x_22, x_23, x_47, x_22, x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_44);
-lean_dec(x_23);
-if (lean_obj_tag(x_48) == 0)
+x_46 = lean_ctor_get(x_33, 1);
+lean_inc(x_46);
+lean_dec(x_33);
+x_47 = lean_array_get_size(x_26);
+x_48 = lean_usize_of_nat(x_47);
+lean_inc(x_26);
+x_49 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(x_48, x_15, x_26);
+x_50 = l_Array_append___rarg(x_1, x_49);
+x_51 = lean_array_get_size(x_3);
+x_52 = lean_usize_of_nat(x_51);
+lean_dec(x_51);
+x_53 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8(x_15, x_26, x_47, x_48, x_52, x_15, x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_46);
+lean_dec(x_47);
+lean_dec(x_26);
+if (lean_obj_tag(x_53) == 0)
 {
-uint8_t x_49; 
-x_49 = !lean_is_exclusive(x_48);
-if (x_49 == 0)
+uint8_t x_54; 
+x_54 = !lean_is_exclusive(x_53);
+if (x_54 == 0)
 {
-lean_object* x_50; lean_object* x_51; 
-x_50 = lean_ctor_get(x_48, 0);
-x_51 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_51, 0, x_45);
-lean_ctor_set(x_51, 1, x_17);
-lean_ctor_set(x_51, 2, x_29);
-lean_ctor_set(x_51, 3, x_50);
-lean_ctor_set_uint8(x_51, sizeof(void*)*4, x_14);
-lean_ctor_set(x_48, 0, x_51);
-return x_48;
+lean_object* x_55; lean_object* x_56; 
+x_55 = lean_ctor_get(x_53, 0);
+x_56 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_56, 0, x_50);
+lean_ctor_set(x_56, 1, x_21);
+lean_ctor_set(x_56, 2, x_31);
+lean_ctor_set(x_56, 3, x_55);
+lean_ctor_set_uint8(x_56, sizeof(void*)*4, x_18);
+lean_ctor_set(x_53, 0, x_56);
+return x_53;
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_52 = lean_ctor_get(x_48, 0);
-x_53 = lean_ctor_get(x_48, 1);
-lean_inc(x_53);
-lean_inc(x_52);
-lean_dec(x_48);
-x_54 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_54, 0, x_45);
-lean_ctor_set(x_54, 1, x_17);
-lean_ctor_set(x_54, 2, x_29);
-lean_ctor_set(x_54, 3, x_52);
-lean_ctor_set_uint8(x_54, sizeof(void*)*4, x_14);
-x_55 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_53);
-return x_55;
-}
-}
-else
-{
-uint8_t x_56; 
-lean_dec(x_45);
-lean_dec(x_29);
-lean_dec(x_17);
-x_56 = !lean_is_exclusive(x_48);
-if (x_56 == 0)
-{
-return x_48;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_ctor_get(x_48, 0);
-x_58 = lean_ctor_get(x_48, 1);
+lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_57 = lean_ctor_get(x_53, 0);
+x_58 = lean_ctor_get(x_53, 1);
 lean_inc(x_58);
 lean_inc(x_57);
-lean_dec(x_48);
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_57);
-lean_ctor_set(x_59, 1, x_58);
-return x_59;
-}
-}
+lean_dec(x_53);
+x_59 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_59, 0, x_50);
+lean_ctor_set(x_59, 1, x_21);
+lean_ctor_set(x_59, 2, x_31);
+lean_ctor_set(x_59, 3, x_57);
+lean_ctor_set_uint8(x_59, sizeof(void*)*4, x_18);
+x_60 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_60, 0, x_59);
+lean_ctor_set(x_60, 1, x_58);
+return x_60;
 }
 }
 else
 {
-uint8_t x_60; 
-lean_dec(x_29);
-lean_dec(x_23);
-lean_dec(x_17);
-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_60 = !lean_is_exclusive(x_31);
-if (x_60 == 0)
-{
-return x_31;
-}
-else
-{
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_ctor_get(x_31, 0);
-x_62 = lean_ctor_get(x_31, 1);
-lean_inc(x_62);
-lean_inc(x_61);
+uint8_t x_61; 
+lean_dec(x_50);
 lean_dec(x_31);
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_61);
-lean_ctor_set(x_63, 1, x_62);
-return x_63;
+lean_dec(x_21);
+x_61 = !lean_is_exclusive(x_53);
+if (x_61 == 0)
+{
+return x_53;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_53, 0);
+x_63 = lean_ctor_get(x_53, 1);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_dec(x_53);
+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_64; 
-lean_dec(x_23);
-lean_dec(x_17);
+uint8_t x_65; 
+lean_dec(x_31);
+lean_dec(x_26);
+lean_dec(x_21);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -28903,76 +28852,109 @@ lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_64 = !lean_is_exclusive(x_28);
-if (x_64 == 0)
+x_65 = !lean_is_exclusive(x_33);
+if (x_65 == 0)
 {
-return x_28;
+return x_33;
 }
 else
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_65 = lean_ctor_get(x_28, 0);
-x_66 = lean_ctor_get(x_28, 1);
+lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_66 = lean_ctor_get(x_33, 0);
+x_67 = lean_ctor_get(x_33, 1);
+lean_inc(x_67);
 lean_inc(x_66);
-lean_inc(x_65);
-lean_dec(x_28);
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_66);
-return x_67;
+lean_dec(x_33);
+x_68 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_68, 0, x_66);
+lean_ctor_set(x_68, 1, x_67);
+return x_68;
 }
 }
 }
 else
 {
-lean_object* x_68; uint8_t x_69; lean_object* x_70; 
-lean_dec(x_17);
+uint8_t x_69; 
+lean_dec(x_26);
+lean_dec(x_21);
 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_68 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_69 = 0;
-x_70 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_70, 0, x_1);
-lean_ctor_set(x_70, 1, x_68);
-lean_ctor_set(x_70, 2, x_2);
-lean_ctor_set(x_70, 3, x_3);
-lean_ctor_set_uint8(x_70, sizeof(void*)*4, x_69);
-lean_ctor_set(x_15, 0, x_70);
-return x_15;
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_69 = !lean_is_exclusive(x_30);
+if (x_69 == 0)
+{
+return x_30;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_30, 0);
+x_71 = lean_ctor_get(x_30, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_30);
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
+}
 }
 }
 else
 {
-lean_object* x_71; lean_object* x_72; uint8_t x_73; 
-x_71 = lean_ctor_get(x_15, 0);
-x_72 = lean_ctor_get(x_15, 1);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_dec(x_15);
-x_73 = l_Array_isEmpty___rarg(x_71);
-if (x_73 == 0)
+lean_object* x_73; uint8_t x_74; lean_object* x_75; 
+lean_dec(x_21);
+lean_dec(x_16);
+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);
+x_73 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_74 = 0;
+x_75 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_75, 0, x_1);
+lean_ctor_set(x_75, 1, x_73);
+lean_ctor_set(x_75, 2, x_2);
+lean_ctor_set(x_75, 3, x_3);
+lean_ctor_set_uint8(x_75, sizeof(void*)*4, x_74);
+lean_ctor_set(x_19, 0, x_75);
+return x_19;
+}
+}
+else
 {
-lean_object* x_74; size_t x_75; size_t x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_74 = lean_array_get_size(x_71);
-x_75 = lean_usize_of_nat(x_74);
-lean_dec(x_74);
-x_76 = 0;
-lean_inc(x_71);
-x_77 = l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(x_75, x_76, x_71);
-x_78 = lean_array_get_size(x_1);
-x_79 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_79, 0, x_78);
-x_80 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
-lean_inc(x_1);
+lean_object* x_76; lean_object* x_77; uint8_t x_78; 
+x_76 = lean_ctor_get(x_19, 0);
+x_77 = lean_ctor_get(x_19, 1);
 lean_inc(x_77);
-x_81 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lambda__1___boxed), 12, 3);
-lean_closure_set(x_81, 0, x_77);
-lean_closure_set(x_81, 1, x_1);
-lean_closure_set(x_81, 2, x_80);
+lean_inc(x_76);
+lean_dec(x_19);
+x_78 = l_Array_isEmpty___rarg(x_76);
+if (x_78 == 0)
+{
+lean_object* x_79; size_t x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_79 = lean_array_get_size(x_76);
+x_80 = lean_usize_of_nat(x_79);
+lean_dec(x_79);
+lean_inc(x_76);
+x_81 = l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(x_80, x_15, x_76);
+x_82 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_82, 0, x_13);
+x_83 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
+lean_inc(x_81);
+x_84 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lambda__1___boxed), 12, 3);
+lean_closure_set(x_84, 0, x_81);
+lean_closure_set(x_84, 1, x_16);
+lean_closure_set(x_84, 2, x_83);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
@@ -28980,146 +28962,150 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_2);
-x_82 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_addAutoBoundImplicits_x27___spec__2___rarg(x_2, x_79, x_81, x_5, x_6, x_7, x_8, x_9, x_10, x_72);
-if (lean_obj_tag(x_82) == 0)
+x_85 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_addAutoBoundImplicits_x27___spec__2___rarg(x_2, x_82, x_84, x_5, x_6, x_7, x_8, x_9, x_10, x_77);
+if (lean_obj_tag(x_85) == 0)
 {
-lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc(x_83);
-x_84 = lean_ctor_get(x_82, 1);
-lean_inc(x_84);
-lean_dec(x_82);
+lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_86 = lean_ctor_get(x_85, 0);
+lean_inc(x_86);
+x_87 = lean_ctor_get(x_85, 1);
+lean_inc(x_87);
+lean_dec(x_85);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-lean_inc(x_83);
-x_85 = l_Lean_Meta_isTypeCorrect(x_83, x_7, x_8, x_9, x_10, x_84);
-if (lean_obj_tag(x_85) == 0)
-{
-lean_object* x_86; uint8_t x_87; 
-x_86 = lean_ctor_get(x_85, 0);
 lean_inc(x_86);
-x_87 = lean_unbox(x_86);
+x_88 = l_Lean_Meta_isTypeCorrect(x_86, x_7, x_8, x_9, x_10, x_87);
+if (lean_obj_tag(x_88) == 0)
+{
+lean_object* x_89; uint8_t x_90; 
+x_89 = lean_ctor_get(x_88, 0);
+lean_inc(x_89);
+x_90 = lean_unbox(x_89);
+lean_dec(x_89);
+if (x_90 == 0)
+{
+lean_object* x_91; lean_object* x_92; lean_object* x_93; uint8_t x_94; lean_object* x_95; lean_object* x_96; 
 lean_dec(x_86);
-if (x_87 == 0)
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; uint8_t x_91; lean_object* x_92; lean_object* x_93; 
-lean_dec(x_83);
-lean_dec(x_77);
-lean_dec(x_71);
+lean_dec(x_81);
+lean_dec(x_76);
 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_88 = lean_ctor_get(x_85, 1);
-lean_inc(x_88);
-if (lean_is_exclusive(x_85)) {
- lean_ctor_release(x_85, 0);
- lean_ctor_release(x_85, 1);
- x_89 = x_85;
+x_91 = lean_ctor_get(x_88, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_88)) {
+ lean_ctor_release(x_88, 0);
+ lean_ctor_release(x_88, 1);
+ x_92 = x_88;
 } else {
- lean_dec_ref(x_85);
- x_89 = lean_box(0);
+ lean_dec_ref(x_88);
+ x_92 = lean_box(0);
 }
-x_90 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_91 = 0;
-x_92 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_92, 0, x_1);
-lean_ctor_set(x_92, 1, x_90);
-lean_ctor_set(x_92, 2, x_2);
-lean_ctor_set(x_92, 3, x_3);
-lean_ctor_set_uint8(x_92, sizeof(void*)*4, x_91);
-if (lean_is_scalar(x_89)) {
- x_93 = lean_alloc_ctor(0, 2, 0);
+x_93 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_94 = 0;
+x_95 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_95, 0, x_1);
+lean_ctor_set(x_95, 1, x_93);
+lean_ctor_set(x_95, 2, x_2);
+lean_ctor_set(x_95, 3, x_3);
+lean_ctor_set_uint8(x_95, sizeof(void*)*4, x_94);
+if (lean_is_scalar(x_92)) {
+ x_96 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_93 = x_89;
+ x_96 = x_92;
 }
-lean_ctor_set(x_93, 0, x_92);
-lean_ctor_set(x_93, 1, x_88);
-return x_93;
+lean_ctor_set(x_96, 0, x_95);
+lean_ctor_set(x_96, 1, x_91);
+return x_96;
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; size_t x_97; lean_object* x_98; 
+lean_object* x_97; lean_object* x_98; size_t x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; size_t x_103; lean_object* x_104; 
 lean_dec(x_2);
-x_94 = lean_ctor_get(x_85, 1);
-lean_inc(x_94);
-lean_dec(x_85);
-lean_inc(x_77);
-x_95 = l_Array_append___rarg(x_1, x_77);
-x_96 = lean_array_get_size(x_3);
-x_97 = lean_usize_of_nat(x_96);
-lean_dec(x_96);
-x_98 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(x_76, x_77, x_97, x_76, x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_94);
-lean_dec(x_77);
-if (lean_obj_tag(x_98) == 0)
+x_97 = lean_ctor_get(x_88, 1);
+lean_inc(x_97);
+lean_dec(x_88);
+x_98 = lean_array_get_size(x_81);
+x_99 = lean_usize_of_nat(x_98);
+lean_inc(x_81);
+x_100 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(x_99, x_15, x_81);
+x_101 = l_Array_append___rarg(x_1, x_100);
+x_102 = lean_array_get_size(x_3);
+x_103 = lean_usize_of_nat(x_102);
+lean_dec(x_102);
+x_104 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8(x_15, x_81, x_98, x_99, x_103, x_15, x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_97);
+lean_dec(x_98);
+lean_dec(x_81);
+if (lean_obj_tag(x_104) == 0)
 {
-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_ctor_get(x_98, 1);
-lean_inc(x_100);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_101 = x_98;
-} else {
- lean_dec_ref(x_98);
- x_101 = lean_box(0);
-}
-x_102 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_102, 0, x_95);
-lean_ctor_set(x_102, 1, x_71);
-lean_ctor_set(x_102, 2, x_83);
-lean_ctor_set(x_102, 3, x_99);
-lean_ctor_set_uint8(x_102, sizeof(void*)*4, x_14);
-if (lean_is_scalar(x_101)) {
- x_103 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_103 = x_101;
-}
-lean_ctor_set(x_103, 0, x_102);
-lean_ctor_set(x_103, 1, x_100);
-return x_103;
-}
-else
-{
-lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-lean_dec(x_95);
-lean_dec(x_83);
-lean_dec(x_71);
-x_104 = lean_ctor_get(x_98, 0);
-lean_inc(x_104);
-x_105 = lean_ctor_get(x_98, 1);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_105 = lean_ctor_get(x_104, 0);
 lean_inc(x_105);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_106 = x_98;
+x_106 = lean_ctor_get(x_104, 1);
+lean_inc(x_106);
+if (lean_is_exclusive(x_104)) {
+ lean_ctor_release(x_104, 0);
+ lean_ctor_release(x_104, 1);
+ x_107 = x_104;
 } else {
- lean_dec_ref(x_98);
- x_106 = lean_box(0);
+ lean_dec_ref(x_104);
+ x_107 = lean_box(0);
 }
-if (lean_is_scalar(x_106)) {
- x_107 = lean_alloc_ctor(1, 2, 0);
+x_108 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_108, 0, x_101);
+lean_ctor_set(x_108, 1, x_76);
+lean_ctor_set(x_108, 2, x_86);
+lean_ctor_set(x_108, 3, x_105);
+lean_ctor_set_uint8(x_108, sizeof(void*)*4, x_18);
+if (lean_is_scalar(x_107)) {
+ x_109 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_107 = x_106;
+ x_109 = x_107;
 }
-lean_ctor_set(x_107, 0, x_104);
-lean_ctor_set(x_107, 1, x_105);
-return x_107;
+lean_ctor_set(x_109, 0, x_108);
+lean_ctor_set(x_109, 1, x_106);
+return x_109;
+}
+else
+{
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+lean_dec(x_101);
+lean_dec(x_86);
+lean_dec(x_76);
+x_110 = lean_ctor_get(x_104, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_104, 1);
+lean_inc(x_111);
+if (lean_is_exclusive(x_104)) {
+ lean_ctor_release(x_104, 0);
+ lean_ctor_release(x_104, 1);
+ x_112 = x_104;
+} else {
+ lean_dec_ref(x_104);
+ x_112 = lean_box(0);
+}
+if (lean_is_scalar(x_112)) {
+ x_113 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_113 = x_112;
+}
+lean_ctor_set(x_113, 0, x_110);
+lean_ctor_set(x_113, 1, x_111);
+return x_113;
 }
 }
 }
 else
 {
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-lean_dec(x_83);
-lean_dec(x_77);
-lean_dec(x_71);
+lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+lean_dec(x_86);
+lean_dec(x_81);
+lean_dec(x_76);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -29129,33 +29115,96 @@ lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_108 = lean_ctor_get(x_85, 0);
-lean_inc(x_108);
-x_109 = lean_ctor_get(x_85, 1);
-lean_inc(x_109);
+x_114 = lean_ctor_get(x_88, 0);
+lean_inc(x_114);
+x_115 = lean_ctor_get(x_88, 1);
+lean_inc(x_115);
+if (lean_is_exclusive(x_88)) {
+ lean_ctor_release(x_88, 0);
+ lean_ctor_release(x_88, 1);
+ x_116 = x_88;
+} else {
+ lean_dec_ref(x_88);
+ x_116 = lean_box(0);
+}
+if (lean_is_scalar(x_116)) {
+ x_117 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_117 = x_116;
+}
+lean_ctor_set(x_117, 0, x_114);
+lean_ctor_set(x_117, 1, x_115);
+return x_117;
+}
+}
+else
+{
+lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+lean_dec(x_81);
+lean_dec(x_76);
+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_118 = lean_ctor_get(x_85, 0);
+lean_inc(x_118);
+x_119 = lean_ctor_get(x_85, 1);
+lean_inc(x_119);
 if (lean_is_exclusive(x_85)) {
  lean_ctor_release(x_85, 0);
  lean_ctor_release(x_85, 1);
- x_110 = x_85;
+ x_120 = x_85;
 } else {
  lean_dec_ref(x_85);
- x_110 = lean_box(0);
+ x_120 = lean_box(0);
 }
-if (lean_is_scalar(x_110)) {
- x_111 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_120)) {
+ x_121 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_111 = x_110;
+ x_121 = x_120;
 }
-lean_ctor_set(x_111, 0, x_108);
-lean_ctor_set(x_111, 1, x_109);
-return x_111;
+lean_ctor_set(x_121, 0, x_118);
+lean_ctor_set(x_121, 1, x_119);
+return x_121;
 }
 }
 else
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-lean_dec(x_77);
-lean_dec(x_71);
+lean_object* x_122; uint8_t x_123; lean_object* x_124; lean_object* x_125; 
+lean_dec(x_76);
+lean_dec(x_16);
+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);
+x_122 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
+x_123 = 0;
+x_124 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_124, 0, x_1);
+lean_ctor_set(x_124, 1, x_122);
+lean_ctor_set(x_124, 2, x_2);
+lean_ctor_set(x_124, 3, x_3);
+lean_ctor_set_uint8(x_124, sizeof(void*)*4, x_123);
+x_125 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_125, 0, x_124);
+lean_ctor_set(x_125, 1, x_77);
+return x_125;
+}
+}
+}
+else
+{
+uint8_t x_126; 
+lean_dec(x_16);
+lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -29165,88 +29214,41 @@ lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_112 = lean_ctor_get(x_82, 0);
-lean_inc(x_112);
-x_113 = lean_ctor_get(x_82, 1);
-lean_inc(x_113);
-if (lean_is_exclusive(x_82)) {
- lean_ctor_release(x_82, 0);
- lean_ctor_release(x_82, 1);
- x_114 = x_82;
-} else {
- lean_dec_ref(x_82);
- x_114 = lean_box(0);
-}
-if (lean_is_scalar(x_114)) {
- x_115 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_115 = x_114;
-}
-lean_ctor_set(x_115, 0, x_112);
-lean_ctor_set(x_115, 1, x_113);
-return x_115;
-}
+x_126 = !lean_is_exclusive(x_19);
+if (x_126 == 0)
+{
+return x_19;
 }
 else
 {
-lean_object* x_116; uint8_t x_117; lean_object* x_118; lean_object* x_119; 
-lean_dec(x_71);
-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_116 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__15;
-x_117 = 0;
-x_118 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_118, 0, x_1);
-lean_ctor_set(x_118, 1, x_116);
-lean_ctor_set(x_118, 2, x_2);
-lean_ctor_set(x_118, 3, x_3);
-lean_ctor_set_uint8(x_118, sizeof(void*)*4, x_117);
-x_119 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_119, 0, x_118);
-lean_ctor_set(x_119, 1, x_72);
-return x_119;
+lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+x_127 = lean_ctor_get(x_19, 0);
+x_128 = lean_ctor_get(x_19, 1);
+lean_inc(x_128);
+lean_inc(x_127);
+lean_dec(x_19);
+x_129 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_129, 0, x_127);
+lean_ctor_set(x_129, 1, x_128);
+return x_129;
 }
 }
 }
-else
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
 {
-uint8_t x_120; 
-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);
+size_t x_4; size_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_1);
 lean_dec(x_1);
-x_120 = !lean_is_exclusive(x_15);
-if (x_120 == 0)
-{
-return x_15;
-}
-else
-{
-lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-x_121 = lean_ctor_get(x_15, 0);
-x_122 = lean_ctor_get(x_15, 1);
-lean_inc(x_122);
-lean_inc(x_121);
-lean_dec(x_15);
-x_123 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_123, 0, x_121);
-lean_ctor_set(x_123, 1, x_122);
-return x_123;
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(x_4, x_5, x_3);
+return x_6;
 }
 }
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -29254,12 +29256,24 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; size_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(x_4, x_5, x_3);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; uint8_t x_7; lean_object* x_8; 
@@ -29267,14 +29281,14 @@ 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_generalize___spec__2(x_1, x_2, x_5, x_6);
+x_7 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(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_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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; 
@@ -29282,7 +29296,7 @@ x_11 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_12 = lean_unbox_usize(x_2);
 lean_dec(x_2);
-x_13 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(x_11, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_13 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(x_11, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_9);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -29291,11 +29305,11 @@ lean_dec(x_4);
 return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___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) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -29306,7 +29320,7 @@ lean_dec(x_3);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
 size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; 
@@ -29316,7 +29330,7 @@ x_15 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_16 = lean_unbox_usize(x_5);
 lean_dec(x_5);
-x_17 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__4(x_14, x_2, x_3, x_15, x_16, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_17 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(x_14, x_2, x_3, x_15, x_16, 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);
@@ -29327,7 +29341,7 @@ lean_dec(x_2);
 return x_17;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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) {
+LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
 size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; 
@@ -29337,7 +29351,7 @@ x_15 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_16 = lean_unbox_usize(x_5);
 lean_dec(x_5);
-x_17 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__5(x_14, x_2, x_3, x_15, x_16, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_17 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__7(x_14, x_2, x_3, x_15, x_16, 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);
@@ -29348,19 +29362,22 @@ lean_dec(x_2);
 return x_17;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, 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_13; size_t x_14; size_t x_15; lean_object* x_16; 
-x_13 = lean_unbox_usize(x_1);
+size_t x_15; size_t x_16; size_t x_17; size_t x_18; lean_object* x_19; 
+x_15 = lean_unbox_usize(x_1);
 lean_dec(x_1);
-x_14 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_15 = lean_unbox_usize(x_4);
+x_16 = lean_unbox_usize(x_4);
 lean_dec(x_4);
-x_16 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__6(x_13, x_2, x_14, x_15, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+x_17 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_18 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_19 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__8(x_15, x_2, x_3, x_16, x_17, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+lean_dec(x_3);
 lean_dec(x_2);
-return x_16;
+return x_19;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___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) {
@@ -30484,163 +30501,167 @@ lean_dec(x_1);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(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* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, size_t x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-uint8_t x_14; 
-x_14 = lean_usize_dec_lt(x_5, x_4);
-if (x_14 == 0)
+uint8_t x_15; 
+x_15 = lean_usize_dec_lt(x_6, x_5);
+if (x_15 == 0)
 {
-lean_object* x_15; lean_object* x_16; 
+lean_object* x_16; lean_object* x_17; 
+lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
+lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_15 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_15, 0, x_6);
-x_16 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_13);
-return x_16;
+x_16 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_16, 0, x_7);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_16);
+lean_ctor_set(x_17, 1, x_14);
+return x_17;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_17 = lean_array_uget(x_6, x_5);
-x_18 = lean_unsigned_to_nat(0u);
-x_19 = lean_array_uset(x_6, x_5, x_18);
-lean_inc(x_2);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_18 = lean_array_uget(x_7, x_6);
+x_19 = lean_unsigned_to_nat(0u);
+x_20 = lean_array_uset(x_7, x_6, x_19);
+lean_inc(x_3);
 lean_inc(x_1);
-x_20 = l_Array_append___rarg(x_1, x_2);
+x_21 = l_Array_append___rarg(x_1, x_3);
+lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_3);
-x_21 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView(x_17, x_3, x_20, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_21) == 0)
-{
-lean_object* x_22; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
+lean_inc(x_4);
+lean_inc(x_2);
+x_22 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView(x_2, x_18, x_4, x_21, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
 if (lean_obj_tag(x_22) == 0)
 {
-uint8_t x_23; 
-lean_dec(x_19);
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+if (lean_obj_tag(x_23) == 0)
+{
+uint8_t x_24; 
+lean_dec(x_20);
+lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
+lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_23 = !lean_is_exclusive(x_21);
-if (x_23 == 0)
+x_24 = !lean_is_exclusive(x_22);
+if (x_24 == 0)
 {
-lean_object* x_24; uint8_t x_25; 
-x_24 = lean_ctor_get(x_21, 0);
-lean_dec(x_24);
-x_25 = !lean_is_exclusive(x_22);
-if (x_25 == 0)
+lean_object* x_25; uint8_t x_26; 
+x_25 = lean_ctor_get(x_22, 0);
+lean_dec(x_25);
+x_26 = !lean_is_exclusive(x_23);
+if (x_26 == 0)
 {
-return x_21;
+return x_22;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; 
-x_26 = lean_ctor_get(x_22, 0);
-lean_inc(x_26);
-lean_dec(x_22);
-x_27 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_21, 0, x_27);
-return x_21;
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_ctor_get(x_23, 0);
+lean_inc(x_27);
+lean_dec(x_23);
+x_28 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_22, 0, x_28);
+return x_22;
 }
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_28 = lean_ctor_get(x_21, 1);
-lean_inc(x_28);
-lean_dec(x_21);
-x_29 = lean_ctor_get(x_22, 0);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_29 = lean_ctor_get(x_22, 1);
 lean_inc(x_29);
-if (lean_is_exclusive(x_22)) {
- lean_ctor_release(x_22, 0);
- x_30 = x_22;
+lean_dec(x_22);
+x_30 = lean_ctor_get(x_23, 0);
+lean_inc(x_30);
+if (lean_is_exclusive(x_23)) {
+ lean_ctor_release(x_23, 0);
+ x_31 = x_23;
 } else {
- lean_dec_ref(x_22);
- x_30 = lean_box(0);
+ lean_dec_ref(x_23);
+ x_31 = lean_box(0);
 }
-if (lean_is_scalar(x_30)) {
- x_31 = lean_alloc_ctor(0, 1, 0);
+if (lean_is_scalar(x_31)) {
+ x_32 = lean_alloc_ctor(0, 1, 0);
 } else {
- x_31 = x_30;
+ x_32 = x_31;
 }
-lean_ctor_set(x_31, 0, x_29);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_32, 1, x_28);
-return x_32;
+lean_ctor_set(x_32, 0, x_30);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_33, 1, x_29);
+return x_33;
 }
 }
 else
 {
-lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; lean_object* x_37; 
-x_33 = lean_ctor_get(x_21, 1);
-lean_inc(x_33);
-lean_dec(x_21);
-x_34 = lean_ctor_get(x_22, 0);
+lean_object* x_34; lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; 
+x_34 = lean_ctor_get(x_22, 1);
 lean_inc(x_34);
 lean_dec(x_22);
-x_35 = 1;
-x_36 = lean_usize_add(x_5, x_35);
-x_37 = lean_array_uset(x_19, x_5, x_34);
-x_5 = x_36;
+x_35 = lean_ctor_get(x_23, 0);
+lean_inc(x_35);
+lean_dec(x_23);
+x_36 = 1;
+x_37 = lean_usize_add(x_6, x_36);
+x_38 = lean_array_uset(x_20, x_6, x_35);
 x_6 = x_37;
-x_13 = x_33;
+x_7 = x_38;
+x_14 = x_34;
 goto _start;
 }
 }
 else
 {
-uint8_t x_39; 
-lean_dec(x_19);
+uint8_t x_40; 
+lean_dec(x_20);
+lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
+lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_39 = !lean_is_exclusive(x_21);
-if (x_39 == 0)
+x_40 = !lean_is_exclusive(x_22);
+if (x_40 == 0)
 {
-return x_21;
+return x_22;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_40 = lean_ctor_get(x_21, 0);
-x_41 = lean_ctor_get(x_21, 1);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_ctor_get(x_22, 0);
+x_42 = lean_ctor_get(x_22, 1);
+lean_inc(x_42);
 lean_inc(x_41);
-lean_inc(x_40);
-lean_dec(x_21);
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_40);
-lean_ctor_set(x_42, 1, x_41);
-return x_42;
+lean_dec(x_22);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
 }
 }
 }
@@ -30745,7 +30766,7 @@ x_35 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_e
 x_36 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_36, 0, x_31);
 lean_ctor_set(x_36, 1, x_35);
-x_37 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
+x_37 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5;
 x_38 = lean_array_push(x_37, x_36);
 x_39 = lean_array_push(x_38, x_29);
 x_40 = lean_box(2);
@@ -30947,109 +30968,112 @@ uint8_t x_12;
 x_12 = lean_usize_dec_eq(x_3, x_4);
 if (x_12 == 0)
 {
-lean_object* x_13; lean_object* x_14; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
 x_13 = lean_array_uget(x_2, x_3);
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+lean_dec(x_13);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_1);
-x_14 = l_Lean_Meta_isExprDefEq(x_13, x_1, x_7, x_8, x_9, x_10, x_11);
-if (lean_obj_tag(x_14) == 0)
+x_15 = l_Lean_Meta_isExprDefEq(x_14, x_1, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_15) == 0)
 {
-lean_object* x_15; uint8_t x_16; 
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_unbox(x_15);
+lean_object* x_16; uint8_t x_17; 
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+x_17 = lean_unbox(x_16);
+lean_dec(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; size_t x_19; size_t x_20; 
+x_18 = lean_ctor_get(x_15, 1);
+lean_inc(x_18);
 lean_dec(x_15);
-if (x_16 == 0)
-{
-lean_object* x_17; size_t x_18; size_t x_19; 
-x_17 = lean_ctor_get(x_14, 1);
-lean_inc(x_17);
-lean_dec(x_14);
-x_18 = 1;
-x_19 = lean_usize_add(x_3, x_18);
-x_3 = x_19;
-x_11 = x_17;
+x_19 = 1;
+x_20 = lean_usize_add(x_3, x_19);
+x_3 = x_20;
+x_11 = x_18;
 goto _start;
 }
 else
 {
-uint8_t x_21; 
+uint8_t x_22; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_21 = !lean_is_exclusive(x_14);
-if (x_21 == 0)
+x_22 = !lean_is_exclusive(x_15);
+if (x_22 == 0)
 {
-lean_object* x_22; uint8_t x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_14, 0);
-lean_dec(x_22);
-x_23 = 1;
-x_24 = lean_box(x_23);
-lean_ctor_set(x_14, 0, x_24);
-return x_14;
+lean_object* x_23; uint8_t x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_15, 0);
+lean_dec(x_23);
+x_24 = 1;
+x_25 = lean_box(x_24);
+lean_ctor_set(x_15, 0, x_25);
+return x_15;
 }
 else
 {
-lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; 
-x_25 = lean_ctor_get(x_14, 1);
-lean_inc(x_25);
-lean_dec(x_14);
-x_26 = 1;
-x_27 = lean_box(x_26);
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_27);
-lean_ctor_set(x_28, 1, x_25);
-return x_28;
+lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; 
+x_26 = lean_ctor_get(x_15, 1);
+lean_inc(x_26);
+lean_dec(x_15);
+x_27 = 1;
+x_28 = lean_box(x_27);
+x_29 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_26);
+return x_29;
 }
 }
 }
 else
 {
-uint8_t x_29; 
+uint8_t x_30; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_29 = !lean_is_exclusive(x_14);
-if (x_29 == 0)
+x_30 = !lean_is_exclusive(x_15);
+if (x_30 == 0)
 {
-return x_14;
+return x_15;
 }
 else
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_30 = lean_ctor_get(x_14, 0);
-x_31 = lean_ctor_get(x_14, 1);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_15, 0);
+x_32 = lean_ctor_get(x_15, 1);
+lean_inc(x_32);
 lean_inc(x_31);
-lean_inc(x_30);
-lean_dec(x_14);
-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_dec(x_15);
+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;
 }
 }
 }
 else
 {
-uint8_t x_33; lean_object* x_34; lean_object* x_35; 
+uint8_t x_34; lean_object* x_35; lean_object* x_36; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_33 = 0;
-x_34 = lean_box(x_33);
-x_35 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_11);
-return x_35;
+x_34 = 0;
+x_35 = lean_box(x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_11);
+return x_36;
 }
 }
 }
@@ -31066,7 +31090,7 @@ lean_inc(x_1);
 x_20 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__2(x_2, x_19, x_3, x_1, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
 if (lean_obj_tag(x_20) == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_21 = lean_ctor_get(x_20, 0);
 lean_inc(x_21);
 x_22 = lean_ctor_get(x_20, 1);
@@ -31077,19 +31101,20 @@ x_24 = lean_usize_of_nat(x_23);
 lean_dec(x_23);
 x_25 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__3(x_21, x_24, x_3, x_4);
 lean_inc(x_1);
-x_26 = l_Array_append___rarg(x_1, x_5);
-x_27 = lean_unsigned_to_nat(0u);
-x_28 = l_Array_filterMapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__4(x_1, x_27, x_18);
+x_26 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3(x_19, x_3, x_1);
+x_27 = l_Array_append___rarg(x_26, x_5);
+x_28 = lean_unsigned_to_nat(0u);
+x_29 = l_Array_filterMapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__4(x_1, x_28, x_18);
 lean_dec(x_1);
-x_29 = l_Array_append___rarg(x_6, x_28);
-x_30 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_30, 0, x_7);
-x_31 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop(x_8, x_26, x_29, x_9, x_25, x_30, x_11, x_12, x_13, x_14, x_15, x_16, x_22);
-return x_31;
+x_30 = l_Array_append___rarg(x_6, x_29);
+x_31 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_31, 0, x_7);
+x_32 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop(x_8, x_27, x_30, x_9, x_25, x_31, x_11, x_12, x_13, x_14, x_15, x_16, x_22);
+return x_32;
 }
 else
 {
-uint8_t x_32; 
+uint8_t x_33; 
 lean_dec(x_18);
 lean_dec(x_16);
 lean_dec(x_15);
@@ -31104,23 +31129,23 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_32 = !lean_is_exclusive(x_20);
-if (x_32 == 0)
+x_33 = !lean_is_exclusive(x_20);
+if (x_33 == 0)
 {
 return x_20;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = lean_ctor_get(x_20, 0);
-x_34 = lean_ctor_get(x_20, 1);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = lean_ctor_get(x_20, 0);
+x_35 = lean_ctor_get(x_20, 1);
+lean_inc(x_35);
 lean_inc(x_34);
-lean_inc(x_33);
 lean_dec(x_20);
-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;
+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;
 }
 }
 }
@@ -31225,43 +31250,35 @@ return x_33;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
 _start:
 {
-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_dec(x_12);
-x_20 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(x_1, x_2, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; size_t x_29; lean_object* x_30; lean_object* x_31; 
+lean_dec(x_13);
+x_21 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(x_1, x_2, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
 lean_dec(x_1);
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
+x_22 = lean_ctor_get(x_21, 0);
 lean_inc(x_22);
-lean_dec(x_20);
-x_23 = 1;
-x_24 = l_Lean_Elab_Term_SavedState_restore(x_3, x_23, x_13, x_14, x_15, x_16, x_17, x_18, x_22);
-x_25 = lean_ctor_get(x_24, 1);
-lean_inc(x_25);
-lean_dec(x_24);
-x_26 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__19;
-x_27 = lean_array_push(x_26, x_4);
+x_23 = lean_ctor_get(x_21, 1);
+lean_inc(x_23);
+lean_dec(x_21);
+x_24 = 1;
+x_25 = l_Lean_Elab_Term_SavedState_restore(x_3, x_24, x_14, x_15, x_16, x_17, x_18, x_19, x_23);
+x_26 = lean_ctor_get(x_25, 1);
+lean_inc(x_26);
+lean_dec(x_25);
+x_27 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__19;
+x_28 = lean_array_push(x_27, x_4);
+x_29 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+lean_inc(x_7);
+x_30 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(x_29, x_6, x_7);
+lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
-lean_inc(x_15);
-x_28 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps(x_27, x_5, x_13, x_14, x_15, x_16, x_17, x_18, x_25);
-if (lean_obj_tag(x_28) == 0)
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_28, 1);
-lean_inc(x_30);
-lean_dec(x_28);
-lean_inc(x_18);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
-x_31 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType(x_29, x_11, x_13, x_14, x_15, x_16, x_17, x_18, x_30);
+x_31 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps(x_28, x_30, x_14, x_15, x_16, x_17, x_18, x_19, x_26);
+lean_dec(x_30);
 if (lean_obj_tag(x_31) == 0)
 {
 lean_object* x_32; lean_object* x_33; lean_object* x_34; 
@@ -31270,81 +31287,94 @@ lean_inc(x_32);
 x_33 = lean_ctor_get(x_31, 1);
 lean_inc(x_33);
 lean_dec(x_31);
-x_34 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__2(x_29, x_6, x_7, x_5, x_8, x_21, x_9, x_10, x_32, x_13, x_14, x_15, x_16, x_17, x_18, x_33);
-return x_34;
-}
-else
+lean_inc(x_19);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_inc(x_16);
+x_34 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType(x_32, x_12, x_14, x_15, x_16, x_17, x_18, x_19, x_33);
+if (lean_obj_tag(x_34) == 0)
 {
-lean_object* x_35; lean_object* x_36; uint8_t x_37; 
-lean_dec(x_29);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_5);
-x_35 = lean_ctor_get(x_31, 1);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_34, 0);
 lean_inc(x_35);
-lean_dec(x_31);
-x_36 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(x_21, x_13, x_14, x_15, x_16, x_17, x_18, x_35);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-x_37 = !lean_is_exclusive(x_36);
-if (x_37 == 0)
-{
-return x_36;
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
+lean_dec(x_34);
+x_37 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__2(x_32, x_6, x_8, x_7, x_9, x_22, x_10, x_11, x_35, x_14, x_15, x_16, x_17, x_18, x_19, x_36);
+return x_37;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_36, 0);
-x_39 = lean_ctor_get(x_36, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_36);
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
-}
-}
-}
-else
-{
-uint8_t x_41; 
-lean_dec(x_21);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
+lean_object* x_38; lean_object* x_39; uint8_t x_40; 
+lean_dec(x_32);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-lean_dec(x_5);
-x_41 = !lean_is_exclusive(x_28);
-if (x_41 == 0)
+x_38 = lean_ctor_get(x_34, 1);
+lean_inc(x_38);
+lean_dec(x_34);
+x_39 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(x_22, x_14, x_15, x_16, x_17, x_18, x_19, x_38);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+x_40 = !lean_is_exclusive(x_39);
+if (x_40 == 0)
 {
-return x_28;
+return x_39;
 }
 else
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_28, 0);
-x_43 = lean_ctor_get(x_28, 1);
-lean_inc(x_43);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_ctor_get(x_39, 0);
+x_42 = lean_ctor_get(x_39, 1);
 lean_inc(x_42);
-lean_dec(x_28);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_inc(x_41);
+lean_dec(x_39);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
+}
+}
+}
+else
+{
+uint8_t x_44; 
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_44 = !lean_is_exclusive(x_31);
+if (x_44 == 0)
+{
+return x_31;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_45 = lean_ctor_get(x_31, 0);
+x_46 = lean_ctor_get(x_31, 1);
+lean_inc(x_46);
+lean_inc(x_45);
+lean_dec(x_31);
+x_47 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_47, 0, x_45);
+lean_ctor_set(x_47, 1, x_46);
+return x_47;
 }
 }
 }
@@ -31360,7 +31390,6 @@ x_22 = lean_nat_dec_lt(x_21, x_20);
 if (x_22 == 0)
 {
 uint8_t x_36; 
-lean_dec(x_20);
 x_36 = 0;
 x_23 = x_36;
 x_24 = x_19;
@@ -31373,7 +31402,6 @@ x_37 = lean_nat_dec_le(x_20, x_20);
 if (x_37 == 0)
 {
 uint8_t x_38; 
-lean_dec(x_20);
 x_38 = 0;
 x_23 = x_38;
 x_24 = x_19;
@@ -31383,7 +31411,6 @@ else
 {
 size_t x_39; lean_object* x_40; 
 x_39 = lean_usize_of_nat(x_20);
-lean_dec(x_20);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
@@ -31407,6 +31434,7 @@ goto block_35;
 else
 {
 uint8_t x_44; 
+lean_dec(x_20);
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
@@ -31450,12 +31478,13 @@ if (x_23 == 0)
 {
 lean_object* x_25; lean_object* x_26; 
 x_25 = lean_box(0);
-x_26 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(x_2, x_3, x_4, x_5, x_1, x_6, x_7, x_8, x_9, x_10, x_11, x_25, x_13, x_14, x_15, x_16, x_17, x_18, x_24);
+x_26 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(x_2, x_3, x_4, x_5, x_20, x_6, x_1, x_7, x_8, x_9, x_10, x_11, x_25, x_13, x_14, x_15, x_16, x_17, x_18, x_24);
 return x_26;
 }
 else
 {
 lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+lean_dec(x_20);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -31566,8 +31595,9 @@ lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_22);
+lean_inc(x_20);
 lean_inc(x_3);
-x_28 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(x_3, x_21, x_22, x_26, x_27, x_23, x_7, x_8, x_9, x_10, x_11, x_12, x_19);
+x_28 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(x_3, x_20, x_21, x_22, x_26, x_27, x_23, x_7, x_8, x_9, x_10, x_11, x_12, x_19);
 if (lean_obj_tag(x_28) == 0)
 {
 lean_object* x_29; 
@@ -31575,7 +31605,7 @@ x_29 = lean_ctor_get(x_28, 0);
 lean_inc(x_29);
 if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 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_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 lean_dec(x_22);
 lean_dec(x_20);
 x_30 = lean_ctor_get(x_29, 0);
@@ -31598,23 +31628,26 @@ lean_inc(x_36);
 x_37 = lean_ctor_get(x_35, 1);
 lean_inc(x_37);
 lean_dec(x_35);
-x_38 = l_Lean_instInhabitedExpr;
+x_38 = l_Lean_Elab_Term_instInhabitedDiscr;
 x_39 = lean_array_get(x_38, x_2, x_33);
 lean_dec(x_33);
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+lean_dec(x_39);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_40 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndexToInclude_x3f(x_39, x_34, x_7, x_8, x_9, x_10, x_11, x_12, x_37);
+x_41 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndexToInclude_x3f(x_40, x_34, x_7, x_8, x_9, x_10, x_11, x_12, x_37);
 lean_dec(x_34);
-if (lean_obj_tag(x_40) == 0)
-{
-lean_object* x_41; 
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
 if (lean_obj_tag(x_41) == 0)
 {
-lean_object* x_42; lean_object* x_43; 
+lean_object* x_42; 
+x_42 = lean_ctor_get(x_41, 0);
+lean_inc(x_42);
+if (lean_obj_tag(x_42) == 0)
+{
+lean_object* x_43; lean_object* x_44; 
 lean_dec(x_32);
 lean_dec(x_15);
 lean_dec(x_6);
@@ -31623,104 +31656,104 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-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_throwEx___rarg(x_36, x_7, x_8, x_9, x_10, x_11, x_12, x_42);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(x_36, x_7, x_8, x_9, x_10, x_11, x_12, x_43);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-return x_43;
+return x_44;
 }
 else
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
+lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_62; lean_object* x_63; lean_object* x_64; uint8_t x_65; 
 lean_dec(x_36);
-x_44 = lean_ctor_get(x_40, 1);
-lean_inc(x_44);
-lean_dec(x_40);
-x_45 = lean_ctor_get(x_41, 0);
+x_45 = lean_ctor_get(x_41, 1);
 lean_inc(x_45);
 lean_dec(x_41);
-x_46 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__8;
-x_61 = lean_st_ref_get(x_12, x_44);
-x_62 = lean_ctor_get(x_61, 0);
-lean_inc(x_62);
-x_63 = lean_ctor_get(x_62, 3);
+x_46 = lean_ctor_get(x_42, 0);
+lean_inc(x_46);
+lean_dec(x_42);
+x_47 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__8;
+x_62 = lean_st_ref_get(x_12, x_45);
+x_63 = lean_ctor_get(x_62, 0);
 lean_inc(x_63);
-lean_dec(x_62);
-x_64 = lean_ctor_get_uint8(x_63, sizeof(void*)*1);
+x_64 = lean_ctor_get(x_63, 3);
+lean_inc(x_64);
 lean_dec(x_63);
-if (x_64 == 0)
+x_65 = lean_ctor_get_uint8(x_64, sizeof(void*)*1);
+lean_dec(x_64);
+if (x_65 == 0)
 {
-lean_object* x_65; uint8_t x_66; 
-x_65 = lean_ctor_get(x_61, 1);
-lean_inc(x_65);
-lean_dec(x_61);
-x_66 = 0;
-x_47 = x_66;
-x_48 = x_65;
-goto block_60;
+lean_object* x_66; uint8_t x_67; 
+x_66 = lean_ctor_get(x_62, 1);
+lean_inc(x_66);
+lean_dec(x_62);
+x_67 = 0;
+x_48 = x_67;
+x_49 = x_66;
+goto block_61;
 }
 else
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; uint8_t x_71; 
-x_67 = lean_ctor_get(x_61, 1);
-lean_inc(x_67);
-lean_dec(x_61);
-x_68 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_46, x_7, x_8, x_9, x_10, x_11, x_12, x_67);
-x_69 = lean_ctor_get(x_68, 0);
-lean_inc(x_69);
-x_70 = lean_ctor_get(x_68, 1);
+lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; uint8_t x_72; 
+x_68 = lean_ctor_get(x_62, 1);
+lean_inc(x_68);
+lean_dec(x_62);
+x_69 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_47, x_7, x_8, x_9, x_10, x_11, x_12, x_68);
+x_70 = lean_ctor_get(x_69, 0);
 lean_inc(x_70);
-lean_dec(x_68);
-x_71 = lean_unbox(x_69);
+x_71 = lean_ctor_get(x_69, 1);
+lean_inc(x_71);
 lean_dec(x_69);
-x_47 = x_71;
-x_48 = x_70;
-goto block_60;
+x_72 = lean_unbox(x_70);
+lean_dec(x_70);
+x_48 = x_72;
+x_49 = x_71;
+goto block_61;
 }
-block_60:
+block_61:
 {
-if (x_47 == 0)
+if (x_48 == 0)
 {
-lean_object* x_49; lean_object* x_50; 
-x_49 = lean_box(0);
-x_50 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__4(x_2, x_6, x_32, x_15, x_45, x_27, x_5, x_3, x_1, x_46, x_4, x_49, x_7, x_8, x_9, x_10, x_11, x_12, x_48);
-return x_50;
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_box(0);
+x_51 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__4(x_2, x_6, x_32, x_15, x_46, x_27, x_5, x_3, x_1, x_47, x_4, x_50, x_7, x_8, x_9, x_10, x_11, x_12, x_49);
+return x_51;
 }
 else
 {
-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_inc(x_45);
-x_51 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_51, 0, x_45);
-x_52 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2;
-x_53 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_53, 0, x_52);
-lean_ctor_set(x_53, 1, x_51);
-x_54 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
-x_55 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_55, 0, x_53);
-lean_ctor_set(x_55, 1, x_54);
-x_56 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_46, x_55, x_7, x_8, x_9, x_10, x_11, x_12, x_48);
-x_57 = lean_ctor_get(x_56, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_56, 1);
+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_inc(x_46);
+x_52 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_52, 0, x_46);
+x_53 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2;
+x_54 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_54, 1, x_52);
+x_55 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
+x_56 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_56, 0, x_54);
+lean_ctor_set(x_56, 1, x_55);
+x_57 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_47, x_56, x_7, x_8, x_9, x_10, x_11, x_12, x_49);
+x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
-lean_dec(x_56);
-x_59 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__4(x_2, x_6, x_32, x_15, x_45, x_27, x_5, x_3, x_1, x_46, x_4, x_57, x_7, x_8, x_9, x_10, x_11, x_12, x_58);
-return x_59;
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
+lean_dec(x_57);
+x_60 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__4(x_2, x_6, x_32, x_15, x_46, x_27, x_5, x_3, x_1, x_47, x_4, x_58, x_7, x_8, x_9, x_10, x_11, x_12, x_59);
+return x_60;
 }
 }
 }
 }
 else
 {
-uint8_t x_72; 
+uint8_t x_73; 
 lean_dec(x_36);
 lean_dec(x_32);
 lean_dec(x_15);
@@ -31736,23 +31769,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_72 = !lean_is_exclusive(x_40);
-if (x_72 == 0)
+x_73 = !lean_is_exclusive(x_41);
+if (x_73 == 0)
 {
-return x_40;
+return x_41;
 }
 else
 {
-lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-x_73 = lean_ctor_get(x_40, 0);
-x_74 = lean_ctor_get(x_40, 1);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_41, 0);
+x_75 = lean_ctor_get(x_41, 1);
+lean_inc(x_75);
 lean_inc(x_74);
-lean_inc(x_73);
-lean_dec(x_40);
-x_75 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_75, 0, x_73);
-lean_ctor_set(x_75, 1, x_74);
-return x_75;
+lean_dec(x_41);
+x_76 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_76, 0, x_74);
+lean_ctor_set(x_76, 1, x_75);
+return x_76;
 }
 }
 }
@@ -31772,112 +31805,112 @@ lean_dec(x_2);
 lean_dec(x_1);
 if (lean_obj_tag(x_6) == 0)
 {
-uint8_t x_76; 
-x_76 = !lean_is_exclusive(x_28);
-if (x_76 == 0)
+uint8_t x_77; 
+x_77 = !lean_is_exclusive(x_28);
+if (x_77 == 0)
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_77 = lean_ctor_get(x_28, 0);
-lean_dec(x_77);
-x_78 = lean_ctor_get(x_29, 0);
-lean_inc(x_78);
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_78 = lean_ctor_get(x_28, 0);
+lean_dec(x_78);
+x_79 = lean_ctor_get(x_29, 0);
+lean_inc(x_79);
 lean_dec(x_29);
-x_79 = lean_box(x_24);
-x_80 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_80, 0, x_78);
-lean_ctor_set(x_80, 1, x_79);
+x_80 = lean_box(x_24);
 x_81 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_81, 0, x_22);
+lean_ctor_set(x_81, 0, x_79);
 lean_ctor_set(x_81, 1, x_80);
 x_82 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_82, 0, x_20);
+lean_ctor_set(x_82, 0, x_22);
 lean_ctor_set(x_82, 1, x_81);
-lean_ctor_set(x_28, 0, x_82);
+x_83 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_83, 0, x_20);
+lean_ctor_set(x_83, 1, x_82);
+lean_ctor_set(x_28, 0, x_83);
 return x_28;
 }
 else
 {
-lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_83 = lean_ctor_get(x_28, 1);
-lean_inc(x_83);
-lean_dec(x_28);
-x_84 = lean_ctor_get(x_29, 0);
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_84 = lean_ctor_get(x_28, 1);
 lean_inc(x_84);
+lean_dec(x_28);
+x_85 = lean_ctor_get(x_29, 0);
+lean_inc(x_85);
 lean_dec(x_29);
-x_85 = lean_box(x_24);
-x_86 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_86, 0, x_84);
-lean_ctor_set(x_86, 1, x_85);
+x_86 = lean_box(x_24);
 x_87 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_87, 0, x_22);
+lean_ctor_set(x_87, 0, x_85);
 lean_ctor_set(x_87, 1, x_86);
 x_88 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_88, 0, x_20);
+lean_ctor_set(x_88, 0, x_22);
 lean_ctor_set(x_88, 1, x_87);
 x_89 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_89, 0, x_88);
-lean_ctor_set(x_89, 1, x_83);
-return x_89;
+lean_ctor_set(x_89, 0, x_20);
+lean_ctor_set(x_89, 1, x_88);
+x_90 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_90, 0, x_89);
+lean_ctor_set(x_90, 1, x_84);
+return x_90;
 }
 }
 else
 {
-uint8_t x_90; 
+uint8_t x_91; 
 lean_dec(x_6);
-x_90 = !lean_is_exclusive(x_28);
-if (x_90 == 0)
+x_91 = !lean_is_exclusive(x_28);
+if (x_91 == 0)
 {
-lean_object* x_91; lean_object* x_92; uint8_t x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_91 = lean_ctor_get(x_28, 0);
-lean_dec(x_91);
-x_92 = lean_ctor_get(x_29, 0);
-lean_inc(x_92);
+lean_object* x_92; lean_object* x_93; uint8_t x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_92 = lean_ctor_get(x_28, 0);
+lean_dec(x_92);
+x_93 = lean_ctor_get(x_29, 0);
+lean_inc(x_93);
 lean_dec(x_29);
-x_93 = 1;
-x_94 = lean_box(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_94 = 1;
+x_95 = lean_box(x_94);
 x_96 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_96, 0, x_22);
+lean_ctor_set(x_96, 0, x_93);
 lean_ctor_set(x_96, 1, x_95);
 x_97 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_97, 0, x_20);
+lean_ctor_set(x_97, 0, x_22);
 lean_ctor_set(x_97, 1, x_96);
-lean_ctor_set(x_28, 0, x_97);
+x_98 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_98, 0, x_20);
+lean_ctor_set(x_98, 1, x_97);
+lean_ctor_set(x_28, 0, x_98);
 return x_28;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; uint8_t x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; 
-x_98 = lean_ctor_get(x_28, 1);
-lean_inc(x_98);
-lean_dec(x_28);
-x_99 = lean_ctor_get(x_29, 0);
+lean_object* x_99; lean_object* x_100; uint8_t x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+x_99 = lean_ctor_get(x_28, 1);
 lean_inc(x_99);
+lean_dec(x_28);
+x_100 = lean_ctor_get(x_29, 0);
+lean_inc(x_100);
 lean_dec(x_29);
-x_100 = 1;
-x_101 = lean_box(x_100);
-x_102 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_102, 0, x_99);
-lean_ctor_set(x_102, 1, x_101);
+x_101 = 1;
+x_102 = lean_box(x_101);
 x_103 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_103, 0, x_22);
+lean_ctor_set(x_103, 0, x_100);
 lean_ctor_set(x_103, 1, x_102);
 x_104 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_104, 0, x_20);
+lean_ctor_set(x_104, 0, x_22);
 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_98);
-return x_105;
+lean_ctor_set(x_105, 0, x_20);
+lean_ctor_set(x_105, 1, x_104);
+x_106 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_106, 0, x_105);
+lean_ctor_set(x_106, 1, x_99);
+return x_106;
 }
 }
 }
 }
 else
 {
-uint8_t x_106; 
+uint8_t x_107; 
 lean_dec(x_22);
 lean_dec(x_20);
 lean_dec(x_15);
@@ -31893,29 +31926,29 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_106 = !lean_is_exclusive(x_28);
-if (x_106 == 0)
+x_107 = !lean_is_exclusive(x_28);
+if (x_107 == 0)
 {
 return x_28;
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_28, 0);
-x_108 = lean_ctor_get(x_28, 1);
+lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_108 = lean_ctor_get(x_28, 0);
+x_109 = lean_ctor_get(x_28, 1);
+lean_inc(x_109);
 lean_inc(x_108);
-lean_inc(x_107);
 lean_dec(x_28);
-x_109 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_109, 0, x_107);
-lean_ctor_set(x_109, 1, x_108);
-return x_109;
+x_110 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_110, 0, x_108);
+lean_ctor_set(x_110, 1, x_109);
+return x_110;
 }
 }
 }
 else
 {
-uint8_t x_110; 
+uint8_t x_111; 
 lean_dec(x_15);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -31929,37 +31962,37 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_110 = !lean_is_exclusive(x_17);
-if (x_110 == 0)
+x_111 = !lean_is_exclusive(x_17);
+if (x_111 == 0)
 {
 return x_17;
 }
 else
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_17, 0);
-x_112 = lean_ctor_get(x_17, 1);
+lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+x_112 = lean_ctor_get(x_17, 0);
+x_113 = lean_ctor_get(x_17, 1);
+lean_inc(x_113);
 lean_inc(x_112);
-lean_inc(x_111);
 lean_dec(x_17);
-x_113 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_113, 0, x_111);
-lean_ctor_set(x_113, 1, x_112);
-return x_113;
+x_114 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_114, 0, x_112);
+lean_ctor_set(x_114, 1, x_113);
+return x_114;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-size_t x_14; size_t x_15; lean_object* x_16; 
-x_14 = lean_unbox_usize(x_4);
-lean_dec(x_4);
+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 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(x_1, x_2, x_3, x_14, x_15, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_16;
+x_16 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_17 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__1(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);
+return x_17;
 }
 }
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
@@ -32084,13 +32117,14 @@ lean_object* x_16 = _args[15];
 lean_object* x_17 = _args[16];
 lean_object* x_18 = _args[17];
 lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
 _start:
 {
-size_t x_20; lean_object* x_21; 
-x_20 = lean_unbox_usize(x_6);
+size_t x_21; lean_object* x_22; 
+x_21 = lean_unbox_usize(x_6);
 lean_dec(x_6);
-x_21 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(x_1, x_2, x_3, x_4, x_5, x_20, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
-return x_21;
+x_22 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3(x_1, x_2, x_3, x_4, x_5, x_21, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+return x_22;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__4___boxed(lean_object** _args) {
@@ -32150,7 +32184,7 @@ lean_dec(x_2);
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -32160,7 +32194,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_12804____closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -32168,17 +32202,17 @@ x_1 = lean_mk_string("ignoreUnusedAlts");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____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_12804____closed__1;
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__2;
+x_1 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____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_12804____closed__4() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -32186,13 +32220,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_12804____closed__5() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____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_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__15;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__4;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__4;
 x_4 = lean_box(x_1);
 x_5 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_5, 0, x_4);
@@ -32201,12 +32235,12 @@ lean_ctor_set(x_5, 2, x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972_(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_12804____closed__3;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__5;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__3;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__5;
 x_4 = l_Lean_Option_register___at_Lean_Elab_initFn____x40_Lean_Elab_AutoBound___hyg_6____spec__1(x_2, x_3, x_1);
 return x_4;
 }
@@ -32846,7 +32880,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__1;
 x_2 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__4;
-x_3 = lean_unsigned_to_nat(1009u);
+x_3 = lean_unsigned_to_nat(1019u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -34642,7 +34676,71 @@ return x_97;
 }
 }
 }
-LEAN_EXPORT uint8_t l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(size_t x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_usize_dec_lt(x_2, x_1);
+if (x_4 == 0)
+{
+return x_3;
+}
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; 
+x_5 = lean_array_uget(x_3, x_2);
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_array_uset(x_3, x_2, x_6);
+x_8 = lean_ctor_get(x_5, 1);
+lean_inc(x_8);
+lean_dec(x_5);
+x_9 = 1;
+x_10 = lean_usize_add(x_2, x_9);
+if (lean_obj_tag(x_8) == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_box(0);
+x_12 = lean_array_uset(x_7, x_2, x_11);
+x_2 = x_10;
+x_3 = x_12;
+goto _start;
+}
+else
+{
+uint8_t x_14; 
+x_14 = !lean_is_exclusive(x_8);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_8, 0);
+x_16 = l_Lean_Syntax_getId(x_15);
+lean_dec(x_15);
+lean_ctor_set(x_8, 0, x_16);
+x_17 = lean_array_uset(x_7, x_2, x_8);
+x_2 = x_10;
+x_3 = x_17;
+goto _start;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_19 = lean_ctor_get(x_8, 0);
+lean_inc(x_19);
+lean_dec(x_8);
+x_20 = l_Lean_Syntax_getId(x_19);
+lean_dec(x_19);
+x_21 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_21, 0, x_20);
+x_22 = lean_array_uset(x_7, x_2, x_21);
+x_2 = x_10;
+x_3 = x_22;
+goto _start;
+}
+}
+}
+}
+}
+LEAN_EXPORT uint8_t l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__12(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -35228,7 +35326,7 @@ lean_inc(x_7);
 x_15 = l_Lean_Elab_Term_commitIfDidNotPostpone___rarg(x_14, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 if (lean_obj_tag(x_15) == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 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; uint8_t x_112; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; uint8_t x_116; 
 x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
 x_17 = lean_ctor_get(x_16, 1);
@@ -35261,48 +35359,48 @@ lean_inc(x_25);
 x_26 = lean_ctor_get(x_19, 1);
 lean_inc(x_26);
 lean_dec(x_19);
-x_112 = lean_unbox(x_25);
+x_116 = lean_unbox(x_25);
 lean_dec(x_25);
-if (x_112 == 0)
+if (x_116 == 0)
 {
-uint8_t x_113; 
-x_113 = 0;
-x_27 = x_113;
-goto block_111;
+uint8_t x_117; 
+x_117 = 0;
+x_27 = x_117;
+goto block_115;
 }
 else
 {
-uint8_t x_114; 
-x_114 = 1;
-x_27 = x_114;
-goto block_111;
+uint8_t x_118; 
+x_118 = 1;
+x_27 = x_118;
+goto block_115;
 }
-block_111:
+block_115:
 {
 lean_object* x_28; lean_object* x_29; 
 if (x_27 == 0)
 {
-lean_object* x_103; 
+lean_object* x_107; 
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_103 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f(x_24, x_26, x_9, x_10, x_11, x_12, x_20);
-if (lean_obj_tag(x_103) == 0)
+x_107 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f(x_24, x_26, x_9, x_10, x_11, x_12, x_20);
+if (lean_obj_tag(x_107) == 0)
 {
-lean_object* x_104; lean_object* x_105; 
-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_28 = x_104;
-x_29 = x_105;
-goto block_102;
+lean_object* x_108; lean_object* x_109; 
+x_108 = lean_ctor_get(x_107, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_107, 1);
+lean_inc(x_109);
+lean_dec(x_107);
+x_28 = x_108;
+x_29 = x_109;
+goto block_106;
 }
 else
 {
-uint8_t x_106; 
+uint8_t x_110; 
 lean_dec(x_26);
 lean_dec(x_24);
 lean_dec(x_23);
@@ -35314,42 +35412,42 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_106 = !lean_is_exclusive(x_103);
-if (x_106 == 0)
+x_110 = !lean_is_exclusive(x_107);
+if (x_110 == 0)
 {
-return x_103;
+return x_107;
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_103, 0);
-x_108 = lean_ctor_get(x_103, 1);
-lean_inc(x_108);
-lean_inc(x_107);
-lean_dec(x_103);
-x_109 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_109, 0, x_107);
-lean_ctor_set(x_109, 1, x_108);
-return x_109;
+lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_111 = lean_ctor_get(x_107, 0);
+x_112 = lean_ctor_get(x_107, 1);
+lean_inc(x_112);
+lean_inc(x_111);
+lean_dec(x_107);
+x_113 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_113, 0, x_111);
+lean_ctor_set(x_113, 1, x_112);
+return x_113;
 }
 }
 }
 else
 {
-lean_object* x_110; 
-x_110 = lean_box(0);
-x_28 = x_110;
+lean_object* x_114; 
+x_114 = lean_box(0);
+x_28 = x_114;
 x_29 = x_20;
-goto block_102;
+goto block_106;
 }
-block_102:
+block_106:
 {
 if (lean_obj_tag(x_28) == 0)
 {
 lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 lean_dec(x_21);
 x_30 = lean_array_get_size(x_22);
-x_31 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__1;
+x_31 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1;
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
@@ -35359,233 +35457,204 @@ lean_inc(x_7);
 x_32 = l_Lean_Elab_Term_mkAuxName(x_31, x_7, x_8, x_9, x_10, x_11, x_12, x_29);
 if (lean_obj_tag(x_32) == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 x_33 = lean_ctor_get(x_32, 0);
 lean_inc(x_33);
 x_34 = lean_ctor_get(x_32, 1);
 lean_inc(x_34);
 lean_dec(x_32);
+x_35 = lean_usize_of_nat(x_30);
+x_36 = 0;
+lean_inc(x_22);
+x_37 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(x_35, x_36, x_22);
 lean_inc(x_24);
-lean_inc(x_30);
 lean_inc(x_23);
-x_35 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_35, 0, x_33);
-lean_ctor_set(x_35, 1, x_23);
-lean_ctor_set(x_35, 2, x_30);
-lean_ctor_set(x_35, 3, x_24);
+x_38 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_38, 0, x_33);
+lean_ctor_set(x_38, 1, x_23);
+lean_ctor_set(x_38, 2, x_37);
+lean_ctor_set(x_38, 3, x_24);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_36 = l_Lean_Meta_Match_mkMatcher(x_35, x_9, x_10, x_11, x_12, x_34);
-if (lean_obj_tag(x_36) == 0)
+x_39 = l_Lean_Meta_Match_mkMatcher(x_38, x_9, x_10, x_11, x_12, x_34);
+if (lean_obj_tag(x_39) == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
-lean_inc(x_38);
-lean_dec(x_36);
-x_39 = lean_ctor_get(x_37, 3);
-lean_inc(x_39);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_40 = lean_apply_5(x_39, x_9, x_10, x_11, x_12, x_38);
-if (lean_obj_tag(x_40) == 0)
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_41 = lean_ctor_get(x_40, 1);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_39, 1);
 lean_inc(x_41);
-lean_dec(x_40);
-x_42 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_42, 0, x_30);
-x_43 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__4___closed__1;
+lean_dec(x_39);
+x_42 = lean_ctor_get(x_40, 3);
+lean_inc(x_42);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-x_44 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_addAutoBoundImplicits_x27___spec__2___rarg(x_23, x_42, x_43, x_7, x_8, x_9, x_10, x_11, x_12, x_41);
-if (lean_obj_tag(x_44) == 0)
+x_43 = lean_apply_5(x_42, x_9, x_10, x_11, x_12, x_41);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_44, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_44, 1);
-lean_inc(x_46);
-lean_dec(x_44);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_44 = lean_ctor_get(x_43, 1);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_45, 0, x_30);
+x_46 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__4___closed__1;
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-lean_inc(x_37);
-x_47 = l_Lean_Elab_Term_reportMatcherResultErrors(x_24, x_37, x_7, x_8, x_9, x_10, x_11, x_12, x_46);
+x_47 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_addAutoBoundImplicits_x27___spec__2___rarg(x_23, x_45, x_46, x_7, x_8, x_9, x_10, x_11, x_12, x_44);
 if (lean_obj_tag(x_47) == 0)
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; lean_object* x_56; lean_object* x_69; lean_object* x_70; lean_object* x_71; uint8_t x_72; 
-x_48 = lean_ctor_get(x_47, 1);
+lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_48 = lean_ctor_get(x_47, 0);
 lean_inc(x_48);
-if (lean_is_exclusive(x_47)) {
- lean_ctor_release(x_47, 0);
- lean_ctor_release(x_47, 1);
- x_49 = x_47;
+x_49 = lean_ctor_get(x_47, 1);
+lean_inc(x_49);
+lean_dec(x_47);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_40);
+x_50 = l_Lean_Elab_Term_reportMatcherResultErrors(x_24, x_40, x_7, x_8, x_9, x_10, x_11, x_12, x_49);
+if (lean_obj_tag(x_50) == 0)
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; lean_object* x_60; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; 
+x_51 = lean_ctor_get(x_50, 1);
+lean_inc(x_51);
+if (lean_is_exclusive(x_50)) {
+ lean_ctor_release(x_50, 0);
+ lean_ctor_release(x_50, 1);
+ x_52 = x_50;
 } else {
- lean_dec_ref(x_47);
- x_49 = lean_box(0);
+ lean_dec_ref(x_50);
+ x_52 = lean_box(0);
 }
-x_50 = lean_ctor_get(x_37, 0);
-lean_inc(x_50);
-lean_dec(x_37);
-x_51 = l_Lean_mkApp(x_50, x_45);
-x_52 = l_Lean_mkAppN(x_51, x_22);
-x_53 = l_Lean_mkAppN(x_52, x_26);
-x_54 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__8;
-x_69 = lean_st_ref_get(x_12, x_48);
-x_70 = lean_ctor_get(x_69, 0);
-lean_inc(x_70);
-x_71 = lean_ctor_get(x_70, 3);
-lean_inc(x_71);
-lean_dec(x_70);
-x_72 = lean_ctor_get_uint8(x_71, sizeof(void*)*1);
-lean_dec(x_71);
-if (x_72 == 0)
-{
-lean_object* x_73; uint8_t x_74; 
-x_73 = lean_ctor_get(x_69, 1);
-lean_inc(x_73);
-lean_dec(x_69);
-x_74 = 0;
-x_55 = x_74;
-x_56 = x_73;
-goto block_68;
-}
-else
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; uint8_t x_79; 
-x_75 = lean_ctor_get(x_69, 1);
-lean_inc(x_75);
-lean_dec(x_69);
-x_76 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_54, x_7, x_8, x_9, x_10, x_11, x_12, x_75);
-x_77 = lean_ctor_get(x_76, 0);
-lean_inc(x_77);
-x_78 = lean_ctor_get(x_76, 1);
-lean_inc(x_78);
-lean_dec(x_76);
-x_79 = lean_unbox(x_77);
-lean_dec(x_77);
-x_55 = x_79;
-x_56 = x_78;
-goto block_68;
-}
-block_68:
-{
-if (x_55 == 0)
-{
-lean_object* x_57; 
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-if (lean_is_scalar(x_49)) {
- x_57 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_57 = x_49;
-}
-lean_ctor_set(x_57, 0, x_53);
-lean_ctor_set(x_57, 1, x_56);
-return x_57;
-}
-else
-{
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
-lean_dec(x_49);
+x_53 = lean_ctor_get(x_40, 0);
 lean_inc(x_53);
-x_58 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_58, 0, x_53);
-x_59 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__4___closed__3;
-x_60 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_58);
-x_61 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
-x_62 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_62, 0, x_60);
-lean_ctor_set(x_62, 1, x_61);
-x_63 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_54, x_62, x_7, x_8, x_9, x_10, x_11, x_12, x_56);
+lean_dec(x_40);
+x_54 = l_Lean_mkApp(x_53, x_48);
+x_55 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(x_35, x_36, x_22);
+x_56 = l_Lean_mkAppN(x_54, x_55);
+x_57 = l_Lean_mkAppN(x_56, x_26);
+x_58 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__8;
+x_73 = lean_st_ref_get(x_12, x_51);
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_74, 3);
+lean_inc(x_75);
+lean_dec(x_74);
+x_76 = lean_ctor_get_uint8(x_75, sizeof(void*)*1);
+lean_dec(x_75);
+if (x_76 == 0)
+{
+lean_object* x_77; uint8_t x_78; 
+x_77 = lean_ctor_get(x_73, 1);
+lean_inc(x_77);
+lean_dec(x_73);
+x_78 = 0;
+x_59 = x_78;
+x_60 = x_77;
+goto block_72;
+}
+else
+{
+lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t x_83; 
+x_79 = lean_ctor_get(x_73, 1);
+lean_inc(x_79);
+lean_dec(x_73);
+x_80 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_58, x_7, x_8, x_9, x_10, x_11, x_12, x_79);
+x_81 = lean_ctor_get(x_80, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_80, 1);
+lean_inc(x_82);
+lean_dec(x_80);
+x_83 = lean_unbox(x_81);
+lean_dec(x_81);
+x_59 = x_83;
+x_60 = x_82;
+goto block_72;
+}
+block_72:
+{
+if (x_59 == 0)
+{
+lean_object* x_61; 
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_64 = !lean_is_exclusive(x_63);
-if (x_64 == 0)
-{
-lean_object* x_65; 
-x_65 = lean_ctor_get(x_63, 0);
-lean_dec(x_65);
-lean_ctor_set(x_63, 0, x_53);
-return x_63;
+if (lean_is_scalar(x_52)) {
+ x_61 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_61 = x_52;
+}
+lean_ctor_set(x_61, 0, x_57);
+lean_ctor_set(x_61, 1, x_60);
+return x_61;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; 
-x_66 = lean_ctor_get(x_63, 1);
-lean_inc(x_66);
-lean_dec(x_63);
-x_67 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_67, 0, x_53);
-lean_ctor_set(x_67, 1, x_66);
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; 
+lean_dec(x_52);
+lean_inc(x_57);
+x_62 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_62, 0, x_57);
+x_63 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__4___closed__3;
+x_64 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_62);
+x_65 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__16;
+x_66 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_66, 0, x_64);
+lean_ctor_set(x_66, 1, x_65);
+x_67 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_58, x_66, x_7, x_8, x_9, x_10, x_11, x_12, x_60);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_68 = !lean_is_exclusive(x_67);
+if (x_68 == 0)
+{
+lean_object* x_69; 
+x_69 = lean_ctor_get(x_67, 0);
+lean_dec(x_69);
+lean_ctor_set(x_67, 0, x_57);
 return x_67;
 }
-}
-}
-}
 else
 {
-uint8_t x_80; 
-lean_dec(x_45);
-lean_dec(x_37);
-lean_dec(x_26);
-lean_dec(x_22);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_80 = !lean_is_exclusive(x_47);
-if (x_80 == 0)
-{
-return x_47;
+lean_object* x_70; lean_object* x_71; 
+x_70 = lean_ctor_get(x_67, 1);
+lean_inc(x_70);
+lean_dec(x_67);
+x_71 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_71, 0, x_57);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
 }
-else
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_47, 0);
-x_82 = lean_ctor_get(x_47, 1);
-lean_inc(x_82);
-lean_inc(x_81);
-lean_dec(x_47);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_81);
-lean_ctor_set(x_83, 1, x_82);
-return x_83;
 }
 }
 }
 else
 {
 uint8_t x_84; 
-lean_dec(x_37);
+lean_dec(x_48);
+lean_dec(x_40);
 lean_dec(x_26);
-lean_dec(x_24);
 lean_dec(x_22);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -35593,19 +35662,19 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_84 = !lean_is_exclusive(x_44);
+x_84 = !lean_is_exclusive(x_50);
 if (x_84 == 0)
 {
-return x_44;
+return x_50;
 }
 else
 {
 lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_44, 0);
-x_86 = lean_ctor_get(x_44, 1);
+x_85 = lean_ctor_get(x_50, 0);
+x_86 = lean_ctor_get(x_50, 1);
 lean_inc(x_86);
 lean_inc(x_85);
-lean_dec(x_44);
+lean_dec(x_50);
 x_87 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_87, 0, x_85);
 lean_ctor_set(x_87, 1, x_86);
@@ -35616,11 +35685,9 @@ return x_87;
 else
 {
 uint8_t x_88; 
-lean_dec(x_37);
-lean_dec(x_30);
+lean_dec(x_40);
 lean_dec(x_26);
 lean_dec(x_24);
-lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -35628,19 +35695,19 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_88 = !lean_is_exclusive(x_40);
+x_88 = !lean_is_exclusive(x_47);
 if (x_88 == 0)
 {
-return x_40;
+return x_47;
 }
 else
 {
 lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_40, 0);
-x_90 = lean_ctor_get(x_40, 1);
+x_89 = lean_ctor_get(x_47, 0);
+x_90 = lean_ctor_get(x_47, 1);
 lean_inc(x_90);
 lean_inc(x_89);
-lean_dec(x_40);
+lean_dec(x_47);
 x_91 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_91, 0, x_89);
 lean_ctor_set(x_91, 1, x_90);
@@ -35651,6 +35718,7 @@ return x_91;
 else
 {
 uint8_t x_92; 
+lean_dec(x_40);
 lean_dec(x_30);
 lean_dec(x_26);
 lean_dec(x_24);
@@ -35662,19 +35730,19 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_92 = !lean_is_exclusive(x_36);
+x_92 = !lean_is_exclusive(x_43);
 if (x_92 == 0)
 {
-return x_36;
+return x_43;
 }
 else
 {
 lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_93 = lean_ctor_get(x_36, 0);
-x_94 = lean_ctor_get(x_36, 1);
+x_93 = lean_ctor_get(x_43, 0);
+x_94 = lean_ctor_get(x_43, 1);
 lean_inc(x_94);
 lean_inc(x_93);
-lean_dec(x_36);
+lean_dec(x_43);
 x_95 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_95, 0, x_93);
 lean_ctor_set(x_95, 1, x_94);
@@ -35696,19 +35764,19 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_96 = !lean_is_exclusive(x_32);
+x_96 = !lean_is_exclusive(x_39);
 if (x_96 == 0)
 {
-return x_32;
+return x_39;
 }
 else
 {
 lean_object* x_97; lean_object* x_98; lean_object* x_99; 
-x_97 = lean_ctor_get(x_32, 0);
-x_98 = lean_ctor_get(x_32, 1);
+x_97 = lean_ctor_get(x_39, 0);
+x_98 = lean_ctor_get(x_39, 1);
 lean_inc(x_98);
 lean_inc(x_97);
-lean_dec(x_32);
+lean_dec(x_39);
 x_99 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_99, 0, x_97);
 lean_ctor_set(x_99, 1, x_98);
@@ -35718,7 +35786,8 @@ return x_99;
 }
 else
 {
-lean_object* x_100; lean_object* x_101; 
+uint8_t x_100; 
+lean_dec(x_30);
 lean_dec(x_26);
 lean_dec(x_24);
 lean_dec(x_23);
@@ -35729,47 +35798,80 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_100 = lean_ctor_get(x_28, 0);
-lean_inc(x_100);
-lean_dec(x_28);
-if (lean_is_scalar(x_21)) {
- x_101 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_101 = x_21;
-}
-lean_ctor_set(x_101, 0, x_100);
-lean_ctor_set(x_101, 1, x_29);
-return x_101;
+x_100 = !lean_is_exclusive(x_32);
+if (x_100 == 0)
+{
+return x_32;
 }
+else
+{
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_101 = lean_ctor_get(x_32, 0);
+x_102 = lean_ctor_get(x_32, 1);
+lean_inc(x_102);
+lean_inc(x_101);
+lean_dec(x_32);
+x_103 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_103, 0, x_101);
+lean_ctor_set(x_103, 1, x_102);
+return x_103;
 }
 }
 }
 else
 {
-uint8_t x_115; 
+lean_object* x_104; lean_object* x_105; 
+lean_dec(x_26);
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_22);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_115 = !lean_is_exclusive(x_15);
-if (x_115 == 0)
+x_104 = lean_ctor_get(x_28, 0);
+lean_inc(x_104);
+lean_dec(x_28);
+if (lean_is_scalar(x_21)) {
+ x_105 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_105 = x_21;
+}
+lean_ctor_set(x_105, 0, x_104);
+lean_ctor_set(x_105, 1, x_29);
+return x_105;
+}
+}
+}
+}
+else
+{
+uint8_t x_119; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_119 = !lean_is_exclusive(x_15);
+if (x_119 == 0)
 {
 return x_15;
 }
 else
 {
-lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-x_116 = lean_ctor_get(x_15, 0);
-x_117 = lean_ctor_get(x_15, 1);
-lean_inc(x_117);
-lean_inc(x_116);
+lean_object* x_120; lean_object* x_121; lean_object* x_122; 
+x_120 = lean_ctor_get(x_15, 0);
+x_121 = lean_ctor_get(x_15, 1);
+lean_inc(x_121);
+lean_inc(x_120);
 lean_dec(x_15);
-x_118 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_118, 0, x_116);
-lean_ctor_set(x_118, 1, x_117);
-return x_118;
+x_122 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_122, 0, x_120);
+lean_ctor_set(x_122, 1, x_121);
+return x_122;
 }
 }
 }
@@ -35823,7 +35925,7 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 x_15 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__11;
-x_16 = l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(x_1, x_15);
+x_16 = l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__12(x_1, x_15);
 if (x_16 == 0)
 {
 lean_object* x_17; lean_object* x_18; 
@@ -35997,11 +36099,23 @@ lean_dec(x_6);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; size_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(x_4, x_5, x_3);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__12___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__11(x_1, x_2);
+x_3 = l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__12(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 x_4 = lean_box(x_3);
@@ -39287,7 +39401,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1234u);
+x_1 = lean_unsigned_to_nat(1244u);
 x_2 = lean_unsigned_to_nat(27u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39299,7 +39413,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1251u);
+x_1 = lean_unsigned_to_nat(1261u);
 x_2 = lean_unsigned_to_nat(37u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39327,7 +39441,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1234u);
+x_1 = lean_unsigned_to_nat(1244u);
 x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39339,7 +39453,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1234u);
+x_1 = lean_unsigned_to_nat(1244u);
 x_2 = lean_unsigned_to_nat(40u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39385,7 +39499,7 @@ x_4 = l_Lean_addBuiltinDeclarationRanges(x_2, x_3, x_1);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_16060_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_16255_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -39430,7 +39544,7 @@ static lean_object* _init_l_Lean_Elab_Term_elabNoMatch___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
+x_1 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5;
 x_2 = l_Lean_Elab_Term_elabNoMatch___closed__3;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
@@ -39537,7 +39651,7 @@ x_49 = l_Lean_Elab_Term_elabNoMatch___closed__1;
 x_50 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_50, 0, x_22);
 lean_ctor_set(x_50, 1, x_49);
-x_51 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1;
+x_51 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5;
 x_52 = lean_array_push(x_51, x_50);
 x_53 = lean_array_push(x_52, x_19);
 x_54 = lean_alloc_ctor(1, 3, 0);
@@ -39697,7 +39811,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNoMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1260u);
+x_1 = lean_unsigned_to_nat(1270u);
 x_2 = lean_unsigned_to_nat(29u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39709,7 +39823,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNoMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1272u);
+x_1 = lean_unsigned_to_nat(1282u);
 x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39737,7 +39851,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNoMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1260u);
+x_1 = lean_unsigned_to_nat(1270u);
 x_2 = lean_unsigned_to_nat(33u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39749,7 +39863,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNoMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1260u);
+x_1 = lean_unsigned_to_nat(1270u);
 x_2 = lean_unsigned_to_nat(44u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -39906,6 +40020,15 @@ l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__1 = _ini
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__2 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__2);
+l_Lean_Elab_Term_Discr_h_x3f___default = _init_l_Lean_Elab_Term_Discr_h_x3f___default();
+lean_mark_persistent(l_Lean_Elab_Term_Discr_h_x3f___default);
+l_Lean_Elab_Term_instInhabitedDiscr___closed__1 = _init_l_Lean_Elab_Term_instInhabitedDiscr___closed__1();
+l_Lean_Elab_Term_instInhabitedDiscr___closed__2 = _init_l_Lean_Elab_Term_instInhabitedDiscr___closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_instInhabitedDiscr___closed__2);
+l_Lean_Elab_Term_instInhabitedDiscr___closed__3 = _init_l_Lean_Elab_Term_instInhabitedDiscr___closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_instInhabitedDiscr___closed__3);
+l_Lean_Elab_Term_instInhabitedDiscr = _init_l_Lean_Elab_Term_instInhabitedDiscr();
+lean_mark_persistent(l_Lean_Elab_Term_instInhabitedDiscr);
 l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__1 = _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__1();
 lean_mark_persistent(l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__1);
 l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__2 = _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__2();
@@ -39942,8 +40065,6 @@ l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsW
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___closed__2 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___closed__2);
-l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1();
-lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__1___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__2 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__2();
@@ -40065,6 +40186,8 @@ l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDep
 lean_mark_persistent(l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__3);
 l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__4 = _init_l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__4();
 lean_mark_persistent(l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__4);
+l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5 = _init_l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5();
+lean_mark_persistent(l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_packMatchTypePatterns___spec__1___closed__5);
 l_panic___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___spec__1___closed__1 = _init_l_panic___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___spec__1___closed__1();
 lean_mark_persistent(l_panic___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___spec__1___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_toPattern___closed__1();
@@ -40166,17 +40289,17 @@ l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__1
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__3);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__4);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__5 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804____closed__5);
-if (builtin) {res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12804_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__1);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__2);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__3);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__4);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__5 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__5();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972____closed__5);
+if (builtin) {res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12972_(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);
@@ -40306,7 +40429,7 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabMatch_declRange___closed_
 res = l___regBuiltin_Lean_Elab_Term_elabMatch_declRange(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_16060_(lean_io_mk_world());
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_16255_(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/Syntax.c b/stage0/stdlib/Lean/Elab/Syntax.c
index 6f56f6f0f2..ae525c5144 100644
--- a/stage0/stdlib/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Lean/Elab/Syntax.c
@@ -87,7 +87,6 @@ static lean_object* l_Lean_Elab_Term_toParserDescr_processSepBy1___lambda__1___c
 static lean_object* l_Lean_Elab_Term_toParserDescr_processAtom___lambda__1___closed__3;
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__13;
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__41;
-static lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_toParserDescr_processSepBy1___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_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Term_quoteAutoTactic___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SourceInfo_fromRef(lean_object*);
@@ -144,6 +143,7 @@ static lean_object* l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__22;
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabSyntax___spec__6___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabSyntax___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894____closed__1;
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_toParserDescr_process___closed__15;
 static lean_object* l_Lean_Elab_Term_toParserDescr_processAtom___closed__2;
@@ -307,7 +307,7 @@ lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__2;
 lean_object* l_String_capitalize(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Term_toParserDescr_resolveParserName___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_toParserDescr_process___closed__13;
 static lean_object* l_Lean_Elab_Term_toParserDescr_processNonReserved___closed__7;
@@ -19735,7 +19735,7 @@ lean_dec(x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891____closed__1() {
+static lean_object* _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -19745,11 +19745,11 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891____closed__1;
+x_2 = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894____closed__1;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 return x_3;
 }
@@ -20465,9 +20465,9 @@ l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__5 = _init_l_
 lean_mark_persistent(l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__5);
 l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__6 = _init_l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__6();
 lean_mark_persistent(l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__6);
-l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891____closed__1 = _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891____closed__1();
-lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891____closed__1);
-res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6891_(lean_io_mk_world());
+l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894____closed__1 = _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894____closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894____closed__1);
+res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6894_(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/Tactic/Match.c b/stage0/stdlib/Lean/Elab/Tactic/Match.c
index db35bf1e1e..62a90783b1 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Match.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Match.c
@@ -96,6 +96,7 @@ static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__7;
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__15;
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
+static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__42;
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Elab_Tactic_evalMatch___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Tactic_evalMatch___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
@@ -496,7 +497,7 @@ static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("paren");
+x_1 = lean_mk_string("withAnnotateState");
 return x_1;
 }
 }
@@ -514,7 +515,7 @@ static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("(");
+x_1 = lean_mk_string("with_annotate_state");
 return x_1;
 }
 }
@@ -522,17 +523,18 @@ static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string(")");
+x_1 = lean_mk_string("skip");
 return x_1;
 }
 }
 static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(3u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__20;
+x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
 }
 }
 static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37() {
@@ -548,7 +550,7 @@ static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(5u);
+x_1 = lean_unsigned_to_nat(3u);
 x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
@@ -556,12 +558,21 @@ return x_2;
 static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(5u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40() {
+_start:
+{
 lean_object* x_1; 
 x_1 = lean_mk_string("=>");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40() {
+static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41() {
 _start:
 {
 lean_object* x_1; 
@@ -569,12 +580,12 @@ x_1 = lean_mk_string("match");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41() {
+static lean_object* _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__42() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -690,7 +701,7 @@ lean_dec(x_60);
 x_63 = !lean_is_exclusive(x_61);
 if (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; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
 x_64 = lean_ctor_get(x_61, 0);
 x_65 = lean_ctor_get(x_61, 1);
 x_66 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__21;
@@ -701,150 +712,170 @@ lean_ctor_set(x_67, 1, x_66);
 x_68 = lean_unsigned_to_nat(2u);
 x_69 = l_Lean_Syntax_getArg(x_25, x_68);
 x_70 = l_Lean_Syntax_getHeadInfo_x3f(x_69);
-lean_dec(x_69);
 x_71 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__34;
 lean_inc(x_64);
 x_72 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_72, 0, x_64);
 lean_ctor_set(x_72, 1, x_71);
-x_73 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
+x_73 = l_Lean_Syntax_getArg(x_25, x_13);
+x_74 = lean_array_push(x_54, x_73);
+x_75 = lean_array_push(x_74, x_69);
+x_76 = l_Lean_nullKind;
+x_77 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_77, 0, x_57);
+lean_ctor_set(x_77, 1, x_76);
+lean_ctor_set(x_77, 2, x_75);
+x_78 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
 lean_inc(x_64);
-x_74 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_74, 0, x_64);
-lean_ctor_set(x_74, 1, x_73);
-x_75 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36;
-x_76 = lean_array_push(x_75, x_72);
-x_77 = lean_array_push(x_76, x_27);
-x_78 = lean_array_push(x_77, x_74);
-x_79 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__33;
-x_80 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_80, 0, x_57);
-lean_ctor_set(x_80, 1, x_79);
-lean_ctor_set(x_80, 2, x_78);
-x_81 = lean_array_push(x_54, x_80);
-x_82 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__25;
-x_83 = lean_array_push(x_81, x_82);
-x_84 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__31;
-x_85 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_85, 0, x_57);
-lean_ctor_set(x_85, 1, x_84);
-lean_ctor_set(x_85, 2, x_83);
-x_86 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
-x_87 = lean_array_push(x_86, x_85);
-x_88 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__24;
+x_79 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_79, 0, x_64);
+lean_ctor_set(x_79, 1, x_78);
+x_80 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
+x_81 = lean_array_push(x_80, x_79);
+x_82 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36;
+x_83 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_83, 0, x_57);
+lean_ctor_set(x_83, 1, x_82);
+lean_ctor_set(x_83, 2, x_81);
+x_84 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__38;
+x_85 = lean_array_push(x_84, x_72);
+x_86 = lean_array_push(x_85, x_77);
+x_87 = lean_array_push(x_86, x_83);
+x_88 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__33;
 x_89 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_89, 0, x_57);
 lean_ctor_set(x_89, 1, x_88);
 lean_ctor_set(x_89, 2, x_87);
-x_90 = lean_array_push(x_86, x_89);
-x_91 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
-x_92 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_92, 0, x_57);
-lean_ctor_set(x_92, 1, x_91);
-lean_ctor_set(x_92, 2, x_90);
-x_93 = lean_array_push(x_86, x_92);
-x_94 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__27;
-x_95 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_95, 0, x_57);
-lean_ctor_set(x_95, 1, x_94);
-lean_ctor_set(x_95, 2, x_93);
-x_96 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__38;
-x_97 = lean_array_push(x_96, x_67);
-x_98 = lean_array_push(x_97, x_59);
-x_99 = lean_array_push(x_98, x_82);
+x_90 = lean_array_push(x_54, x_89);
+x_91 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__25;
+x_92 = lean_array_push(x_90, x_91);
+x_93 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__31;
+x_94 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_94, 0, x_57);
+lean_ctor_set(x_94, 1, x_93);
+lean_ctor_set(x_94, 2, x_92);
+x_95 = lean_array_push(x_54, x_27);
+x_96 = lean_array_push(x_95, x_91);
+x_97 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_97, 0, x_57);
+lean_ctor_set(x_97, 1, x_93);
+lean_ctor_set(x_97, 2, x_96);
+x_98 = lean_array_push(x_54, x_94);
+x_99 = lean_array_push(x_98, x_97);
+x_100 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__24;
+x_101 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_101, 0, x_57);
+lean_ctor_set(x_101, 1, x_100);
+lean_ctor_set(x_101, 2, x_99);
+x_102 = lean_array_push(x_80, x_101);
+x_103 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
+x_104 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_104, 0, x_57);
+lean_ctor_set(x_104, 1, x_103);
+lean_ctor_set(x_104, 2, x_102);
+x_105 = lean_array_push(x_80, x_104);
+x_106 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__27;
+x_107 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_107, 0, x_57);
+lean_ctor_set(x_107, 1, x_106);
+lean_ctor_set(x_107, 2, x_105);
+x_108 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
+x_109 = lean_array_push(x_108, x_67);
+x_110 = lean_array_push(x_109, x_59);
+x_111 = lean_array_push(x_110, x_91);
 if (lean_obj_tag(x_70) == 0)
 {
-lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; uint8_t x_106; 
-x_100 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
-x_101 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_101, 0, x_64);
-lean_ctor_set(x_101, 1, x_100);
-x_102 = lean_array_push(x_99, x_101);
-x_103 = lean_array_push(x_102, x_95);
-x_104 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
-x_105 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_105, 0, x_57);
-lean_ctor_set(x_105, 1, x_104);
-lean_ctor_set(x_105, 2, x_103);
-x_106 = !lean_is_exclusive(x_65);
-if (x_106 == 0)
-{
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_65, 1);
-x_108 = lean_array_push(x_107, x_105);
-lean_ctor_set(x_65, 1, x_108);
-x_109 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
-lean_ctor_set(x_61, 0, x_109);
-x_15 = x_61;
-x_16 = x_62;
-goto block_23;
-}
-else
-{
-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_65, 0);
-x_111 = lean_ctor_get(x_65, 1);
-lean_inc(x_111);
-lean_inc(x_110);
-lean_dec(x_65);
-x_112 = lean_array_push(x_111, x_105);
-x_113 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_113, 0, x_110);
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; uint8_t x_118; 
+x_112 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_113 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_113, 0, x_64);
 lean_ctor_set(x_113, 1, x_112);
-x_114 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
-lean_ctor_set(x_61, 1, x_113);
-lean_ctor_set(x_61, 0, x_114);
-x_15 = x_61;
-x_16 = x_62;
-goto block_23;
-}
-}
-else
-{
-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; uint8_t x_122; 
-lean_dec(x_64);
-x_115 = lean_ctor_get(x_70, 0);
-lean_inc(x_115);
-lean_dec(x_70);
-x_116 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
-x_117 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_117, 0, x_115);
+x_114 = lean_array_push(x_111, x_113);
+x_115 = lean_array_push(x_114, x_107);
+x_116 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+x_117 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_117, 0, x_57);
 lean_ctor_set(x_117, 1, x_116);
-x_118 = lean_array_push(x_99, x_117);
-x_119 = lean_array_push(x_118, x_95);
-x_120 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
-x_121 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_121, 0, x_57);
-lean_ctor_set(x_121, 1, x_120);
-lean_ctor_set(x_121, 2, x_119);
-x_122 = !lean_is_exclusive(x_65);
-if (x_122 == 0)
+lean_ctor_set(x_117, 2, x_115);
+x_118 = !lean_is_exclusive(x_65);
+if (x_118 == 0)
 {
-lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+x_119 = lean_ctor_get(x_65, 1);
+x_120 = lean_array_push(x_119, x_117);
+lean_ctor_set(x_65, 1, x_120);
+x_121 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
+lean_ctor_set(x_61, 0, x_121);
+x_15 = x_61;
+x_16 = x_62;
+goto block_23;
+}
+else
+{
+lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+x_122 = lean_ctor_get(x_65, 0);
 x_123 = lean_ctor_get(x_65, 1);
-x_124 = lean_array_push(x_123, x_121);
-lean_ctor_set(x_65, 1, x_124);
-x_125 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
-lean_ctor_set(x_61, 0, x_125);
-x_15 = x_61;
-x_16 = x_62;
-goto block_23;
-}
-else
-{
-lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
-x_126 = lean_ctor_get(x_65, 0);
-x_127 = lean_ctor_get(x_65, 1);
-lean_inc(x_127);
-lean_inc(x_126);
+lean_inc(x_123);
+lean_inc(x_122);
 lean_dec(x_65);
-x_128 = lean_array_push(x_127, x_121);
-x_129 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_129, 0, x_126);
+x_124 = lean_array_push(x_123, x_117);
+x_125 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_125, 0, x_122);
+lean_ctor_set(x_125, 1, x_124);
+x_126 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
+lean_ctor_set(x_61, 1, x_125);
+lean_ctor_set(x_61, 0, x_126);
+x_15 = x_61;
+x_16 = x_62;
+goto block_23;
+}
+}
+else
+{
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; uint8_t x_134; 
+lean_dec(x_64);
+x_127 = lean_ctor_get(x_70, 0);
+lean_inc(x_127);
+lean_dec(x_70);
+x_128 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_129 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_129, 0, x_127);
 lean_ctor_set(x_129, 1, x_128);
-x_130 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
-lean_ctor_set(x_61, 1, x_129);
-lean_ctor_set(x_61, 0, x_130);
+x_130 = lean_array_push(x_111, x_129);
+x_131 = lean_array_push(x_130, x_107);
+x_132 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+x_133 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_133, 0, x_57);
+lean_ctor_set(x_133, 1, x_132);
+lean_ctor_set(x_133, 2, x_131);
+x_134 = !lean_is_exclusive(x_65);
+if (x_134 == 0)
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_135 = lean_ctor_get(x_65, 1);
+x_136 = lean_array_push(x_135, x_133);
+lean_ctor_set(x_65, 1, x_136);
+x_137 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
+lean_ctor_set(x_61, 0, x_137);
+x_15 = x_61;
+x_16 = x_62;
+goto block_23;
+}
+else
+{
+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_65, 0);
+x_139 = lean_ctor_get(x_65, 1);
+lean_inc(x_139);
+lean_inc(x_138);
+lean_dec(x_65);
+x_140 = lean_array_push(x_139, x_133);
+x_141 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_141, 0, x_138);
+lean_ctor_set(x_141, 1, x_140);
+x_142 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
+lean_ctor_set(x_61, 1, x_141);
+lean_ctor_set(x_61, 0, x_142);
 x_15 = x_61;
 x_16 = x_62;
 goto block_23;
@@ -853,156 +884,176 @@ goto block_23;
 }
 else
 {
-lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
-x_131 = lean_ctor_get(x_61, 0);
-x_132 = lean_ctor_get(x_61, 1);
-lean_inc(x_132);
-lean_inc(x_131);
+lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_143 = lean_ctor_get(x_61, 0);
+x_144 = lean_ctor_get(x_61, 1);
+lean_inc(x_144);
+lean_inc(x_143);
 lean_dec(x_61);
-x_133 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__21;
-lean_inc(x_131);
-x_134 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_134, 0, x_131);
-lean_ctor_set(x_134, 1, x_133);
-x_135 = lean_unsigned_to_nat(2u);
-x_136 = l_Lean_Syntax_getArg(x_25, x_135);
-x_137 = l_Lean_Syntax_getHeadInfo_x3f(x_136);
-lean_dec(x_136);
-x_138 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__34;
-lean_inc(x_131);
-x_139 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_139, 0, x_131);
-lean_ctor_set(x_139, 1, x_138);
-x_140 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
-lean_inc(x_131);
-x_141 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_141, 0, x_131);
-lean_ctor_set(x_141, 1, x_140);
-x_142 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36;
-x_143 = lean_array_push(x_142, x_139);
-x_144 = lean_array_push(x_143, x_27);
-x_145 = lean_array_push(x_144, x_141);
-x_146 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__33;
-x_147 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_147, 0, x_57);
-lean_ctor_set(x_147, 1, x_146);
-lean_ctor_set(x_147, 2, x_145);
-x_148 = lean_array_push(x_54, x_147);
-x_149 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__25;
-x_150 = lean_array_push(x_148, x_149);
-x_151 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__31;
-x_152 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_152, 0, x_57);
-lean_ctor_set(x_152, 1, x_151);
-lean_ctor_set(x_152, 2, x_150);
-x_153 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
-x_154 = lean_array_push(x_153, x_152);
-x_155 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__24;
+x_145 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__21;
+lean_inc(x_143);
+x_146 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_146, 0, x_143);
+lean_ctor_set(x_146, 1, x_145);
+x_147 = lean_unsigned_to_nat(2u);
+x_148 = l_Lean_Syntax_getArg(x_25, x_147);
+x_149 = l_Lean_Syntax_getHeadInfo_x3f(x_148);
+x_150 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__34;
+lean_inc(x_143);
+x_151 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_151, 0, x_143);
+lean_ctor_set(x_151, 1, x_150);
+x_152 = l_Lean_Syntax_getArg(x_25, x_13);
+x_153 = lean_array_push(x_54, x_152);
+x_154 = lean_array_push(x_153, x_148);
+x_155 = l_Lean_nullKind;
 x_156 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_156, 0, x_57);
 lean_ctor_set(x_156, 1, x_155);
 lean_ctor_set(x_156, 2, x_154);
-x_157 = lean_array_push(x_153, x_156);
-x_158 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
-x_159 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_159, 0, x_57);
-lean_ctor_set(x_159, 1, x_158);
-lean_ctor_set(x_159, 2, x_157);
-x_160 = lean_array_push(x_153, x_159);
-x_161 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__27;
+x_157 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
+lean_inc(x_143);
+x_158 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_158, 0, x_143);
+lean_ctor_set(x_158, 1, x_157);
+x_159 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
+x_160 = lean_array_push(x_159, x_158);
+x_161 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36;
 x_162 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_162, 0, x_57);
 lean_ctor_set(x_162, 1, x_161);
 lean_ctor_set(x_162, 2, x_160);
 x_163 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__38;
-x_164 = lean_array_push(x_163, x_134);
-x_165 = lean_array_push(x_164, x_59);
-x_166 = lean_array_push(x_165, x_149);
-if (lean_obj_tag(x_137) == 0)
-{
-lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; 
-x_167 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
-x_168 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_168, 0, x_131);
+x_164 = lean_array_push(x_163, x_151);
+x_165 = lean_array_push(x_164, x_156);
+x_166 = lean_array_push(x_165, x_162);
+x_167 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__33;
+x_168 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_168, 0, x_57);
 lean_ctor_set(x_168, 1, x_167);
-x_169 = lean_array_push(x_166, x_168);
-x_170 = lean_array_push(x_169, x_162);
-x_171 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
-x_172 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_172, 0, x_57);
-lean_ctor_set(x_172, 1, x_171);
-lean_ctor_set(x_172, 2, x_170);
-x_173 = lean_ctor_get(x_132, 0);
-lean_inc(x_173);
-x_174 = lean_ctor_get(x_132, 1);
-lean_inc(x_174);
-if (lean_is_exclusive(x_132)) {
- lean_ctor_release(x_132, 0);
- lean_ctor_release(x_132, 1);
- x_175 = x_132;
-} else {
- lean_dec_ref(x_132);
- x_175 = lean_box(0);
-}
-x_176 = lean_array_push(x_174, x_172);
-if (lean_is_scalar(x_175)) {
- x_177 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_177 = x_175;
-}
-lean_ctor_set(x_177, 0, x_173);
-lean_ctor_set(x_177, 1, x_176);
-x_178 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
-x_179 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_179, 0, x_178);
-lean_ctor_set(x_179, 1, x_177);
-x_15 = x_179;
-x_16 = x_62;
-goto block_23;
-}
-else
-{
-lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; 
-lean_dec(x_131);
-x_180 = lean_ctor_get(x_137, 0);
-lean_inc(x_180);
-lean_dec(x_137);
-x_181 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
-x_182 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_182, 0, x_180);
-lean_ctor_set(x_182, 1, x_181);
-x_183 = lean_array_push(x_166, x_182);
-x_184 = lean_array_push(x_183, x_162);
-x_185 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+lean_ctor_set(x_168, 2, x_166);
+x_169 = lean_array_push(x_54, x_168);
+x_170 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__25;
+x_171 = lean_array_push(x_169, x_170);
+x_172 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__31;
+x_173 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_173, 0, x_57);
+lean_ctor_set(x_173, 1, x_172);
+lean_ctor_set(x_173, 2, x_171);
+x_174 = lean_array_push(x_54, x_27);
+x_175 = lean_array_push(x_174, x_170);
+x_176 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_176, 0, x_57);
+lean_ctor_set(x_176, 1, x_172);
+lean_ctor_set(x_176, 2, x_175);
+x_177 = lean_array_push(x_54, x_173);
+x_178 = lean_array_push(x_177, x_176);
+x_179 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__24;
+x_180 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_180, 0, x_57);
+lean_ctor_set(x_180, 1, x_179);
+lean_ctor_set(x_180, 2, x_178);
+x_181 = lean_array_push(x_159, x_180);
+x_182 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
+x_183 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_183, 0, x_57);
+lean_ctor_set(x_183, 1, x_182);
+lean_ctor_set(x_183, 2, x_181);
+x_184 = lean_array_push(x_159, x_183);
+x_185 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__27;
 x_186 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_186, 0, x_57);
 lean_ctor_set(x_186, 1, x_185);
 lean_ctor_set(x_186, 2, x_184);
-x_187 = lean_ctor_get(x_132, 0);
-lean_inc(x_187);
-x_188 = lean_ctor_get(x_132, 1);
-lean_inc(x_188);
-if (lean_is_exclusive(x_132)) {
- lean_ctor_release(x_132, 0);
- lean_ctor_release(x_132, 1);
- x_189 = x_132;
+x_187 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
+x_188 = lean_array_push(x_187, x_146);
+x_189 = lean_array_push(x_188, x_59);
+x_190 = lean_array_push(x_189, x_170);
+if (lean_obj_tag(x_149) == 0)
+{
+lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; 
+x_191 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_192 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_192, 0, x_143);
+lean_ctor_set(x_192, 1, x_191);
+x_193 = lean_array_push(x_190, x_192);
+x_194 = lean_array_push(x_193, x_186);
+x_195 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+x_196 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_196, 0, x_57);
+lean_ctor_set(x_196, 1, x_195);
+lean_ctor_set(x_196, 2, x_194);
+x_197 = lean_ctor_get(x_144, 0);
+lean_inc(x_197);
+x_198 = lean_ctor_get(x_144, 1);
+lean_inc(x_198);
+if (lean_is_exclusive(x_144)) {
+ lean_ctor_release(x_144, 0);
+ lean_ctor_release(x_144, 1);
+ x_199 = x_144;
 } else {
- lean_dec_ref(x_132);
- x_189 = lean_box(0);
+ lean_dec_ref(x_144);
+ x_199 = lean_box(0);
 }
-x_190 = lean_array_push(x_188, x_186);
-if (lean_is_scalar(x_189)) {
- x_191 = lean_alloc_ctor(0, 2, 0);
+x_200 = lean_array_push(x_198, x_196);
+if (lean_is_scalar(x_199)) {
+ x_201 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_191 = x_189;
+ x_201 = x_199;
 }
-lean_ctor_set(x_191, 0, x_187);
-lean_ctor_set(x_191, 1, x_190);
-x_192 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
-x_193 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_193, 0, x_192);
-lean_ctor_set(x_193, 1, x_191);
-x_15 = x_193;
+lean_ctor_set(x_201, 0, x_197);
+lean_ctor_set(x_201, 1, x_200);
+x_202 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
+x_203 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_203, 0, x_202);
+lean_ctor_set(x_203, 1, x_201);
+x_15 = x_203;
+x_16 = x_62;
+goto block_23;
+}
+else
+{
+lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; 
+lean_dec(x_143);
+x_204 = lean_ctor_get(x_149, 0);
+lean_inc(x_204);
+lean_dec(x_149);
+x_205 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_206 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_206, 0, x_204);
+lean_ctor_set(x_206, 1, x_205);
+x_207 = lean_array_push(x_190, x_206);
+x_208 = lean_array_push(x_207, x_186);
+x_209 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+x_210 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_210, 0, x_57);
+lean_ctor_set(x_210, 1, x_209);
+lean_ctor_set(x_210, 2, x_208);
+x_211 = lean_ctor_get(x_144, 0);
+lean_inc(x_211);
+x_212 = lean_ctor_get(x_144, 1);
+lean_inc(x_212);
+if (lean_is_exclusive(x_144)) {
+ lean_ctor_release(x_144, 0);
+ lean_ctor_release(x_144, 1);
+ x_213 = x_144;
+} else {
+ lean_dec_ref(x_144);
+ x_213 = lean_box(0);
+}
+x_214 = lean_array_push(x_212, x_210);
+if (lean_is_scalar(x_213)) {
+ x_215 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_215 = x_213;
+}
+lean_ctor_set(x_215, 0, x_211);
+lean_ctor_set(x_215, 1, x_214);
+x_216 = l_Lean_Syntax_setArg(x_25, x_26, x_58);
+x_217 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_217, 0, x_216);
+lean_ctor_set(x_217, 1, x_215);
+x_15 = x_217;
 x_16 = x_62;
 goto block_23;
 }
@@ -1010,485 +1061,505 @@ goto block_23;
 }
 else
 {
-lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; 
-x_194 = lean_ctor_get(x_8, 0);
-x_195 = lean_ctor_get(x_8, 1);
-lean_inc(x_195);
-lean_inc(x_194);
+lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; 
+x_218 = lean_ctor_get(x_8, 0);
+x_219 = lean_ctor_get(x_8, 1);
+lean_inc(x_219);
+lean_inc(x_218);
 lean_dec(x_8);
-x_196 = lean_unsigned_to_nat(1u);
-x_197 = lean_nat_add(x_194, x_196);
-x_198 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_198, 0, x_197);
-lean_ctor_set(x_198, 1, x_195);
-x_199 = lean_ctor_get(x_7, 0);
-lean_inc(x_199);
-x_200 = lean_ctor_get(x_7, 1);
-lean_inc(x_200);
-x_201 = lean_ctor_get(x_7, 3);
-lean_inc(x_201);
-x_202 = lean_ctor_get(x_7, 4);
-lean_inc(x_202);
-x_203 = lean_ctor_get(x_7, 5);
-lean_inc(x_203);
-lean_inc(x_194);
-lean_inc(x_200);
-x_204 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_204, 0, x_199);
-lean_ctor_set(x_204, 1, x_200);
-lean_ctor_set(x_204, 2, x_194);
-lean_ctor_set(x_204, 3, x_201);
-lean_ctor_set(x_204, 4, x_202);
-lean_ctor_set(x_204, 5, x_203);
-lean_inc(x_204);
-x_205 = l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__1(x_6, x_204, x_198);
-x_206 = lean_ctor_get(x_205, 0);
-lean_inc(x_206);
-x_207 = lean_ctor_get(x_205, 1);
-lean_inc(x_207);
-lean_dec(x_205);
-x_208 = lean_ctor_get(x_206, 0);
-lean_inc(x_208);
-x_209 = lean_ctor_get(x_206, 1);
-lean_inc(x_209);
-lean_dec(x_206);
-x_210 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
-lean_inc(x_208);
-x_211 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_211, 0, x_208);
-lean_ctor_set(x_211, 1, x_210);
-x_212 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__17;
-x_213 = l_Lean_addMacroScope(x_200, x_212, x_194);
-x_214 = lean_box(0);
-x_215 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__16;
-x_216 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_216, 0, x_208);
-lean_ctor_set(x_216, 1, x_215);
-lean_ctor_set(x_216, 2, x_213);
-lean_ctor_set(x_216, 3, x_214);
-x_217 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
-x_218 = lean_array_push(x_217, x_211);
-x_219 = lean_array_push(x_218, x_216);
-x_220 = lean_box(2);
-x_221 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_221, 0, x_220);
-lean_ctor_set(x_221, 1, x_28);
-lean_ctor_set(x_221, 2, x_219);
-x_222 = l_Lean_Syntax_getArg(x_221, x_196);
-x_223 = l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__1(x_209, x_204, x_207);
-x_224 = lean_ctor_get(x_223, 0);
+x_220 = lean_unsigned_to_nat(1u);
+x_221 = lean_nat_add(x_218, x_220);
+x_222 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_222, 0, x_221);
+lean_ctor_set(x_222, 1, x_219);
+x_223 = lean_ctor_get(x_7, 0);
+lean_inc(x_223);
+x_224 = lean_ctor_get(x_7, 1);
 lean_inc(x_224);
-x_225 = lean_ctor_get(x_223, 1);
+x_225 = lean_ctor_get(x_7, 3);
 lean_inc(x_225);
-lean_dec(x_223);
-x_226 = lean_ctor_get(x_224, 0);
+x_226 = lean_ctor_get(x_7, 4);
 lean_inc(x_226);
-x_227 = lean_ctor_get(x_224, 1);
+x_227 = lean_ctor_get(x_7, 5);
 lean_inc(x_227);
-if (lean_is_exclusive(x_224)) {
- lean_ctor_release(x_224, 0);
- lean_ctor_release(x_224, 1);
- x_228 = x_224;
-} else {
- lean_dec_ref(x_224);
- x_228 = lean_box(0);
-}
-x_229 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__21;
-lean_inc(x_226);
-x_230 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_230, 0, x_226);
-lean_ctor_set(x_230, 1, x_229);
-x_231 = lean_unsigned_to_nat(2u);
-x_232 = l_Lean_Syntax_getArg(x_25, x_231);
-x_233 = l_Lean_Syntax_getHeadInfo_x3f(x_232);
-lean_dec(x_232);
-x_234 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__34;
-lean_inc(x_226);
+lean_inc(x_218);
+lean_inc(x_224);
+x_228 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_228, 0, x_223);
+lean_ctor_set(x_228, 1, x_224);
+lean_ctor_set(x_228, 2, x_218);
+lean_ctor_set(x_228, 3, x_225);
+lean_ctor_set(x_228, 4, x_226);
+lean_ctor_set(x_228, 5, x_227);
+lean_inc(x_228);
+x_229 = l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__1(x_6, x_228, x_222);
+x_230 = lean_ctor_get(x_229, 0);
+lean_inc(x_230);
+x_231 = lean_ctor_get(x_229, 1);
+lean_inc(x_231);
+lean_dec(x_229);
+x_232 = lean_ctor_get(x_230, 0);
+lean_inc(x_232);
+x_233 = lean_ctor_get(x_230, 1);
+lean_inc(x_233);
+lean_dec(x_230);
+x_234 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
+lean_inc(x_232);
 x_235 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_235, 0, x_226);
+lean_ctor_set(x_235, 0, x_232);
 lean_ctor_set(x_235, 1, x_234);
-x_236 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
-lean_inc(x_226);
-x_237 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_237, 0, x_226);
-lean_ctor_set(x_237, 1, x_236);
-x_238 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36;
-x_239 = lean_array_push(x_238, x_235);
-x_240 = lean_array_push(x_239, x_27);
-x_241 = lean_array_push(x_240, x_237);
-x_242 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__33;
-x_243 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_243, 0, x_220);
-lean_ctor_set(x_243, 1, x_242);
-lean_ctor_set(x_243, 2, x_241);
-x_244 = lean_array_push(x_217, x_243);
-x_245 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__25;
-x_246 = lean_array_push(x_244, x_245);
-x_247 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__31;
-x_248 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_248, 0, x_220);
-lean_ctor_set(x_248, 1, x_247);
-lean_ctor_set(x_248, 2, x_246);
-x_249 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
-x_250 = lean_array_push(x_249, x_248);
-x_251 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__24;
-x_252 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_252, 0, x_220);
-lean_ctor_set(x_252, 1, x_251);
-lean_ctor_set(x_252, 2, x_250);
-x_253 = lean_array_push(x_249, x_252);
-x_254 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
-x_255 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_255, 0, x_220);
-lean_ctor_set(x_255, 1, x_254);
-lean_ctor_set(x_255, 2, x_253);
-x_256 = lean_array_push(x_249, x_255);
-x_257 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__27;
-x_258 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_258, 0, x_220);
-lean_ctor_set(x_258, 1, x_257);
-lean_ctor_set(x_258, 2, x_256);
-x_259 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__38;
-x_260 = lean_array_push(x_259, x_230);
-x_261 = lean_array_push(x_260, x_222);
-x_262 = lean_array_push(x_261, x_245);
-if (lean_obj_tag(x_233) == 0)
-{
-lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 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_263 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
-x_264 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_264, 0, x_226);
+x_236 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__17;
+x_237 = l_Lean_addMacroScope(x_224, x_236, x_218);
+x_238 = lean_box(0);
+x_239 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__16;
+x_240 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_240, 0, x_232);
+lean_ctor_set(x_240, 1, x_239);
+lean_ctor_set(x_240, 2, x_237);
+lean_ctor_set(x_240, 3, x_238);
+x_241 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
+x_242 = lean_array_push(x_241, x_235);
+x_243 = lean_array_push(x_242, x_240);
+x_244 = lean_box(2);
+x_245 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_245, 0, x_244);
+lean_ctor_set(x_245, 1, x_28);
+lean_ctor_set(x_245, 2, x_243);
+x_246 = l_Lean_Syntax_getArg(x_245, x_220);
+x_247 = l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__1(x_233, x_228, x_231);
+x_248 = lean_ctor_get(x_247, 0);
+lean_inc(x_248);
+x_249 = lean_ctor_get(x_247, 1);
+lean_inc(x_249);
+lean_dec(x_247);
+x_250 = lean_ctor_get(x_248, 0);
+lean_inc(x_250);
+x_251 = lean_ctor_get(x_248, 1);
+lean_inc(x_251);
+if (lean_is_exclusive(x_248)) {
+ lean_ctor_release(x_248, 0);
+ lean_ctor_release(x_248, 1);
+ x_252 = x_248;
+} else {
+ lean_dec_ref(x_248);
+ x_252 = lean_box(0);
+}
+x_253 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__21;
+lean_inc(x_250);
+x_254 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_254, 0, x_250);
+lean_ctor_set(x_254, 1, x_253);
+x_255 = lean_unsigned_to_nat(2u);
+x_256 = l_Lean_Syntax_getArg(x_25, x_255);
+x_257 = l_Lean_Syntax_getHeadInfo_x3f(x_256);
+x_258 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__34;
+lean_inc(x_250);
+x_259 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_259, 0, x_250);
+lean_ctor_set(x_259, 1, x_258);
+x_260 = l_Lean_Syntax_getArg(x_25, x_13);
+x_261 = lean_array_push(x_241, x_260);
+x_262 = lean_array_push(x_261, x_256);
+x_263 = l_Lean_nullKind;
+x_264 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_264, 0, x_244);
 lean_ctor_set(x_264, 1, x_263);
-x_265 = lean_array_push(x_262, x_264);
-x_266 = lean_array_push(x_265, x_258);
-x_267 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
-x_268 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_268, 0, x_220);
-lean_ctor_set(x_268, 1, x_267);
-lean_ctor_set(x_268, 2, x_266);
-x_269 = lean_ctor_get(x_227, 0);
-lean_inc(x_269);
-x_270 = lean_ctor_get(x_227, 1);
-lean_inc(x_270);
-if (lean_is_exclusive(x_227)) {
- lean_ctor_release(x_227, 0);
- lean_ctor_release(x_227, 1);
- x_271 = x_227;
+lean_ctor_set(x_264, 2, x_262);
+x_265 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__35;
+lean_inc(x_250);
+x_266 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_266, 0, x_250);
+lean_ctor_set(x_266, 1, x_265);
+x_267 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__37;
+x_268 = lean_array_push(x_267, x_266);
+x_269 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__36;
+x_270 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_270, 0, x_244);
+lean_ctor_set(x_270, 1, x_269);
+lean_ctor_set(x_270, 2, x_268);
+x_271 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__38;
+x_272 = lean_array_push(x_271, x_259);
+x_273 = lean_array_push(x_272, x_264);
+x_274 = lean_array_push(x_273, x_270);
+x_275 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__33;
+x_276 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_276, 0, x_244);
+lean_ctor_set(x_276, 1, x_275);
+lean_ctor_set(x_276, 2, x_274);
+x_277 = lean_array_push(x_241, x_276);
+x_278 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__25;
+x_279 = lean_array_push(x_277, x_278);
+x_280 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__31;
+x_281 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_281, 0, x_244);
+lean_ctor_set(x_281, 1, x_280);
+lean_ctor_set(x_281, 2, x_279);
+x_282 = lean_array_push(x_241, x_27);
+x_283 = lean_array_push(x_282, x_278);
+x_284 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_284, 0, x_244);
+lean_ctor_set(x_284, 1, x_280);
+lean_ctor_set(x_284, 2, x_283);
+x_285 = lean_array_push(x_241, x_281);
+x_286 = lean_array_push(x_285, x_284);
+x_287 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__24;
+x_288 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_288, 0, x_244);
+lean_ctor_set(x_288, 1, x_287);
+lean_ctor_set(x_288, 2, x_286);
+x_289 = lean_array_push(x_267, x_288);
+x_290 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__29;
+x_291 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_291, 0, x_244);
+lean_ctor_set(x_291, 1, x_290);
+lean_ctor_set(x_291, 2, x_289);
+x_292 = lean_array_push(x_267, x_291);
+x_293 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__27;
+x_294 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_294, 0, x_244);
+lean_ctor_set(x_294, 1, x_293);
+lean_ctor_set(x_294, 2, x_292);
+x_295 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
+x_296 = lean_array_push(x_295, x_254);
+x_297 = lean_array_push(x_296, x_246);
+x_298 = lean_array_push(x_297, x_278);
+if (lean_obj_tag(x_257) == 0)
+{
+lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; 
+x_299 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_300 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_300, 0, x_250);
+lean_ctor_set(x_300, 1, x_299);
+x_301 = lean_array_push(x_298, x_300);
+x_302 = lean_array_push(x_301, x_294);
+x_303 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+x_304 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_304, 0, x_244);
+lean_ctor_set(x_304, 1, x_303);
+lean_ctor_set(x_304, 2, x_302);
+x_305 = lean_ctor_get(x_251, 0);
+lean_inc(x_305);
+x_306 = lean_ctor_get(x_251, 1);
+lean_inc(x_306);
+if (lean_is_exclusive(x_251)) {
+ lean_ctor_release(x_251, 0);
+ lean_ctor_release(x_251, 1);
+ x_307 = x_251;
 } else {
- lean_dec_ref(x_227);
- x_271 = lean_box(0);
+ lean_dec_ref(x_251);
+ x_307 = lean_box(0);
 }
-x_272 = lean_array_push(x_270, x_268);
-if (lean_is_scalar(x_271)) {
- x_273 = lean_alloc_ctor(0, 2, 0);
+x_308 = lean_array_push(x_306, x_304);
+if (lean_is_scalar(x_307)) {
+ x_309 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_273 = x_271;
+ x_309 = x_307;
 }
-lean_ctor_set(x_273, 0, x_269);
-lean_ctor_set(x_273, 1, x_272);
-x_274 = l_Lean_Syntax_setArg(x_25, x_26, x_221);
-if (lean_is_scalar(x_228)) {
- x_275 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_309, 0, x_305);
+lean_ctor_set(x_309, 1, x_308);
+x_310 = l_Lean_Syntax_setArg(x_25, x_26, x_245);
+if (lean_is_scalar(x_252)) {
+ x_311 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_275 = x_228;
+ x_311 = x_252;
 }
-lean_ctor_set(x_275, 0, x_274);
-lean_ctor_set(x_275, 1, x_273);
-x_15 = x_275;
-x_16 = x_225;
+lean_ctor_set(x_311, 0, x_310);
+lean_ctor_set(x_311, 1, x_309);
+x_15 = x_311;
+x_16 = x_249;
 goto block_23;
 }
 else
 {
-lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; 
-lean_dec(x_226);
-x_276 = lean_ctor_get(x_233, 0);
-lean_inc(x_276);
-lean_dec(x_233);
-x_277 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__39;
-x_278 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_278, 0, x_276);
-lean_ctor_set(x_278, 1, x_277);
-x_279 = lean_array_push(x_262, x_278);
-x_280 = lean_array_push(x_279, x_258);
-x_281 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
-x_282 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_282, 0, x_220);
-lean_ctor_set(x_282, 1, x_281);
-lean_ctor_set(x_282, 2, x_280);
-x_283 = lean_ctor_get(x_227, 0);
-lean_inc(x_283);
-x_284 = lean_ctor_get(x_227, 1);
-lean_inc(x_284);
-if (lean_is_exclusive(x_227)) {
- lean_ctor_release(x_227, 0);
- lean_ctor_release(x_227, 1);
- x_285 = x_227;
+lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; 
+lean_dec(x_250);
+x_312 = lean_ctor_get(x_257, 0);
+lean_inc(x_312);
+lean_dec(x_257);
+x_313 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_314 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_314, 0, x_312);
+lean_ctor_set(x_314, 1, x_313);
+x_315 = lean_array_push(x_298, x_314);
+x_316 = lean_array_push(x_315, x_294);
+x_317 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__22;
+x_318 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_318, 0, x_244);
+lean_ctor_set(x_318, 1, x_317);
+lean_ctor_set(x_318, 2, x_316);
+x_319 = lean_ctor_get(x_251, 0);
+lean_inc(x_319);
+x_320 = lean_ctor_get(x_251, 1);
+lean_inc(x_320);
+if (lean_is_exclusive(x_251)) {
+ lean_ctor_release(x_251, 0);
+ lean_ctor_release(x_251, 1);
+ x_321 = x_251;
 } else {
- lean_dec_ref(x_227);
- x_285 = lean_box(0);
+ lean_dec_ref(x_251);
+ x_321 = lean_box(0);
 }
-x_286 = lean_array_push(x_284, x_282);
-if (lean_is_scalar(x_285)) {
- x_287 = lean_alloc_ctor(0, 2, 0);
+x_322 = lean_array_push(x_320, x_318);
+if (lean_is_scalar(x_321)) {
+ x_323 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_287 = x_285;
+ x_323 = x_321;
 }
-lean_ctor_set(x_287, 0, x_283);
-lean_ctor_set(x_287, 1, x_286);
-x_288 = l_Lean_Syntax_setArg(x_25, x_26, x_221);
-if (lean_is_scalar(x_228)) {
- x_289 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_323, 0, x_319);
+lean_ctor_set(x_323, 1, x_322);
+x_324 = l_Lean_Syntax_setArg(x_25, x_26, x_245);
+if (lean_is_scalar(x_252)) {
+ x_325 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_289 = x_228;
+ x_325 = x_252;
 }
-lean_ctor_set(x_289, 0, x_288);
-lean_ctor_set(x_289, 1, x_287);
-x_15 = x_289;
-x_16 = x_225;
+lean_ctor_set(x_325, 0, x_324);
+lean_ctor_set(x_325, 1, x_323);
+x_15 = x_325;
+x_16 = x_249;
 goto block_23;
 }
 }
 }
 else
 {
-lean_object* x_290; lean_object* x_291; uint8_t x_292; lean_object* x_293; 
-x_290 = lean_array_get_size(x_2);
-x_291 = lean_unsigned_to_nat(1u);
-x_292 = lean_nat_dec_lt(x_291, x_290);
-lean_dec(x_290);
+lean_object* x_326; lean_object* x_327; uint8_t x_328; lean_object* x_329; 
+x_326 = lean_array_get_size(x_2);
+x_327 = lean_unsigned_to_nat(1u);
+x_328 = lean_nat_dec_lt(x_327, x_326);
+lean_dec(x_326);
 lean_inc(x_7);
 lean_inc(x_6);
-x_293 = l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__1(x_6, x_7, x_8);
-if (x_292 == 0)
+x_329 = l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__1(x_6, x_7, x_8);
+if (x_328 == 0)
 {
-lean_object* x_294; lean_object* x_295; lean_object* x_296; uint8_t x_297; 
+lean_object* x_330; lean_object* x_331; lean_object* x_332; uint8_t x_333; 
 lean_dec(x_6);
-x_294 = lean_ctor_get(x_293, 0);
-lean_inc(x_294);
-x_295 = lean_ctor_get(x_293, 1);
-lean_inc(x_295);
-lean_dec(x_293);
+x_330 = lean_ctor_get(x_329, 0);
+lean_inc(x_330);
+x_331 = lean_ctor_get(x_329, 1);
+lean_inc(x_331);
+lean_dec(x_329);
 lean_inc(x_1);
-x_296 = l_Lean_mkIdentFrom(x_27, x_1);
-x_297 = !lean_is_exclusive(x_294);
-if (x_297 == 0)
+x_332 = l_Lean_mkIdentFrom(x_27, x_1);
+x_333 = !lean_is_exclusive(x_330);
+if (x_333 == 0)
 {
-lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; uint8_t x_307; 
-x_298 = lean_ctor_get(x_294, 0);
-x_299 = lean_ctor_get(x_294, 1);
-x_300 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
-x_301 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_301, 0, x_298);
-lean_ctor_set(x_301, 1, x_300);
-x_302 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
-x_303 = lean_array_push(x_302, x_301);
-x_304 = lean_array_push(x_303, x_296);
-x_305 = lean_box(2);
-x_306 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_306, 0, x_305);
-lean_ctor_set(x_306, 1, x_28);
-lean_ctor_set(x_306, 2, x_304);
-x_307 = !lean_is_exclusive(x_299);
-if (x_307 == 0)
+lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; uint8_t x_343; 
+x_334 = lean_ctor_get(x_330, 0);
+x_335 = lean_ctor_get(x_330, 1);
+x_336 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
+x_337 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_337, 0, x_334);
+lean_ctor_set(x_337, 1, x_336);
+x_338 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
+x_339 = lean_array_push(x_338, x_337);
+x_340 = lean_array_push(x_339, x_332);
+x_341 = lean_box(2);
+x_342 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_342, 0, x_341);
+lean_ctor_set(x_342, 1, x_28);
+lean_ctor_set(x_342, 2, x_340);
+x_343 = !lean_is_exclusive(x_335);
+if (x_343 == 0)
 {
-lean_object* x_308; lean_object* x_309; lean_object* x_310; 
-x_308 = lean_ctor_get(x_299, 0);
-x_309 = lean_nat_add(x_308, x_291);
-lean_dec(x_308);
-lean_ctor_set(x_299, 0, x_309);
-x_310 = l_Lean_Syntax_setArg(x_25, x_26, x_306);
-lean_ctor_set(x_294, 0, x_310);
-x_15 = x_294;
-x_16 = x_295;
+lean_object* x_344; lean_object* x_345; lean_object* x_346; 
+x_344 = lean_ctor_get(x_335, 0);
+x_345 = lean_nat_add(x_344, x_327);
+lean_dec(x_344);
+lean_ctor_set(x_335, 0, x_345);
+x_346 = l_Lean_Syntax_setArg(x_25, x_26, x_342);
+lean_ctor_set(x_330, 0, x_346);
+x_15 = x_330;
+x_16 = x_331;
 goto block_23;
 }
 else
 {
-lean_object* x_311; lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; 
-x_311 = lean_ctor_get(x_299, 0);
-x_312 = lean_ctor_get(x_299, 1);
-lean_inc(x_312);
-lean_inc(x_311);
-lean_dec(x_299);
-x_313 = lean_nat_add(x_311, x_291);
-lean_dec(x_311);
-x_314 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_314, 0, x_313);
-lean_ctor_set(x_314, 1, x_312);
-x_315 = l_Lean_Syntax_setArg(x_25, x_26, x_306);
-lean_ctor_set(x_294, 1, x_314);
-lean_ctor_set(x_294, 0, x_315);
-x_15 = x_294;
-x_16 = x_295;
+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_335, 0);
+x_348 = lean_ctor_get(x_335, 1);
+lean_inc(x_348);
+lean_inc(x_347);
+lean_dec(x_335);
+x_349 = lean_nat_add(x_347, x_327);
+lean_dec(x_347);
+x_350 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_350, 0, x_349);
+lean_ctor_set(x_350, 1, x_348);
+x_351 = l_Lean_Syntax_setArg(x_25, x_26, x_342);
+lean_ctor_set(x_330, 1, x_350);
+lean_ctor_set(x_330, 0, x_351);
+x_15 = x_330;
+x_16 = x_331;
 goto block_23;
 }
 }
 else
 {
-lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; 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; lean_object* x_330; lean_object* x_331; 
-x_316 = lean_ctor_get(x_294, 0);
-x_317 = lean_ctor_get(x_294, 1);
-lean_inc(x_317);
-lean_inc(x_316);
-lean_dec(x_294);
-x_318 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
-x_319 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_319, 0, x_316);
-lean_ctor_set(x_319, 1, x_318);
-x_320 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
-x_321 = lean_array_push(x_320, x_319);
-x_322 = lean_array_push(x_321, x_296);
-x_323 = lean_box(2);
-x_324 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_324, 0, x_323);
-lean_ctor_set(x_324, 1, x_28);
-lean_ctor_set(x_324, 2, x_322);
-x_325 = lean_ctor_get(x_317, 0);
-lean_inc(x_325);
-x_326 = lean_ctor_get(x_317, 1);
-lean_inc(x_326);
-if (lean_is_exclusive(x_317)) {
- lean_ctor_release(x_317, 0);
- lean_ctor_release(x_317, 1);
- x_327 = x_317;
-} else {
- lean_dec_ref(x_317);
- x_327 = lean_box(0);
-}
-x_328 = lean_nat_add(x_325, x_291);
-lean_dec(x_325);
-if (lean_is_scalar(x_327)) {
- x_329 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_329 = x_327;
-}
-lean_ctor_set(x_329, 0, x_328);
-lean_ctor_set(x_329, 1, x_326);
-x_330 = l_Lean_Syntax_setArg(x_25, x_26, x_324);
-x_331 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_331, 0, x_330);
-lean_ctor_set(x_331, 1, x_329);
-x_15 = x_331;
-x_16 = x_295;
-goto block_23;
-}
-}
-else
-{
-lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; uint8_t x_339; 
-x_332 = lean_ctor_get(x_293, 0);
-lean_inc(x_332);
-x_333 = lean_ctor_get(x_293, 1);
-lean_inc(x_333);
-lean_dec(x_293);
-x_334 = lean_ctor_get(x_6, 0);
-lean_inc(x_334);
-lean_dec(x_6);
-x_335 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41;
-x_336 = lean_name_append_index_after(x_335, x_334);
-x_337 = l_Lean_Name_append(x_1, x_336);
-x_338 = l_Lean_mkIdentFrom(x_27, x_337);
-x_339 = !lean_is_exclusive(x_332);
-if (x_339 == 0)
-{
-lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; uint8_t x_349; 
-x_340 = lean_ctor_get(x_332, 0);
-x_341 = lean_ctor_get(x_332, 1);
-x_342 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
-x_343 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_343, 0, x_340);
-lean_ctor_set(x_343, 1, x_342);
-x_344 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
-x_345 = lean_array_push(x_344, x_343);
-x_346 = lean_array_push(x_345, x_338);
-x_347 = lean_box(2);
-x_348 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_348, 0, x_347);
-lean_ctor_set(x_348, 1, x_28);
-lean_ctor_set(x_348, 2, x_346);
-x_349 = !lean_is_exclusive(x_341);
-if (x_349 == 0)
-{
-lean_object* x_350; lean_object* x_351; lean_object* x_352; 
-x_350 = lean_ctor_get(x_341, 0);
-x_351 = lean_nat_add(x_350, x_291);
-lean_dec(x_350);
-lean_ctor_set(x_341, 0, x_351);
-x_352 = l_Lean_Syntax_setArg(x_25, x_26, x_348);
-lean_ctor_set(x_332, 0, x_352);
-x_15 = x_332;
-x_16 = x_333;
-goto block_23;
-}
-else
-{
-lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; 
-x_353 = lean_ctor_get(x_341, 0);
-x_354 = lean_ctor_get(x_341, 1);
-lean_inc(x_354);
+lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; 
+x_352 = lean_ctor_get(x_330, 0);
+x_353 = lean_ctor_get(x_330, 1);
 lean_inc(x_353);
-lean_dec(x_341);
-x_355 = lean_nat_add(x_353, x_291);
-lean_dec(x_353);
-x_356 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_356, 0, x_355);
-lean_ctor_set(x_356, 1, x_354);
-x_357 = l_Lean_Syntax_setArg(x_25, x_26, x_348);
-lean_ctor_set(x_332, 1, x_356);
-lean_ctor_set(x_332, 0, x_357);
-x_15 = x_332;
-x_16 = x_333;
+lean_inc(x_352);
+lean_dec(x_330);
+x_354 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
+x_355 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_355, 0, x_352);
+lean_ctor_set(x_355, 1, x_354);
+x_356 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
+x_357 = lean_array_push(x_356, x_355);
+x_358 = lean_array_push(x_357, x_332);
+x_359 = lean_box(2);
+x_360 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_360, 0, x_359);
+lean_ctor_set(x_360, 1, x_28);
+lean_ctor_set(x_360, 2, x_358);
+x_361 = lean_ctor_get(x_353, 0);
+lean_inc(x_361);
+x_362 = lean_ctor_get(x_353, 1);
+lean_inc(x_362);
+if (lean_is_exclusive(x_353)) {
+ lean_ctor_release(x_353, 0);
+ lean_ctor_release(x_353, 1);
+ x_363 = x_353;
+} else {
+ lean_dec_ref(x_353);
+ x_363 = lean_box(0);
+}
+x_364 = lean_nat_add(x_361, x_327);
+lean_dec(x_361);
+if (lean_is_scalar(x_363)) {
+ x_365 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_365 = x_363;
+}
+lean_ctor_set(x_365, 0, x_364);
+lean_ctor_set(x_365, 1, x_362);
+x_366 = l_Lean_Syntax_setArg(x_25, x_26, x_360);
+x_367 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_367, 0, x_366);
+lean_ctor_set(x_367, 1, x_365);
+x_15 = x_367;
+x_16 = x_331;
 goto block_23;
 }
 }
 else
 {
-lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; 
-x_358 = lean_ctor_get(x_332, 0);
-x_359 = lean_ctor_get(x_332, 1);
-lean_inc(x_359);
-lean_inc(x_358);
-lean_dec(x_332);
-x_360 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
-x_361 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_361, 0, x_358);
-lean_ctor_set(x_361, 1, x_360);
-x_362 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
-x_363 = lean_array_push(x_362, x_361);
-x_364 = lean_array_push(x_363, x_338);
-x_365 = lean_box(2);
-x_366 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_366, 0, x_365);
-lean_ctor_set(x_366, 1, x_28);
-lean_ctor_set(x_366, 2, x_364);
-x_367 = lean_ctor_get(x_359, 0);
-lean_inc(x_367);
-x_368 = lean_ctor_get(x_359, 1);
+lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; uint8_t x_375; 
+x_368 = lean_ctor_get(x_329, 0);
 lean_inc(x_368);
-if (lean_is_exclusive(x_359)) {
- lean_ctor_release(x_359, 0);
- lean_ctor_release(x_359, 1);
- x_369 = x_359;
-} else {
- lean_dec_ref(x_359);
- x_369 = lean_box(0);
+x_369 = lean_ctor_get(x_329, 1);
+lean_inc(x_369);
+lean_dec(x_329);
+x_370 = lean_ctor_get(x_6, 0);
+lean_inc(x_370);
+lean_dec(x_6);
+x_371 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__42;
+x_372 = lean_name_append_index_after(x_371, x_370);
+x_373 = l_Lean_Name_append(x_1, x_372);
+x_374 = l_Lean_mkIdentFrom(x_27, x_373);
+x_375 = !lean_is_exclusive(x_368);
+if (x_375 == 0)
+{
+lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; uint8_t x_385; 
+x_376 = lean_ctor_get(x_368, 0);
+x_377 = lean_ctor_get(x_368, 1);
+x_378 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
+x_379 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_379, 0, x_376);
+lean_ctor_set(x_379, 1, x_378);
+x_380 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
+x_381 = lean_array_push(x_380, x_379);
+x_382 = lean_array_push(x_381, x_374);
+x_383 = lean_box(2);
+x_384 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_384, 0, x_383);
+lean_ctor_set(x_384, 1, x_28);
+lean_ctor_set(x_384, 2, x_382);
+x_385 = !lean_is_exclusive(x_377);
+if (x_385 == 0)
+{
+lean_object* x_386; lean_object* x_387; lean_object* x_388; 
+x_386 = lean_ctor_get(x_377, 0);
+x_387 = lean_nat_add(x_386, x_327);
+lean_dec(x_386);
+lean_ctor_set(x_377, 0, x_387);
+x_388 = l_Lean_Syntax_setArg(x_25, x_26, x_384);
+lean_ctor_set(x_368, 0, x_388);
+x_15 = x_368;
+x_16 = x_369;
+goto block_23;
 }
-x_370 = lean_nat_add(x_367, x_291);
-lean_dec(x_367);
-if (lean_is_scalar(x_369)) {
- x_371 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_371 = x_369;
+else
+{
+lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; 
+x_389 = lean_ctor_get(x_377, 0);
+x_390 = lean_ctor_get(x_377, 1);
+lean_inc(x_390);
+lean_inc(x_389);
+lean_dec(x_377);
+x_391 = lean_nat_add(x_389, x_327);
+lean_dec(x_389);
+x_392 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_392, 0, x_391);
+lean_ctor_set(x_392, 1, x_390);
+x_393 = l_Lean_Syntax_setArg(x_25, x_26, x_384);
+lean_ctor_set(x_368, 1, x_392);
+lean_ctor_set(x_368, 0, x_393);
+x_15 = x_368;
+x_16 = x_369;
+goto block_23;
 }
-lean_ctor_set(x_371, 0, x_370);
-lean_ctor_set(x_371, 1, x_368);
-x_372 = l_Lean_Syntax_setArg(x_25, x_26, x_366);
-x_373 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_373, 0, x_372);
-lean_ctor_set(x_373, 1, x_371);
-x_15 = x_373;
-x_16 = x_333;
+}
+else
+{
+lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; lean_object* x_403; lean_object* x_404; lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; 
+x_394 = lean_ctor_get(x_368, 0);
+x_395 = lean_ctor_get(x_368, 1);
+lean_inc(x_395);
+lean_inc(x_394);
+lean_dec(x_368);
+x_396 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__13;
+x_397 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_397, 0, x_394);
+lean_ctor_set(x_397, 1, x_396);
+x_398 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__18;
+x_399 = lean_array_push(x_398, x_397);
+x_400 = lean_array_push(x_399, x_374);
+x_401 = lean_box(2);
+x_402 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_402, 0, x_401);
+lean_ctor_set(x_402, 1, x_28);
+lean_ctor_set(x_402, 2, x_400);
+x_403 = lean_ctor_get(x_395, 0);
+lean_inc(x_403);
+x_404 = lean_ctor_get(x_395, 1);
+lean_inc(x_404);
+if (lean_is_exclusive(x_395)) {
+ lean_ctor_release(x_395, 0);
+ lean_ctor_release(x_395, 1);
+ x_405 = x_395;
+} else {
+ lean_dec_ref(x_395);
+ x_405 = lean_box(0);
+}
+x_406 = lean_nat_add(x_403, x_327);
+lean_dec(x_403);
+if (lean_is_scalar(x_405)) {
+ x_407 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_407 = x_405;
+}
+lean_ctor_set(x_407, 0, x_406);
+lean_ctor_set(x_407, 1, x_404);
+x_408 = l_Lean_Syntax_setArg(x_25, x_26, x_402);
+x_409 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_409, 0, x_408);
+lean_ctor_set(x_409, 1, x_407);
+x_15 = x_409;
+x_16 = x_369;
 goto block_23;
 }
 }
@@ -1496,12 +1567,12 @@ goto block_23;
 }
 else
 {
-lean_object* x_374; 
+lean_object* x_410; 
 lean_dec(x_27);
-x_374 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_374, 0, x_25);
-lean_ctor_set(x_374, 1, x_6);
-x_15 = x_374;
+x_410 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_410, 0, x_25);
+lean_ctor_set(x_410, 1, x_6);
+x_15 = x_410;
 x_16 = x_8;
 goto block_23;
 }
@@ -1530,7 +1601,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__6;
-x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2841,7 +2912,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__20;
-x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40;
+x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2924,7 +2995,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(48u);
+x_1 = lean_unsigned_to_nat(53u);
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -2936,7 +3007,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(53u);
+x_1 = lean_unsigned_to_nat(58u);
 x_2 = lean_unsigned_to_nat(52u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -2964,7 +3035,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(48u);
+x_1 = lean_unsigned_to_nat(53u);
 x_2 = lean_unsigned_to_nat(4u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -2976,7 +3047,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalMatch_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(48u);
+x_1 = lean_unsigned_to_nat(53u);
 x_2 = lean_unsigned_to_nat(13u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -3135,6 +3206,8 @@ l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic
 lean_mark_persistent(l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__40);
 l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41 = _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41();
 lean_mark_persistent(l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__41);
+l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__42 = _init_l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__42();
+lean_mark_persistent(l_Array_mapMUnsafe_map___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___spec__2___closed__42);
 l___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___closed__1 = _init_l___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___closed__1);
 l___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___closed__2 = _init_l___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___closed__2();
diff --git a/stage0/stdlib/Lean/Meta/Eqns.c b/stage0/stdlib/Lean/Meta/Eqns.c
index 1a1a698fb0..49764e2305 100644
--- a/stage0/stdlib/Lean/Meta/Eqns.c
+++ b/stage0/stdlib/Lean/Meta/Eqns.c
@@ -38,6 +38,8 @@ static lean_object* l_Lean_Meta_EqnsExtState_map___default___closed__2;
 uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_getEqnsFor_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 static size_t l_Std_PersistentHashMap_findAux___at_Lean_Meta_getEqnsFor_x3f___spec__2___closed__2;
+static lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_242____closed__1;
 static lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10;
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -47,7 +49,8 @@ LEAN_EXPORT lean_object* l_Lean_Meta_lambdaTelescope___at___private_Lean_Meta_Eq
 size_t lean_usize_shift_right(size_t, size_t);
 static size_t l_Std_PersistentHashMap_findAux___at_Lean_Meta_getEqnsFor_x3f___spec__2___closed__1;
 static lean_object* l_Lean_Meta_registerGetEqnsFn___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_getEqnsFor_x3f___closed__5;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_registerGetEqnsFn___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkEqRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -67,6 +70,7 @@ lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* l_Lean_KernelException_toMessageData(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_EqnsExtState_map___default;
+lean_object* l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkLambdaFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
@@ -79,13 +83,14 @@ LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec_
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Eqns_0__Lean_Meta_shouldGenerateEqnThms(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_shift_left(size_t, size_t);
+static lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2;
 lean_object* l_Lean_Meta_InfoCacheKey_instHashableInfoCacheKey___boxed(lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__4;
 static lean_object* l___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm___lambda__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__2;
 static lean_object* l___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm___lambda__1___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_911_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_926_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_242_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_16_(lean_object*);
 static lean_object* l_Lean_Meta_getEqnsFor_x3f___closed__2;
@@ -100,24 +105,30 @@ size_t lean_usize_land(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_registerGetEqnsFn(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_getEqnsFor_x3f___closed__1;
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_getEqnsFor_x3f___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwKernelException___at___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_le(size_t, size_t);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Meta_getUnfoldEqnFor_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkPrivateName(lean_object*, lean_object*);
 lean_object* l_Lean_Name_append(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_getEqnsFor_x3f___closed__3;
 lean_object* l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_getEqnsFor_x3f___spec__5(lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_getEqnsFor_x3f___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instHashableProd___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_eqnsExt;
 static lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__3;
 extern lean_object* l_Lean_Expr_instBEqExpr;
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_EqnsExtState_map___default___closed__1;
+static lean_object* l_Lean_Meta_getEqnsFor_x3f___closed__4;
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_lambdaTelescopeImp___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_getEqnsFor_x3f___spec__4(lean_object*, lean_object*, lean_object*);
@@ -129,7 +140,7 @@ LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Me
 static lean_object* l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__5;
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_getEqnsFor_x3f___spec__5___closed__1;
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1;
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_registerGetUnfoldEqnFn(lean_object*, lean_object*);
@@ -2721,330 +2732,369 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 if (x_1 == 0)
 {
-lean_object* x_11; lean_object* x_12; 
+lean_object* x_12; lean_object* x_13; 
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_11 = lean_box(0);
-x_12 = lean_apply_6(x_2, x_11, x_6, x_7, x_8, x_9, x_10);
-return x_12;
-}
-else
-{
-lean_object* x_13; 
-lean_dec(x_2);
-lean_inc(x_9);
-lean_inc(x_7);
-lean_inc(x_3);
-x_13 = l___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm(x_3, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-if (lean_obj_tag(x_14) == 0)
-{
-uint8_t x_15; 
-lean_dec(x_9);
-lean_dec(x_7);
-lean_dec(x_3);
-x_15 = !lean_is_exclusive(x_13);
-if (x_15 == 0)
-{
-lean_object* x_16; 
-x_16 = lean_ctor_get(x_13, 0);
-lean_dec(x_16);
-lean_ctor_set(x_13, 0, x_4);
+x_12 = lean_box(0);
+x_13 = lean_apply_6(x_2, x_12, x_7, x_8, x_9, x_10, x_11);
 return x_13;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; 
-x_17 = lean_ctor_get(x_13, 1);
-lean_inc(x_17);
-lean_dec(x_13);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_4);
-lean_ctor_set(x_18, 1, x_17);
-return x_18;
+lean_object* x_14; 
+lean_dec(x_2);
+lean_inc(x_10);
+lean_inc(x_8);
+lean_inc(x_3);
+x_14 = l___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm(x_3, x_7, x_8, x_9, x_10, x_11);
+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_10);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_3);
+x_16 = !lean_is_exclusive(x_14);
+if (x_16 == 0)
+{
+lean_object* x_17; 
+x_17 = lean_ctor_get(x_14, 0);
+lean_dec(x_17);
+lean_ctor_set(x_14, 0, x_4);
+return x_14;
+}
+else
+{
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_14, 1);
+lean_inc(x_18);
+lean_dec(x_14);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_4);
+lean_ctor_set(x_19, 1, x_18);
+return x_19;
 }
 }
 else
 {
-lean_object* x_19; uint8_t x_20; 
+lean_object* x_20; uint8_t x_21; 
 lean_dec(x_4);
-x_19 = lean_ctor_get(x_13, 1);
-lean_inc(x_19);
-lean_dec(x_13);
-x_20 = !lean_is_exclusive(x_14);
-if (x_20 == 0)
+x_20 = lean_ctor_get(x_14, 1);
+lean_inc(x_20);
+lean_dec(x_14);
+x_21 = !lean_is_exclusive(x_15);
+if (x_21 == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; 
-x_21 = lean_ctor_get(x_14, 0);
-x_22 = l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1;
-x_23 = lean_array_push(x_22, x_21);
-x_24 = lean_st_ref_take(x_9, x_19);
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-x_26 = lean_ctor_get(x_24, 1);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; 
+x_22 = lean_ctor_get(x_15, 0);
+x_23 = l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1;
+x_24 = lean_array_push(x_23, x_22);
+x_25 = lean_st_ref_take(x_10, x_20);
+x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
-lean_dec(x_24);
-x_27 = !lean_is_exclusive(x_25);
-if (x_27 == 0)
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 
-x_28 = lean_ctor_get(x_25, 0);
-x_29 = lean_ctor_get(x_25, 4);
-lean_dec(x_29);
-lean_inc(x_23);
-x_30 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1), 3, 2);
-lean_closure_set(x_30, 0, x_3);
-lean_closure_set(x_30, 1, x_23);
-x_31 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
-x_32 = l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(x_31, x_28, x_30);
-x_33 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__2;
-lean_ctor_set(x_25, 4, x_33);
-lean_ctor_set(x_25, 0, x_32);
-x_34 = lean_st_ref_set(x_9, x_25, x_26);
-x_35 = lean_ctor_get(x_34, 1);
-lean_inc(x_35);
-lean_dec(x_34);
-x_36 = lean_st_ref_get(x_9, x_35);
-lean_dec(x_9);
-x_37 = lean_ctor_get(x_36, 1);
-lean_inc(x_37);
-lean_dec(x_36);
-x_38 = lean_st_ref_take(x_7, x_37);
-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_is_exclusive(x_39);
-if (x_41 == 0)
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; 
-x_42 = lean_ctor_get(x_39, 1);
-lean_dec(x_42);
-x_43 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10;
-lean_ctor_set(x_39, 1, x_43);
-x_44 = lean_st_ref_set(x_7, x_39, x_40);
-lean_dec(x_7);
-x_45 = !lean_is_exclusive(x_44);
-if (x_45 == 0)
-{
-lean_object* x_46; 
-x_46 = lean_ctor_get(x_44, 0);
-lean_dec(x_46);
-lean_ctor_set(x_14, 0, x_23);
-lean_ctor_set(x_44, 0, x_14);
-return x_44;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; 
-x_47 = lean_ctor_get(x_44, 1);
-lean_inc(x_47);
-lean_dec(x_44);
-lean_ctor_set(x_14, 0, x_23);
-x_48 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_48, 0, x_14);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
-}
-}
-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; 
-x_49 = lean_ctor_get(x_39, 0);
-x_50 = lean_ctor_get(x_39, 2);
-x_51 = lean_ctor_get(x_39, 3);
-lean_inc(x_51);
-lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_39);
-x_52 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10;
-x_53 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_53, 0, x_49);
-lean_ctor_set(x_53, 1, x_52);
-lean_ctor_set(x_53, 2, x_50);
-lean_ctor_set(x_53, 3, x_51);
-x_54 = lean_st_ref_set(x_7, x_53, x_40);
-lean_dec(x_7);
-x_55 = lean_ctor_get(x_54, 1);
-lean_inc(x_55);
-if (lean_is_exclusive(x_54)) {
- lean_ctor_release(x_54, 0);
- lean_ctor_release(x_54, 1);
- x_56 = x_54;
-} else {
- lean_dec_ref(x_54);
- x_56 = lean_box(0);
-}
-lean_ctor_set(x_14, 0, x_23);
-if (lean_is_scalar(x_56)) {
- x_57 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_57 = x_56;
-}
-lean_ctor_set(x_57, 0, x_14);
-lean_ctor_set(x_57, 1, x_55);
-return x_57;
-}
-}
-else
-{
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_58 = lean_ctor_get(x_25, 0);
-x_59 = lean_ctor_get(x_25, 1);
-x_60 = lean_ctor_get(x_25, 2);
-x_61 = lean_ctor_get(x_25, 3);
-lean_inc(x_61);
-lean_inc(x_60);
-lean_inc(x_59);
-lean_inc(x_58);
+x_27 = lean_ctor_get(x_25, 1);
+lean_inc(x_27);
 lean_dec(x_25);
-lean_inc(x_23);
-x_62 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1), 3, 2);
-lean_closure_set(x_62, 0, x_3);
-lean_closure_set(x_62, 1, x_23);
-x_63 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
-x_64 = l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(x_63, x_58, x_62);
-x_65 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__2;
-x_66 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_59);
-lean_ctor_set(x_66, 2, x_60);
-lean_ctor_set(x_66, 3, x_61);
-lean_ctor_set(x_66, 4, x_65);
-x_67 = lean_st_ref_set(x_9, x_66, x_26);
-x_68 = lean_ctor_get(x_67, 1);
-lean_inc(x_68);
-lean_dec(x_67);
-x_69 = lean_st_ref_get(x_9, x_68);
-lean_dec(x_9);
-x_70 = lean_ctor_get(x_69, 1);
-lean_inc(x_70);
-lean_dec(x_69);
-x_71 = lean_st_ref_take(x_7, x_70);
-x_72 = lean_ctor_get(x_71, 0);
+x_28 = !lean_is_exclusive(x_26);
+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; 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; uint8_t x_44; 
+x_29 = lean_ctor_get(x_26, 0);
+x_30 = lean_ctor_get(x_26, 4);
+lean_dec(x_30);
+lean_inc(x_24);
+x_31 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1), 3, 2);
+lean_closure_set(x_31, 0, x_3);
+lean_closure_set(x_31, 1, x_24);
+x_32 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
+x_33 = l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(x_32, x_29, x_31);
+x_34 = lean_unsigned_to_nat(0u);
+lean_inc(x_5);
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_5);
+lean_ctor_set(x_35, 1, x_34);
+lean_inc(x_35);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_35);
+lean_ctor_set(x_26, 4, x_36);
+lean_ctor_set(x_26, 0, x_33);
+x_37 = lean_st_ref_set(x_10, x_26, x_27);
+x_38 = lean_ctor_get(x_37, 1);
+lean_inc(x_38);
+lean_dec(x_37);
+x_39 = lean_st_ref_get(x_10, x_38);
+lean_dec(x_10);
+x_40 = lean_ctor_get(x_39, 1);
+lean_inc(x_40);
+lean_dec(x_39);
+x_41 = lean_st_ref_take(x_8, x_40);
+x_42 = lean_ctor_get(x_41, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = !lean_is_exclusive(x_42);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; 
+x_45 = lean_ctor_get(x_42, 1);
+lean_dec(x_45);
+lean_inc(x_5);
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_5);
+lean_ctor_set(x_46, 1, x_34);
+lean_inc(x_5);
+x_47 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_47, 0, x_5);
+lean_ctor_set(x_47, 1, x_34);
+lean_inc(x_5);
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_5);
+lean_ctor_set(x_48, 1, x_34);
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_5);
+lean_ctor_set(x_49, 1, x_34);
+lean_inc(x_49);
+lean_inc_n(x_46, 2);
+x_50 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_50, 0, x_46);
+lean_ctor_set(x_50, 1, x_47);
+lean_ctor_set(x_50, 2, x_48);
+lean_ctor_set(x_50, 3, x_46);
+lean_ctor_set(x_50, 4, x_46);
+lean_ctor_set(x_50, 5, x_49);
+lean_ctor_set(x_50, 6, x_49);
+lean_ctor_set(x_42, 1, x_50);
+x_51 = lean_st_ref_set(x_8, x_42, x_43);
+lean_dec(x_8);
+x_52 = !lean_is_exclusive(x_51);
+if (x_52 == 0)
+{
+lean_object* x_53; 
+x_53 = lean_ctor_get(x_51, 0);
+lean_dec(x_53);
+lean_ctor_set(x_15, 0, x_24);
+lean_ctor_set(x_51, 0, x_15);
+return x_51;
+}
+else
+{
+lean_object* x_54; lean_object* x_55; 
+x_54 = lean_ctor_get(x_51, 1);
+lean_inc(x_54);
+lean_dec(x_51);
+lean_ctor_set(x_15, 0, x_24);
+x_55 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_55, 0, x_15);
+lean_ctor_set(x_55, 1, x_54);
+return x_55;
+}
+}
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_56 = lean_ctor_get(x_42, 0);
+x_57 = lean_ctor_get(x_42, 2);
+x_58 = lean_ctor_get(x_42, 3);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_dec(x_42);
+lean_inc(x_5);
+x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_59, 0, x_5);
+lean_ctor_set(x_59, 1, x_34);
+lean_inc(x_5);
+x_60 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_60, 0, x_5);
+lean_ctor_set(x_60, 1, x_34);
+lean_inc(x_5);
+x_61 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_61, 0, x_5);
+lean_ctor_set(x_61, 1, x_34);
+x_62 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_62, 0, x_5);
+lean_ctor_set(x_62, 1, x_34);
+lean_inc(x_62);
+lean_inc_n(x_59, 2);
+x_63 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_63, 0, x_59);
+lean_ctor_set(x_63, 1, x_60);
+lean_ctor_set(x_63, 2, x_61);
+lean_ctor_set(x_63, 3, x_59);
+lean_ctor_set(x_63, 4, x_59);
+lean_ctor_set(x_63, 5, x_62);
+lean_ctor_set(x_63, 6, x_62);
+x_64 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_64, 0, x_56);
+lean_ctor_set(x_64, 1, x_63);
+lean_ctor_set(x_64, 2, x_57);
+lean_ctor_set(x_64, 3, x_58);
+x_65 = lean_st_ref_set(x_8, x_64, x_43);
+lean_dec(x_8);
+x_66 = lean_ctor_get(x_65, 1);
+lean_inc(x_66);
+if (lean_is_exclusive(x_65)) {
+ lean_ctor_release(x_65, 0);
+ lean_ctor_release(x_65, 1);
+ x_67 = x_65;
+} else {
+ lean_dec_ref(x_65);
+ x_67 = lean_box(0);
+}
+lean_ctor_set(x_15, 0, x_24);
+if (lean_is_scalar(x_67)) {
+ x_68 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_68 = x_67;
+}
+lean_ctor_set(x_68, 0, x_15);
+lean_ctor_set(x_68, 1, x_66);
+return x_68;
+}
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_69 = lean_ctor_get(x_26, 0);
+x_70 = lean_ctor_get(x_26, 1);
+x_71 = lean_ctor_get(x_26, 2);
+x_72 = lean_ctor_get(x_26, 3);
 lean_inc(x_72);
-x_73 = lean_ctor_get(x_71, 1);
-lean_inc(x_73);
-lean_dec(x_71);
-x_74 = lean_ctor_get(x_72, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_72, 2);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_72, 3);
-lean_inc(x_76);
-if (lean_is_exclusive(x_72)) {
- lean_ctor_release(x_72, 0);
- lean_ctor_release(x_72, 1);
- lean_ctor_release(x_72, 2);
- lean_ctor_release(x_72, 3);
- x_77 = x_72;
-} else {
- lean_dec_ref(x_72);
- x_77 = lean_box(0);
-}
-x_78 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10;
-if (lean_is_scalar(x_77)) {
- x_79 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_79 = x_77;
-}
-lean_ctor_set(x_79, 0, x_74);
-lean_ctor_set(x_79, 1, x_78);
-lean_ctor_set(x_79, 2, x_75);
-lean_ctor_set(x_79, 3, x_76);
-x_80 = lean_st_ref_set(x_7, x_79, x_73);
-lean_dec(x_7);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_26);
+lean_inc(x_24);
+x_73 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1), 3, 2);
+lean_closure_set(x_73, 0, x_3);
+lean_closure_set(x_73, 1, x_24);
+x_74 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
+x_75 = l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(x_74, x_69, x_73);
+x_76 = lean_unsigned_to_nat(0u);
+lean_inc(x_5);
+x_77 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_77, 0, x_5);
+lean_ctor_set(x_77, 1, x_76);
+lean_inc(x_77);
+x_78 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_78, 0, x_77);
+lean_ctor_set(x_78, 1, x_77);
+x_79 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_79, 0, x_75);
+lean_ctor_set(x_79, 1, x_70);
+lean_ctor_set(x_79, 2, x_71);
+lean_ctor_set(x_79, 3, x_72);
+lean_ctor_set(x_79, 4, x_78);
+x_80 = lean_st_ref_set(x_10, x_79, x_27);
 x_81 = lean_ctor_get(x_80, 1);
 lean_inc(x_81);
-if (lean_is_exclusive(x_80)) {
- lean_ctor_release(x_80, 0);
- lean_ctor_release(x_80, 1);
- x_82 = x_80;
+lean_dec(x_80);
+x_82 = lean_st_ref_get(x_10, x_81);
+lean_dec(x_10);
+x_83 = lean_ctor_get(x_82, 1);
+lean_inc(x_83);
+lean_dec(x_82);
+x_84 = lean_st_ref_take(x_8, x_83);
+x_85 = lean_ctor_get(x_84, 0);
+lean_inc(x_85);
+x_86 = lean_ctor_get(x_84, 1);
+lean_inc(x_86);
+lean_dec(x_84);
+x_87 = lean_ctor_get(x_85, 0);
+lean_inc(x_87);
+x_88 = lean_ctor_get(x_85, 2);
+lean_inc(x_88);
+x_89 = lean_ctor_get(x_85, 3);
+lean_inc(x_89);
+if (lean_is_exclusive(x_85)) {
+ lean_ctor_release(x_85, 0);
+ lean_ctor_release(x_85, 1);
+ lean_ctor_release(x_85, 2);
+ lean_ctor_release(x_85, 3);
+ x_90 = x_85;
 } else {
- lean_dec_ref(x_80);
- x_82 = lean_box(0);
+ lean_dec_ref(x_85);
+ x_90 = lean_box(0);
 }
-lean_ctor_set(x_14, 0, x_23);
-if (lean_is_scalar(x_82)) {
- x_83 = lean_alloc_ctor(0, 2, 0);
+lean_inc(x_5);
+x_91 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_91, 0, x_5);
+lean_ctor_set(x_91, 1, x_76);
+lean_inc(x_5);
+x_92 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_92, 0, x_5);
+lean_ctor_set(x_92, 1, x_76);
+lean_inc(x_5);
+x_93 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_93, 0, x_5);
+lean_ctor_set(x_93, 1, x_76);
+x_94 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_94, 0, x_5);
+lean_ctor_set(x_94, 1, x_76);
+lean_inc(x_94);
+lean_inc_n(x_91, 2);
+x_95 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_95, 0, x_91);
+lean_ctor_set(x_95, 1, x_92);
+lean_ctor_set(x_95, 2, x_93);
+lean_ctor_set(x_95, 3, x_91);
+lean_ctor_set(x_95, 4, x_91);
+lean_ctor_set(x_95, 5, x_94);
+lean_ctor_set(x_95, 6, x_94);
+if (lean_is_scalar(x_90)) {
+ x_96 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_83 = x_82;
+ x_96 = x_90;
 }
-lean_ctor_set(x_83, 0, x_14);
-lean_ctor_set(x_83, 1, x_81);
-return x_83;
+lean_ctor_set(x_96, 0, x_87);
+lean_ctor_set(x_96, 1, x_95);
+lean_ctor_set(x_96, 2, x_88);
+lean_ctor_set(x_96, 3, x_89);
+x_97 = lean_st_ref_set(x_8, x_96, x_86);
+lean_dec(x_8);
+x_98 = lean_ctor_get(x_97, 1);
+lean_inc(x_98);
+if (lean_is_exclusive(x_97)) {
+ lean_ctor_release(x_97, 0);
+ lean_ctor_release(x_97, 1);
+ x_99 = x_97;
+} else {
+ lean_dec_ref(x_97);
+ x_99 = lean_box(0);
+}
+lean_ctor_set(x_15, 0, x_24);
+if (lean_is_scalar(x_99)) {
+ x_100 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_100 = x_99;
+}
+lean_ctor_set(x_100, 0, x_15);
+lean_ctor_set(x_100, 1, x_98);
+return x_100;
 }
 }
 else
 {
-lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
-x_84 = lean_ctor_get(x_14, 0);
-lean_inc(x_84);
-lean_dec(x_14);
-x_85 = l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1;
-x_86 = lean_array_push(x_85, x_84);
-x_87 = lean_st_ref_take(x_9, x_19);
-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_90 = lean_ctor_get(x_88, 0);
-lean_inc(x_90);
-x_91 = lean_ctor_get(x_88, 1);
-lean_inc(x_91);
-x_92 = lean_ctor_get(x_88, 2);
-lean_inc(x_92);
-x_93 = lean_ctor_get(x_88, 3);
-lean_inc(x_93);
-if (lean_is_exclusive(x_88)) {
- lean_ctor_release(x_88, 0);
- lean_ctor_release(x_88, 1);
- lean_ctor_release(x_88, 2);
- lean_ctor_release(x_88, 3);
- lean_ctor_release(x_88, 4);
- x_94 = x_88;
-} else {
- lean_dec_ref(x_88);
- x_94 = lean_box(0);
-}
-lean_inc(x_86);
-x_95 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1), 3, 2);
-lean_closure_set(x_95, 0, x_3);
-lean_closure_set(x_95, 1, x_86);
-x_96 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
-x_97 = l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(x_96, x_90, x_95);
-x_98 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__2;
-if (lean_is_scalar(x_94)) {
- x_99 = lean_alloc_ctor(0, 5, 0);
-} else {
- x_99 = x_94;
-}
-lean_ctor_set(x_99, 0, x_97);
-lean_ctor_set(x_99, 1, x_91);
-lean_ctor_set(x_99, 2, x_92);
-lean_ctor_set(x_99, 3, x_93);
-lean_ctor_set(x_99, 4, x_98);
-x_100 = lean_st_ref_set(x_9, x_99, x_89);
-x_101 = lean_ctor_get(x_100, 1);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+x_101 = lean_ctor_get(x_15, 0);
 lean_inc(x_101);
-lean_dec(x_100);
-x_102 = lean_st_ref_get(x_9, x_101);
-lean_dec(x_9);
-x_103 = lean_ctor_get(x_102, 1);
-lean_inc(x_103);
-lean_dec(x_102);
-x_104 = lean_st_ref_take(x_7, x_103);
+lean_dec(x_15);
+x_102 = l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1;
+x_103 = lean_array_push(x_102, x_101);
+x_104 = lean_st_ref_take(x_10, x_20);
 x_105 = lean_ctor_get(x_104, 0);
 lean_inc(x_105);
 x_106 = lean_ctor_get(x_104, 1);
@@ -3052,85 +3102,169 @@ lean_inc(x_106);
 lean_dec(x_104);
 x_107 = lean_ctor_get(x_105, 0);
 lean_inc(x_107);
-x_108 = lean_ctor_get(x_105, 2);
+x_108 = lean_ctor_get(x_105, 1);
 lean_inc(x_108);
-x_109 = lean_ctor_get(x_105, 3);
+x_109 = lean_ctor_get(x_105, 2);
 lean_inc(x_109);
+x_110 = lean_ctor_get(x_105, 3);
+lean_inc(x_110);
 if (lean_is_exclusive(x_105)) {
  lean_ctor_release(x_105, 0);
  lean_ctor_release(x_105, 1);
  lean_ctor_release(x_105, 2);
  lean_ctor_release(x_105, 3);
- x_110 = x_105;
+ lean_ctor_release(x_105, 4);
+ x_111 = x_105;
 } else {
  lean_dec_ref(x_105);
- x_110 = lean_box(0);
-}
-x_111 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10;
-if (lean_is_scalar(x_110)) {
- x_112 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_112 = x_110;
-}
-lean_ctor_set(x_112, 0, x_107);
-lean_ctor_set(x_112, 1, x_111);
-lean_ctor_set(x_112, 2, x_108);
-lean_ctor_set(x_112, 3, x_109);
-x_113 = lean_st_ref_set(x_7, x_112, x_106);
-lean_dec(x_7);
-x_114 = lean_ctor_get(x_113, 1);
-lean_inc(x_114);
-if (lean_is_exclusive(x_113)) {
- lean_ctor_release(x_113, 0);
- lean_ctor_release(x_113, 1);
- x_115 = x_113;
-} else {
- lean_dec_ref(x_113);
- x_115 = lean_box(0);
-}
-x_116 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_116, 0, x_86);
-if (lean_is_scalar(x_115)) {
- x_117 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_117 = x_115;
+ x_111 = lean_box(0);
 }
+lean_inc(x_103);
+x_112 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___lambda__1), 3, 2);
+lean_closure_set(x_112, 0, x_3);
+lean_closure_set(x_112, 1, x_103);
+x_113 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
+x_114 = l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(x_113, x_107, x_112);
+x_115 = lean_unsigned_to_nat(0u);
+lean_inc(x_5);
+x_116 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_116, 0, x_5);
+lean_ctor_set(x_116, 1, x_115);
+lean_inc(x_116);
+x_117 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_117, 0, x_116);
-lean_ctor_set(x_117, 1, x_114);
-return x_117;
+lean_ctor_set(x_117, 1, x_116);
+if (lean_is_scalar(x_111)) {
+ x_118 = lean_alloc_ctor(0, 5, 0);
+} else {
+ x_118 = x_111;
+}
+lean_ctor_set(x_118, 0, x_114);
+lean_ctor_set(x_118, 1, x_108);
+lean_ctor_set(x_118, 2, x_109);
+lean_ctor_set(x_118, 3, x_110);
+lean_ctor_set(x_118, 4, x_117);
+x_119 = lean_st_ref_set(x_10, x_118, x_106);
+x_120 = lean_ctor_get(x_119, 1);
+lean_inc(x_120);
+lean_dec(x_119);
+x_121 = lean_st_ref_get(x_10, x_120);
+lean_dec(x_10);
+x_122 = lean_ctor_get(x_121, 1);
+lean_inc(x_122);
+lean_dec(x_121);
+x_123 = lean_st_ref_take(x_8, x_122);
+x_124 = lean_ctor_get(x_123, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_123, 1);
+lean_inc(x_125);
+lean_dec(x_123);
+x_126 = lean_ctor_get(x_124, 0);
+lean_inc(x_126);
+x_127 = lean_ctor_get(x_124, 2);
+lean_inc(x_127);
+x_128 = lean_ctor_get(x_124, 3);
+lean_inc(x_128);
+if (lean_is_exclusive(x_124)) {
+ lean_ctor_release(x_124, 0);
+ lean_ctor_release(x_124, 1);
+ lean_ctor_release(x_124, 2);
+ lean_ctor_release(x_124, 3);
+ x_129 = x_124;
+} else {
+ lean_dec_ref(x_124);
+ x_129 = lean_box(0);
+}
+lean_inc(x_5);
+x_130 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_130, 0, x_5);
+lean_ctor_set(x_130, 1, x_115);
+lean_inc(x_5);
+x_131 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_131, 0, x_5);
+lean_ctor_set(x_131, 1, x_115);
+lean_inc(x_5);
+x_132 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_132, 0, x_5);
+lean_ctor_set(x_132, 1, x_115);
+x_133 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_133, 0, x_5);
+lean_ctor_set(x_133, 1, x_115);
+lean_inc(x_133);
+lean_inc_n(x_130, 2);
+x_134 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_134, 0, x_130);
+lean_ctor_set(x_134, 1, x_131);
+lean_ctor_set(x_134, 2, x_132);
+lean_ctor_set(x_134, 3, x_130);
+lean_ctor_set(x_134, 4, x_130);
+lean_ctor_set(x_134, 5, x_133);
+lean_ctor_set(x_134, 6, x_133);
+if (lean_is_scalar(x_129)) {
+ x_135 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_135 = x_129;
+}
+lean_ctor_set(x_135, 0, x_126);
+lean_ctor_set(x_135, 1, x_134);
+lean_ctor_set(x_135, 2, x_127);
+lean_ctor_set(x_135, 3, x_128);
+x_136 = lean_st_ref_set(x_8, x_135, x_125);
+lean_dec(x_8);
+x_137 = lean_ctor_get(x_136, 1);
+lean_inc(x_137);
+if (lean_is_exclusive(x_136)) {
+ lean_ctor_release(x_136, 0);
+ lean_ctor_release(x_136, 1);
+ x_138 = x_136;
+} else {
+ lean_dec_ref(x_136);
+ x_138 = lean_box(0);
+}
+x_139 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_139, 0, x_103);
+if (lean_is_scalar(x_138)) {
+ x_140 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_140 = x_138;
+}
+lean_ctor_set(x_140, 0, x_139);
+lean_ctor_set(x_140, 1, x_137);
+return x_140;
 }
 }
 }
 else
 {
-uint8_t x_118; 
-lean_dec(x_9);
-lean_dec(x_7);
+uint8_t x_141; 
+lean_dec(x_10);
+lean_dec(x_8);
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_118 = !lean_is_exclusive(x_13);
-if (x_118 == 0)
+x_141 = !lean_is_exclusive(x_14);
+if (x_141 == 0)
 {
-return x_13;
+return x_14;
 }
 else
 {
-lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-x_119 = lean_ctor_get(x_13, 0);
-x_120 = lean_ctor_get(x_13, 1);
-lean_inc(x_120);
-lean_inc(x_119);
-lean_dec(x_13);
-x_121 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_121, 0, x_119);
-lean_ctor_set(x_121, 1, x_120);
-return x_121;
+lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_142 = lean_ctor_get(x_14, 0);
+x_143 = lean_ctor_get(x_14, 1);
+lean_inc(x_143);
+lean_inc(x_142);
+lean_dec(x_14);
+x_144 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_144, 0, x_142);
+lean_ctor_set(x_144, 1, x_143);
+return x_144;
 }
 }
 }
 }
 }
-static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__1() {
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -3138,7 +3272,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Meta_getEqnsFor_x3f___lambda__1___boxed)
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__2() {
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3150,427 +3284,522 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__3(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) {
+_start:
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_st_ref_get(x_7, x_8);
+x_10 = !lean_is_exclusive(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_11 = lean_ctor_get(x_9, 0);
+x_12 = lean_ctor_get(x_9, 1);
+x_13 = lean_ctor_get(x_11, 0);
+lean_inc(x_13);
+lean_dec(x_11);
+x_14 = l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1;
+x_15 = l_Lean_Meta_instInhabitedEqnsExtState;
+x_16 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
+x_17 = l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(x_15, x_16, x_13);
+lean_dec(x_13);
+lean_inc(x_1);
+x_18 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_getEqnsFor_x3f___spec__1(x_17, x_1);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; 
+lean_free_object(x_9);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_1);
+x_19 = l___private_Lean_Meta_Eqns_0__Lean_Meta_shouldGenerateEqnThms(x_1, x_4, x_5, x_6, x_7, x_12);
+if (lean_obj_tag(x_19) == 0)
+{
+lean_object* x_20; uint8_t x_21; 
+x_20 = lean_ctor_get(x_19, 0);
+lean_inc(x_20);
+x_21 = lean_unbox(x_20);
+lean_dec(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_22 = lean_ctor_get(x_19, 1);
+lean_inc(x_22);
+lean_dec(x_19);
+x_23 = lean_box(0);
+x_24 = lean_apply_6(x_14, x_23, x_4, x_5, x_6, x_7, x_22);
+return x_24;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_25 = lean_ctor_get(x_19, 1);
+lean_inc(x_25);
+lean_dec(x_19);
+x_26 = lean_st_ref_get(x_7, x_25);
+x_27 = lean_ctor_get(x_26, 1);
+lean_inc(x_27);
+lean_dec(x_26);
+x_28 = l_Lean_Meta_registerGetEqnsFn___lambda__1___closed__1;
+x_29 = lean_st_ref_get(x_28, x_27);
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_29, 1);
+lean_inc(x_31);
+lean_dec(x_29);
+x_32 = lean_box(0);
+x_33 = l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2;
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_1);
+x_34 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8(x_1, x_33, x_30, x_33, x_4, x_5, x_6, x_7, x_31);
+if (lean_obj_tag(x_34) == 0)
+{
+lean_object* x_35; lean_object* x_36; 
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_35, 0);
+lean_inc(x_36);
+lean_dec(x_35);
+if (lean_obj_tag(x_36) == 0)
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_34, 1);
+lean_inc(x_37);
+lean_dec(x_34);
+x_38 = lean_box(0);
+x_39 = l_Lean_Meta_getEqnsFor_x3f___lambda__2(x_2, x_14, x_1, x_32, x_3, x_38, x_4, x_5, x_6, x_7, x_37);
+return x_39;
+}
+else
+{
+uint8_t x_40; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_40 = !lean_is_exclusive(x_34);
+if (x_40 == 0)
+{
+lean_object* x_41; lean_object* x_42; 
+x_41 = lean_ctor_get(x_34, 0);
+lean_dec(x_41);
+x_42 = lean_ctor_get(x_36, 0);
+lean_inc(x_42);
+lean_dec(x_36);
+lean_ctor_set(x_34, 0, x_42);
+return x_34;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_34, 1);
+lean_inc(x_43);
+lean_dec(x_34);
+x_44 = lean_ctor_get(x_36, 0);
+lean_inc(x_44);
+lean_dec(x_36);
+x_45 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_43);
+return x_45;
+}
+}
+}
+else
+{
+uint8_t x_46; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_46 = !lean_is_exclusive(x_34);
+if (x_46 == 0)
+{
+return x_34;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_34, 0);
+x_48 = lean_ctor_get(x_34, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_34);
+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_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_50 = !lean_is_exclusive(x_19);
+if (x_50 == 0)
+{
+return x_19;
+}
+else
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_19, 0);
+x_52 = lean_ctor_get(x_19, 1);
+lean_inc(x_52);
+lean_inc(x_51);
+lean_dec(x_19);
+x_53 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set(x_53, 1, x_52);
+return x_53;
+}
+}
+}
+else
+{
+uint8_t x_54; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_54 = !lean_is_exclusive(x_18);
+if (x_54 == 0)
+{
+lean_ctor_set(x_9, 0, x_18);
+return x_9;
+}
+else
+{
+lean_object* x_55; lean_object* x_56; 
+x_55 = lean_ctor_get(x_18, 0);
+lean_inc(x_55);
+lean_dec(x_18);
+x_56 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_9, 0, x_56);
+return x_9;
+}
+}
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_57 = lean_ctor_get(x_9, 0);
+x_58 = lean_ctor_get(x_9, 1);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_dec(x_9);
+x_59 = lean_ctor_get(x_57, 0);
+lean_inc(x_59);
+lean_dec(x_57);
+x_60 = l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1;
+x_61 = l_Lean_Meta_instInhabitedEqnsExtState;
+x_62 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
+x_63 = l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(x_61, x_62, x_59);
+lean_dec(x_59);
+lean_inc(x_1);
+x_64 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_getEqnsFor_x3f___spec__1(x_63, x_1);
+if (lean_obj_tag(x_64) == 0)
+{
+lean_object* x_65; 
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_1);
+x_65 = l___private_Lean_Meta_Eqns_0__Lean_Meta_shouldGenerateEqnThms(x_1, x_4, x_5, x_6, x_7, x_58);
+if (lean_obj_tag(x_65) == 0)
+{
+lean_object* x_66; uint8_t x_67; 
+x_66 = lean_ctor_get(x_65, 0);
+lean_inc(x_66);
+x_67 = lean_unbox(x_66);
+lean_dec(x_66);
+if (x_67 == 0)
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_68 = lean_ctor_get(x_65, 1);
+lean_inc(x_68);
+lean_dec(x_65);
+x_69 = lean_box(0);
+x_70 = lean_apply_6(x_60, x_69, x_4, x_5, x_6, x_7, x_68);
+return x_70;
+}
+else
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_71 = lean_ctor_get(x_65, 1);
+lean_inc(x_71);
+lean_dec(x_65);
+x_72 = lean_st_ref_get(x_7, x_71);
+x_73 = lean_ctor_get(x_72, 1);
+lean_inc(x_73);
+lean_dec(x_72);
+x_74 = l_Lean_Meta_registerGetEqnsFn___lambda__1___closed__1;
+x_75 = lean_st_ref_get(x_74, x_73);
+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);
+x_78 = lean_box(0);
+x_79 = l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2;
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_1);
+x_80 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8(x_1, x_79, x_76, x_79, x_4, x_5, x_6, x_7, x_77);
+if (lean_obj_tag(x_80) == 0)
+{
+lean_object* x_81; lean_object* x_82; 
+x_81 = lean_ctor_get(x_80, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_81, 0);
+lean_inc(x_82);
+lean_dec(x_81);
+if (lean_obj_tag(x_82) == 0)
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_80, 1);
+lean_inc(x_83);
+lean_dec(x_80);
+x_84 = lean_box(0);
+x_85 = l_Lean_Meta_getEqnsFor_x3f___lambda__2(x_2, x_60, x_1, x_78, x_3, x_84, x_4, x_5, x_6, x_7, x_83);
+return x_85;
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_86 = lean_ctor_get(x_80, 1);
+lean_inc(x_86);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ x_87 = x_80;
+} else {
+ lean_dec_ref(x_80);
+ x_87 = lean_box(0);
+}
+x_88 = lean_ctor_get(x_82, 0);
+lean_inc(x_88);
+lean_dec(x_82);
+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_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_90 = lean_ctor_get(x_80, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_80, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ x_92 = x_80;
+} else {
+ lean_dec_ref(x_80);
+ x_92 = lean_box(0);
+}
+if (lean_is_scalar(x_92)) {
+ x_93 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_93 = x_92;
+}
+lean_ctor_set(x_93, 0, x_90);
+lean_ctor_set(x_93, 1, x_91);
+return x_93;
+}
+}
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_94 = lean_ctor_get(x_65, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_65, 1);
+lean_inc(x_95);
+if (lean_is_exclusive(x_65)) {
+ lean_ctor_release(x_65, 0);
+ lean_ctor_release(x_65, 1);
+ x_96 = x_65;
+} else {
+ lean_dec_ref(x_65);
+ x_96 = lean_box(0);
+}
+if (lean_is_scalar(x_96)) {
+ x_97 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_97 = x_96;
+}
+lean_ctor_set(x_97, 0, x_94);
+lean_ctor_set(x_97, 1, x_95);
+return x_97;
+}
+}
+else
+{
+lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_98 = lean_ctor_get(x_64, 0);
+lean_inc(x_98);
+if (lean_is_exclusive(x_64)) {
+ lean_ctor_release(x_64, 0);
+ x_99 = x_64;
+} else {
+ lean_dec_ref(x_64);
+ x_99 = lean_box(0);
+}
+if (lean_is_scalar(x_99)) {
+ x_100 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_100 = x_99;
+}
+lean_ctor_set(x_100, 0, x_98);
+x_101 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_58);
+return x_101;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Meta_EqnsExtState_map___default___closed__2;
+x_2 = lean_unsigned_to_nat(0u);
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(32u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_getEqnsFor_x3f___closed__2;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__4() {
+_start:
+{
+size_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = 5;
+x_2 = l_Lean_Meta_getEqnsFor_x3f___closed__3;
+x_3 = l_Lean_Meta_getEqnsFor_x3f___closed__2;
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = lean_alloc_ctor(0, 4, sizeof(size_t)*1);
+lean_ctor_set(x_5, 0, x_2);
+lean_ctor_set(x_5, 1, x_3);
+lean_ctor_set(x_5, 2, x_4);
+lean_ctor_set(x_5, 3, x_4);
+lean_ctor_set_usize(x_5, 4, x_1);
+return x_5;
+}
+}
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Meta_getEqnsFor_x3f___closed__1;
+x_2 = l_Lean_Meta_getEqnsFor_x3f___closed__4;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Meta_getEqnsFor_x3f___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f(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) {
 _start:
 {
-lean_object* x_8; uint8_t x_9; 
-x_8 = lean_st_ref_get(x_6, x_7);
-x_9 = !lean_is_exclusive(x_8);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_10 = lean_ctor_get(x_8, 0);
-x_11 = lean_ctor_get(x_8, 1);
-x_12 = lean_ctor_get(x_10, 0);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = l_Lean_Meta_getEqnsFor_x3f___closed__1;
-x_14 = l_Lean_Meta_instInhabitedEqnsExtState;
-x_15 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
-x_16 = l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(x_14, x_15, x_12);
-lean_dec(x_12);
-lean_inc(x_1);
-x_17 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_getEqnsFor_x3f___spec__1(x_16, x_1);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_18; 
-lean_free_object(x_8);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_1);
-x_18 = l___private_Lean_Meta_Eqns_0__Lean_Meta_shouldGenerateEqnThms(x_1, x_3, x_4, x_5, x_6, x_11);
-if (lean_obj_tag(x_18) == 0)
-{
-lean_object* x_19; uint8_t x_20; 
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_unbox(x_19);
-lean_dec(x_19);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-lean_dec(x_1);
-x_21 = lean_ctor_get(x_18, 1);
-lean_inc(x_21);
-lean_dec(x_18);
-x_22 = lean_box(0);
-x_23 = lean_apply_6(x_13, x_22, x_3, x_4, x_5, x_6, x_21);
-return x_23;
-}
-else
-{
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_24 = lean_ctor_get(x_18, 1);
-lean_inc(x_24);
-lean_dec(x_18);
-x_25 = lean_st_ref_get(x_6, x_24);
-x_26 = lean_ctor_get(x_25, 1);
-lean_inc(x_26);
-lean_dec(x_25);
-x_27 = l_Lean_Meta_registerGetEqnsFn___lambda__1___closed__1;
-x_28 = lean_st_ref_get(x_27, x_26);
-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 = lean_box(0);
-x_32 = l_Lean_Meta_getEqnsFor_x3f___closed__2;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_1);
-x_33 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8(x_1, x_32, x_29, x_32, x_3, x_4, x_5, x_6, x_30);
-if (lean_obj_tag(x_33) == 0)
-{
-lean_object* x_34; lean_object* x_35; 
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc(x_34);
-x_35 = lean_ctor_get(x_34, 0);
-lean_inc(x_35);
-lean_dec(x_34);
-if (lean_obj_tag(x_35) == 0)
-{
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_33, 1);
-lean_inc(x_36);
-lean_dec(x_33);
-x_37 = lean_box(0);
-x_38 = l_Lean_Meta_getEqnsFor_x3f___lambda__2(x_2, x_13, x_1, x_31, x_37, x_3, x_4, x_5, x_6, x_36);
-return x_38;
-}
-else
-{
-uint8_t x_39; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_39 = !lean_is_exclusive(x_33);
-if (x_39 == 0)
-{
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_ctor_get(x_33, 0);
-lean_dec(x_40);
-x_41 = lean_ctor_get(x_35, 0);
-lean_inc(x_41);
-lean_dec(x_35);
-lean_ctor_set(x_33, 0, x_41);
-return x_33;
-}
-else
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_33, 1);
-lean_inc(x_42);
-lean_dec(x_33);
-x_43 = lean_ctor_get(x_35, 0);
-lean_inc(x_43);
-lean_dec(x_35);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_42);
-return x_44;
-}
-}
-}
-else
-{
-uint8_t x_45; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_45 = !lean_is_exclusive(x_33);
-if (x_45 == 0)
-{
-return x_33;
-}
-else
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_33, 0);
-x_47 = lean_ctor_get(x_33, 1);
-lean_inc(x_47);
-lean_inc(x_46);
-lean_dec(x_33);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
-}
-}
-}
-}
-else
-{
-uint8_t x_49; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_49 = !lean_is_exclusive(x_18);
-if (x_49 == 0)
-{
-return x_18;
-}
-else
-{
-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_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;
-}
-}
-}
-else
-{
-uint8_t x_53; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_53 = !lean_is_exclusive(x_17);
-if (x_53 == 0)
-{
-lean_ctor_set(x_8, 0, x_17);
-return x_8;
-}
-else
-{
-lean_object* x_54; lean_object* x_55; 
-x_54 = lean_ctor_get(x_17, 0);
-lean_inc(x_54);
-lean_dec(x_17);
-x_55 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_8, 0, x_55);
-return x_8;
-}
-}
-}
-else
-{
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-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_dec(x_8);
-x_58 = lean_ctor_get(x_56, 0);
-lean_inc(x_58);
-lean_dec(x_56);
-x_59 = l_Lean_Meta_getEqnsFor_x3f___closed__1;
-x_60 = l_Lean_Meta_instInhabitedEqnsExtState;
-x_61 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__1;
-x_62 = l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(x_60, x_61, x_58);
-lean_dec(x_58);
-lean_inc(x_1);
-x_63 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_getEqnsFor_x3f___spec__1(x_62, x_1);
-if (lean_obj_tag(x_63) == 0)
-{
-lean_object* x_64; 
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_1);
-x_64 = l___private_Lean_Meta_Eqns_0__Lean_Meta_shouldGenerateEqnThms(x_1, x_3, x_4, x_5, x_6, x_57);
-if (lean_obj_tag(x_64) == 0)
-{
-lean_object* x_65; uint8_t x_66; 
-x_65 = lean_ctor_get(x_64, 0);
-lean_inc(x_65);
-x_66 = lean_unbox(x_65);
-lean_dec(x_65);
-if (x_66 == 0)
-{
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-lean_dec(x_1);
-x_67 = lean_ctor_get(x_64, 1);
-lean_inc(x_67);
-lean_dec(x_64);
-x_68 = lean_box(0);
-x_69 = lean_apply_6(x_59, x_68, x_3, x_4, x_5, x_6, x_67);
-return x_69;
-}
-else
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_70 = lean_ctor_get(x_64, 1);
-lean_inc(x_70);
-lean_dec(x_64);
-x_71 = lean_st_ref_get(x_6, x_70);
-x_72 = lean_ctor_get(x_71, 1);
-lean_inc(x_72);
-lean_dec(x_71);
-x_73 = l_Lean_Meta_registerGetEqnsFn___lambda__1___closed__1;
-x_74 = lean_st_ref_get(x_73, x_72);
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-lean_dec(x_74);
-x_77 = lean_box(0);
-x_78 = l_Lean_Meta_getEqnsFor_x3f___closed__2;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_1);
-x_79 = l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8(x_1, x_78, x_75, x_78, x_3, x_4, x_5, x_6, x_76);
-if (lean_obj_tag(x_79) == 0)
-{
-lean_object* x_80; lean_object* x_81; 
-x_80 = lean_ctor_get(x_79, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_80, 0);
-lean_inc(x_81);
-lean_dec(x_80);
-if (lean_obj_tag(x_81) == 0)
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_79, 1);
-lean_inc(x_82);
-lean_dec(x_79);
-x_83 = lean_box(0);
-x_84 = l_Lean_Meta_getEqnsFor_x3f___lambda__2(x_2, x_59, x_1, x_77, x_83, x_3, x_4, x_5, x_6, x_82);
-return x_84;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_85 = lean_ctor_get(x_79, 1);
-lean_inc(x_85);
-if (lean_is_exclusive(x_79)) {
- lean_ctor_release(x_79, 0);
- lean_ctor_release(x_79, 1);
- x_86 = x_79;
-} else {
- lean_dec_ref(x_79);
- x_86 = lean_box(0);
-}
-x_87 = lean_ctor_get(x_81, 0);
-lean_inc(x_87);
-lean_dec(x_81);
-if (lean_is_scalar(x_86)) {
- x_88 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_88 = x_86;
-}
-lean_ctor_set(x_88, 0, x_87);
-lean_ctor_set(x_88, 1, x_85);
-return x_88;
-}
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_89 = lean_ctor_get(x_79, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_79, 1);
-lean_inc(x_90);
-if (lean_is_exclusive(x_79)) {
- lean_ctor_release(x_79, 0);
- lean_ctor_release(x_79, 1);
- x_91 = x_79;
-} else {
- lean_dec_ref(x_79);
- x_91 = lean_box(0);
-}
-if (lean_is_scalar(x_91)) {
- x_92 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_92 = x_91;
-}
-lean_ctor_set(x_92, 0, x_89);
-lean_ctor_set(x_92, 1, x_90);
-return x_92;
-}
-}
-}
-else
-{
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_93 = lean_ctor_get(x_64, 0);
-lean_inc(x_93);
-x_94 = lean_ctor_get(x_64, 1);
-lean_inc(x_94);
-if (lean_is_exclusive(x_64)) {
- lean_ctor_release(x_64, 0);
- lean_ctor_release(x_64, 1);
- x_95 = x_64;
-} else {
- lean_dec_ref(x_64);
- x_95 = lean_box(0);
-}
-if (lean_is_scalar(x_95)) {
- x_96 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_96 = x_95;
-}
-lean_ctor_set(x_96, 0, x_93);
-lean_ctor_set(x_96, 1, x_94);
-return x_96;
-}
-}
-else
-{
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_97 = lean_ctor_get(x_63, 0);
-lean_inc(x_97);
-if (lean_is_exclusive(x_63)) {
- lean_ctor_release(x_63, 0);
- x_98 = x_63;
-} else {
- lean_dec_ref(x_63);
- x_98 = lean_box(0);
-}
-if (lean_is_scalar(x_98)) {
- x_99 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_99 = x_98;
-}
-lean_ctor_set(x_99, 0, x_97);
-x_100 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_100, 0, x_99);
-lean_ctor_set(x_100, 1, x_57);
-return x_100;
-}
-}
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_8 = l_Lean_Meta_EqnsExtState_map___default___closed__2;
+x_9 = lean_box(x_2);
+x_10 = lean_alloc_closure((void*)(l_Lean_Meta_getEqnsFor_x3f___lambda__3___boxed), 8, 3);
+lean_closure_set(x_10, 0, x_1);
+lean_closure_set(x_10, 1, x_9);
+lean_closure_set(x_10, 2, x_8);
+x_11 = l_Lean_Meta_getEqnsFor_x3f___closed__5;
+x_12 = l_Lean_Meta_getEqnsFor_x3f___closed__6;
+x_13 = l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(x_11, x_12, x_10, x_3, x_4, x_5, x_6, x_7);
+return x_13;
 }
 }
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_getEqnsFor_x3f___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -3632,15 +3861,25 @@ lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
-uint8_t x_11; lean_object* x_12; 
-x_11 = lean_unbox(x_1);
+uint8_t x_12; lean_object* x_13; 
+x_12 = lean_unbox(x_1);
 lean_dec(x_1);
-x_12 = l_Lean_Meta_getEqnsFor_x3f___lambda__2(x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_5);
-return x_12;
+x_13 = l_Lean_Meta_getEqnsFor_x3f___lambda__2(x_12, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_6);
+return x_13;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_2);
+lean_dec(x_2);
+x_10 = l_Lean_Meta_getEqnsFor_x3f___lambda__3(x_1, x_9, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Meta_getEqnsFor_x3f___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) {
@@ -3653,7 +3892,7 @@ x_9 = l_Lean_Meta_getEqnsFor_x3f(x_1, x_8, x_3, x_4, x_5, x_6, x_7);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_911_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_926_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
@@ -4136,7 +4375,7 @@ return x_50;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f(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_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__2(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) {
 _start:
 {
 lean_object* x_8; 
@@ -4154,7 +4393,7 @@ lean_inc(x_9);
 x_10 = lean_ctor_get(x_8, 1);
 lean_inc(x_10);
 lean_dec(x_8);
-x_11 = l_Lean_Meta_getEqnsFor_x3f___closed__1;
+x_11 = l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1;
 x_12 = lean_unbox(x_9);
 lean_dec(x_9);
 if (x_12 == 0)
@@ -4180,7 +4419,7 @@ x_20 = lean_ctor_get(x_18, 1);
 lean_inc(x_20);
 lean_dec(x_18);
 x_21 = lean_box(0);
-x_22 = l_Lean_Meta_getEqnsFor_x3f___closed__2;
+x_22 = l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
@@ -4299,6 +4538,20 @@ return x_42;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f(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) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_8 = lean_box(x_2);
+x_9 = lean_alloc_closure((void*)(l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__2___boxed), 7, 2);
+lean_closure_set(x_9, 0, x_1);
+lean_closure_set(x_9, 1, x_8);
+x_10 = l_Lean_Meta_getEqnsFor_x3f___closed__5;
+x_11 = l_Lean_Meta_getEqnsFor_x3f___closed__6;
+x_12 = l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(x_10, x_11, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_12;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
@@ -4310,6 +4563,16 @@ lean_dec(x_5);
 return x_12;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_2);
+lean_dec(x_2);
+x_9 = l_Lean_Meta_getUnfoldEqnFor_x3f___lambda__2(x_1, x_8, x_3, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_getUnfoldEqnFor_x3f___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:
 {
@@ -4395,11 +4658,23 @@ l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10 = _init_l
 lean_mark_persistent(l_List_forIn_loop___at_Lean_Meta_getEqnsFor_x3f___spec__8___closed__10);
 l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1 = _init_l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1();
 lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___lambda__2___closed__1);
+l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1 = _init_l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1();
+lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__1);
+l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2 = _init_l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2();
+lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___lambda__3___closed__2);
 l_Lean_Meta_getEqnsFor_x3f___closed__1 = _init_l_Lean_Meta_getEqnsFor_x3f___closed__1();
 lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___closed__1);
 l_Lean_Meta_getEqnsFor_x3f___closed__2 = _init_l_Lean_Meta_getEqnsFor_x3f___closed__2();
 lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___closed__2);
-if (builtin) {res = l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_911_(lean_io_mk_world());
+l_Lean_Meta_getEqnsFor_x3f___closed__3 = _init_l_Lean_Meta_getEqnsFor_x3f___closed__3();
+lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___closed__3);
+l_Lean_Meta_getEqnsFor_x3f___closed__4 = _init_l_Lean_Meta_getEqnsFor_x3f___closed__4();
+lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___closed__4);
+l_Lean_Meta_getEqnsFor_x3f___closed__5 = _init_l_Lean_Meta_getEqnsFor_x3f___closed__5();
+lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___closed__5);
+l_Lean_Meta_getEqnsFor_x3f___closed__6 = _init_l_Lean_Meta_getEqnsFor_x3f___closed__6();
+lean_mark_persistent(l_Lean_Meta_getEqnsFor_x3f___closed__6);
+if (builtin) {res = l_Lean_Meta_initFn____x40_Lean_Meta_Eqns___hyg_926_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l___private_Lean_Meta_Eqns_0__Lean_Meta_getUnfoldEqnFnsRef = lean_io_result_get_value(res);
 lean_mark_persistent(l___private_Lean_Meta_Eqns_0__Lean_Meta_getUnfoldEqnFnsRef);
diff --git a/stage0/stdlib/Lean/Meta/IndPredBelow.c b/stage0/stdlib/Lean/Meta/IndPredBelow.c
index 945fe67f4a..254401aa0a 100644
--- a/stage0/stdlib/Lean/Meta/IndPredBelow.c
+++ b/stage0/stdlib/Lean/Meta/IndPredBelow.c
@@ -305,6 +305,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecls_loop___at_Lean_Meta_IndPredB
 LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_mkCtorType_addHeaderVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at_Lean_Meta_IndPredBelow_findBelowIdx___spec__2___lambda__2___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at_Lean_Meta_IndPredBelow_mkCtorType_checkCount___spec__9___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Match_MkMatcherInput_numDiscrs(lean_object*);
 LEAN_EXPORT lean_object* l_List_forM___at_Lean_Meta_IndPredBelow_proveBrecOn___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkFVar(lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
@@ -358,7 +359,7 @@ extern lean_object* l_Lean_Meta_Match_instInhabitedPattern;
 LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_mkBelowMatcher_addBelowPattern___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLambda___at_Lean_Meta_IndPredBelow_mkCtorType_checkCount___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_IndPredBelow_proveBrecOn_closeGoal___rarg___closed__6;
-LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_6740_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_6748_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_7_(lean_object*);
 static lean_object* l_Lean_Meta_IndPredBelow_mkBelowMatcher_convertToBelow___closed__4;
 lean_object* l_Lean_Meta_getLocalDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -16098,8 +16099,7 @@ lean_inc(x_12);
 lean_dec(x_10);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
-x_14 = lean_ctor_get(x_11, 2);
-lean_inc(x_14);
+x_14 = l_Lean_Meta_Match_MkMatcherInput_numDiscrs(x_11);
 lean_inc(x_14);
 x_15 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_15, 0, x_14);
@@ -16204,127 +16204,129 @@ lean_inc(x_5);
 x_50 = l_Lean_Meta_withExistingLocalDecls___at_Lean_Meta_Match_Alt_toMessageData___spec__3___rarg(x_48, x_49, x_5, x_6, x_7, x_8, x_46);
 if (lean_obj_tag(x_50) == 0)
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+lean_object* x_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_51 = lean_ctor_get(x_50, 1);
 lean_inc(x_51);
 lean_dec(x_50);
 x_52 = lean_unsigned_to_nat(1u);
 x_53 = lean_nat_add(x_14, x_52);
 lean_dec(x_14);
-x_54 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_54, 0, x_45);
-lean_ctor_set(x_54, 1, x_25);
-lean_ctor_set(x_54, 2, x_53);
-lean_ctor_set(x_54, 3, x_28);
+x_54 = lean_box(0);
+x_55 = lean_mk_array(x_53, x_54);
+x_56 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_56, 0, x_45);
+lean_ctor_set(x_56, 1, x_25);
+lean_ctor_set(x_56, 2, x_55);
+lean_ctor_set(x_56, 3, x_28);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_55 = l_Lean_Meta_Match_mkMatcher(x_54, x_5, x_6, x_7, x_8, x_51);
-if (lean_obj_tag(x_55) == 0)
+x_57 = l_Lean_Meta_Match_mkMatcher(x_56, x_5, x_6, x_7, x_8, x_51);
+if (lean_obj_tag(x_57) == 0)
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-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, 3);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
-lean_inc(x_58);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-x_59 = lean_apply_5(x_58, x_5, x_6, x_7, x_8, x_57);
-if (lean_obj_tag(x_59) == 0)
-{
-lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_60 = lean_ctor_get(x_59, 1);
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
+lean_dec(x_57);
+x_60 = lean_ctor_get(x_58, 3);
 lean_inc(x_60);
-lean_dec(x_59);
-x_61 = lean_ctor_get(x_56, 0);
-lean_inc(x_61);
-lean_dec(x_56);
-lean_inc(x_61);
-x_62 = l_Lean_Meta_check(x_61, x_5, x_6, x_7, x_8, x_60);
-if (lean_obj_tag(x_62) == 0)
+lean_inc(x_60);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_61 = lean_apply_5(x_60, x_5, x_6, x_7, x_8, x_59);
+if (lean_obj_tag(x_61) == 0)
 {
-uint8_t x_63; 
-x_63 = !lean_is_exclusive(x_62);
-if (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; 
-x_64 = lean_ctor_get(x_62, 0);
-lean_dec(x_64);
-x_65 = lean_ctor_get(x_1, 5);
-lean_inc(x_65);
-lean_dec(x_1);
-x_66 = lean_array_push(x_65, x_3);
-x_67 = l_Lean_mkApp(x_61, x_24);
-x_68 = l_Lean_mkAppN(x_67, x_66);
-x_69 = l_Lean_mkAppN(x_68, x_41);
-lean_ctor_set(x_20, 1, x_58);
-lean_ctor_set(x_20, 0, x_69);
-lean_ctor_set(x_62, 0, x_20);
-return x_62;
-}
-else
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_70 = lean_ctor_get(x_62, 1);
-lean_inc(x_70);
-lean_dec(x_62);
-x_71 = lean_ctor_get(x_1, 5);
-lean_inc(x_71);
-lean_dec(x_1);
-x_72 = lean_array_push(x_71, x_3);
-x_73 = l_Lean_mkApp(x_61, x_24);
-x_74 = l_Lean_mkAppN(x_73, x_72);
-x_75 = l_Lean_mkAppN(x_74, x_41);
-lean_ctor_set(x_20, 1, x_58);
-lean_ctor_set(x_20, 0, x_75);
-x_76 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_76, 0, x_20);
-lean_ctor_set(x_76, 1, x_70);
-return x_76;
-}
-}
-else
-{
-uint8_t x_77; 
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_61, 1);
+lean_inc(x_62);
 lean_dec(x_61);
+x_63 = lean_ctor_get(x_58, 0);
+lean_inc(x_63);
 lean_dec(x_58);
+lean_inc(x_63);
+x_64 = l_Lean_Meta_check(x_63, x_5, x_6, x_7, x_8, x_62);
+if (lean_obj_tag(x_64) == 0)
+{
+uint8_t x_65; 
+x_65 = !lean_is_exclusive(x_64);
+if (x_65 == 0)
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_66 = lean_ctor_get(x_64, 0);
+lean_dec(x_66);
+x_67 = lean_ctor_get(x_1, 5);
+lean_inc(x_67);
+lean_dec(x_1);
+x_68 = lean_array_push(x_67, x_3);
+x_69 = l_Lean_mkApp(x_63, x_24);
+x_70 = l_Lean_mkAppN(x_69, x_68);
+x_71 = l_Lean_mkAppN(x_70, x_41);
+lean_ctor_set(x_20, 1, x_60);
+lean_ctor_set(x_20, 0, x_71);
+lean_ctor_set(x_64, 0, x_20);
+return x_64;
+}
+else
+{
+lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_72 = lean_ctor_get(x_64, 1);
+lean_inc(x_72);
+lean_dec(x_64);
+x_73 = lean_ctor_get(x_1, 5);
+lean_inc(x_73);
+lean_dec(x_1);
+x_74 = lean_array_push(x_73, x_3);
+x_75 = l_Lean_mkApp(x_63, x_24);
+x_76 = l_Lean_mkAppN(x_75, x_74);
+x_77 = l_Lean_mkAppN(x_76, x_41);
+lean_ctor_set(x_20, 1, x_60);
+lean_ctor_set(x_20, 0, x_77);
+x_78 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_78, 0, x_20);
+lean_ctor_set(x_78, 1, x_72);
+return x_78;
+}
+}
+else
+{
+uint8_t x_79; 
+lean_dec(x_63);
+lean_dec(x_60);
 lean_dec(x_41);
 lean_free_object(x_20);
 lean_dec(x_24);
 lean_dec(x_3);
 lean_dec(x_1);
-x_77 = !lean_is_exclusive(x_62);
-if (x_77 == 0)
+x_79 = !lean_is_exclusive(x_64);
+if (x_79 == 0)
 {
-return x_62;
+return x_64;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_62, 0);
-x_79 = lean_ctor_get(x_62, 1);
-lean_inc(x_79);
-lean_inc(x_78);
-lean_dec(x_62);
-x_80 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_80, 0, x_78);
-lean_ctor_set(x_80, 1, x_79);
-return x_80;
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_64, 0);
+x_81 = lean_ctor_get(x_64, 1);
+lean_inc(x_81);
+lean_inc(x_80);
+lean_dec(x_64);
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+return x_82;
 }
 }
 }
 else
 {
-uint8_t x_81; 
+uint8_t x_83; 
+lean_dec(x_60);
 lean_dec(x_58);
-lean_dec(x_56);
 lean_dec(x_41);
 lean_free_object(x_20);
 lean_dec(x_24);
@@ -16334,29 +16336,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_81 = !lean_is_exclusive(x_59);
-if (x_81 == 0)
+x_83 = !lean_is_exclusive(x_61);
+if (x_83 == 0)
 {
-return x_59;
+return x_61;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_59, 0);
-x_83 = lean_ctor_get(x_59, 1);
-lean_inc(x_83);
-lean_inc(x_82);
-lean_dec(x_59);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_83);
-return x_84;
+lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_84 = lean_ctor_get(x_61, 0);
+x_85 = lean_ctor_get(x_61, 1);
+lean_inc(x_85);
+lean_inc(x_84);
+lean_dec(x_61);
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_84);
+lean_ctor_set(x_86, 1, x_85);
+return x_86;
 }
 }
 }
 else
 {
-uint8_t x_85; 
+uint8_t x_87; 
 lean_dec(x_41);
 lean_free_object(x_20);
 lean_dec(x_24);
@@ -16366,29 +16368,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_85 = !lean_is_exclusive(x_55);
-if (x_85 == 0)
+x_87 = !lean_is_exclusive(x_57);
+if (x_87 == 0)
 {
-return x_55;
+return x_57;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_55, 0);
-x_87 = lean_ctor_get(x_55, 1);
-lean_inc(x_87);
-lean_inc(x_86);
-lean_dec(x_55);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_86);
-lean_ctor_set(x_88, 1, x_87);
-return x_88;
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_57, 0);
+x_89 = lean_ctor_get(x_57, 1);
+lean_inc(x_89);
+lean_inc(x_88);
+lean_dec(x_57);
+x_90 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+return x_90;
 }
 }
 }
 else
 {
-uint8_t x_89; 
+uint8_t x_91; 
 lean_dec(x_45);
 lean_dec(x_41);
 lean_dec(x_28);
@@ -16402,29 +16404,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_89 = !lean_is_exclusive(x_50);
-if (x_89 == 0)
+x_91 = !lean_is_exclusive(x_50);
+if (x_91 == 0)
 {
 return x_50;
 }
 else
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_90 = lean_ctor_get(x_50, 0);
-x_91 = lean_ctor_get(x_50, 1);
-lean_inc(x_91);
-lean_inc(x_90);
+lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_92 = lean_ctor_get(x_50, 0);
+x_93 = lean_ctor_get(x_50, 1);
+lean_inc(x_93);
+lean_inc(x_92);
 lean_dec(x_50);
-x_92 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-return x_92;
+x_94 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_94, 0, x_92);
+lean_ctor_set(x_94, 1, x_93);
+return x_94;
 }
 }
 }
 else
 {
-uint8_t x_93; 
+uint8_t x_95; 
 lean_dec(x_28);
 lean_free_object(x_20);
 lean_dec(x_25);
@@ -16437,29 +16439,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_93 = !lean_is_exclusive(x_40);
-if (x_93 == 0)
+x_95 = !lean_is_exclusive(x_40);
+if (x_95 == 0)
 {
 return x_40;
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_40, 0);
-x_95 = lean_ctor_get(x_40, 1);
-lean_inc(x_95);
-lean_inc(x_94);
+lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_96 = lean_ctor_get(x_40, 0);
+x_97 = lean_ctor_get(x_40, 1);
+lean_inc(x_97);
+lean_inc(x_96);
 lean_dec(x_40);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_95);
-return x_96;
+x_98 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_98, 0, x_96);
+lean_ctor_set(x_98, 1, x_97);
+return x_98;
 }
 }
 }
 else
 {
-uint8_t x_97; 
+uint8_t x_99; 
 lean_dec(x_26);
 lean_free_object(x_20);
 lean_dec(x_25);
@@ -16472,231 +16474,198 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_97 = !lean_is_exclusive(x_27);
-if (x_97 == 0)
+x_99 = !lean_is_exclusive(x_27);
+if (x_99 == 0)
 {
 return x_27;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_27, 0);
-x_99 = lean_ctor_get(x_27, 1);
-lean_inc(x_99);
-lean_inc(x_98);
+lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_100 = lean_ctor_get(x_27, 0);
+x_101 = lean_ctor_get(x_27, 1);
+lean_inc(x_101);
+lean_inc(x_100);
 lean_dec(x_27);
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_98);
-lean_ctor_set(x_100, 1, x_99);
-return x_100;
+x_102 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_102, 0, x_100);
+lean_ctor_set(x_102, 1, x_101);
+return x_102;
 }
 }
 }
 else
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-x_101 = lean_ctor_get(x_20, 0);
-x_102 = lean_ctor_get(x_20, 1);
-lean_inc(x_102);
-lean_inc(x_101);
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+x_103 = lean_ctor_get(x_20, 0);
+x_104 = lean_ctor_get(x_20, 1);
+lean_inc(x_104);
+lean_inc(x_103);
 lean_dec(x_20);
-x_103 = lean_ctor_get(x_11, 3);
-lean_inc(x_103);
+x_105 = lean_ctor_get(x_11, 3);
+lean_inc(x_105);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-lean_inc(x_103);
-x_104 = l_List_mapM___at_Lean_Meta_IndPredBelow_mkBelowMatcher___spec__1(x_2, x_4, x_22, x_103, x_5, x_6, x_7, x_8, x_21);
-if (lean_obj_tag(x_104) == 0)
+lean_inc(x_105);
+x_106 = l_List_mapM___at_Lean_Meta_IndPredBelow_mkBelowMatcher___spec__1(x_2, x_4, x_22, x_105, x_5, x_6, x_7, x_8, x_21);
+if (lean_obj_tag(x_106) == 0)
 {
-lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
-x_105 = lean_ctor_get(x_104, 0);
-lean_inc(x_105);
-x_106 = lean_ctor_get(x_104, 1);
-lean_inc(x_106);
-lean_dec(x_104);
-x_107 = l_Lean_Meta_IndPredBelow_mkBelowMatcher___closed__1;
-lean_inc(x_105);
-x_108 = l_List_zipWith___rarg(x_107, x_103, x_105);
-x_109 = l_List_redLength___rarg(x_108);
-x_110 = lean_mk_empty_array_with_capacity(x_109);
-lean_dec(x_109);
-x_111 = l_List_toArrayAux___rarg(x_108, x_110);
-x_112 = lean_ctor_get(x_1, 7);
-lean_inc(x_112);
-x_113 = l_Array_zip___rarg(x_111, x_112);
-lean_dec(x_112);
+lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
+x_107 = lean_ctor_get(x_106, 0);
+lean_inc(x_107);
+x_108 = lean_ctor_get(x_106, 1);
+lean_inc(x_108);
+lean_dec(x_106);
+x_109 = l_Lean_Meta_IndPredBelow_mkBelowMatcher___closed__1;
+lean_inc(x_107);
+x_110 = l_List_zipWith___rarg(x_109, x_105, x_107);
+x_111 = l_List_redLength___rarg(x_110);
+x_112 = lean_mk_empty_array_with_capacity(x_111);
 lean_dec(x_111);
-x_114 = lean_array_get_size(x_113);
-x_115 = lean_mk_empty_array_with_capacity(x_114);
-x_116 = lean_unsigned_to_nat(0u);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-x_117 = l_Array_mapIdxM_map___at_Lean_Meta_IndPredBelow_mkBelowMatcher___spec__3(x_1, x_11, x_105, x_113, x_114, x_116, lean_box(0), x_115, x_5, x_6, x_7, x_8, x_106);
+x_113 = l_List_toArrayAux___rarg(x_110, x_112);
+x_114 = lean_ctor_get(x_1, 7);
+lean_inc(x_114);
+x_115 = l_Array_zip___rarg(x_113, x_114);
+lean_dec(x_114);
 lean_dec(x_113);
-if (lean_obj_tag(x_117) == 0)
+x_116 = lean_array_get_size(x_115);
+x_117 = lean_mk_empty_array_with_capacity(x_116);
+x_118 = lean_unsigned_to_nat(0u);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_119 = l_Array_mapIdxM_map___at_Lean_Meta_IndPredBelow_mkBelowMatcher___spec__3(x_1, x_11, x_107, x_115, x_116, x_118, lean_box(0), x_117, x_5, x_6, x_7, x_8, x_108);
+lean_dec(x_115);
+if (lean_obj_tag(x_119) == 0)
 {
-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; 
-x_118 = lean_ctor_get(x_117, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_117, 1);
-lean_inc(x_119);
-lean_dec(x_117);
-x_120 = lean_ctor_get(x_11, 0);
+lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+x_120 = lean_ctor_get(x_119, 0);
 lean_inc(x_120);
-lean_dec(x_11);
-x_121 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_120, x_7, x_8, x_119);
-x_122 = lean_ctor_get(x_121, 0);
+x_121 = lean_ctor_get(x_119, 1);
+lean_inc(x_121);
+lean_dec(x_119);
+x_122 = lean_ctor_get(x_11, 0);
 lean_inc(x_122);
-x_123 = lean_ctor_get(x_121, 1);
-lean_inc(x_123);
-lean_dec(x_121);
-x_124 = lean_box(0);
-lean_inc(x_105);
-x_125 = l_List_foldl___at_Lean_Meta_IndPredBelow_mkBelowMatcher___spec__4(x_124, x_105);
-lean_inc(x_105);
-x_126 = lean_alloc_closure((void*)(l_Lean_Meta_IndPredBelow_mkBelowMatcher___lambda__3___boxed), 6, 1);
-lean_closure_set(x_126, 0, x_105);
+lean_dec(x_11);
+x_123 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_122, x_7, x_8, x_121);
+x_124 = lean_ctor_get(x_123, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_123, 1);
+lean_inc(x_125);
+lean_dec(x_123);
+x_126 = lean_box(0);
+lean_inc(x_107);
+x_127 = l_List_foldl___at_Lean_Meta_IndPredBelow_mkBelowMatcher___spec__4(x_126, x_107);
+lean_inc(x_107);
+x_128 = lean_alloc_closure((void*)(l_Lean_Meta_IndPredBelow_mkBelowMatcher___lambda__3___boxed), 6, 1);
+lean_closure_set(x_128, 0, x_107);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_127 = l_Lean_Meta_withExistingLocalDecls___at_Lean_Meta_Match_Alt_toMessageData___spec__3___rarg(x_125, x_126, x_5, x_6, x_7, x_8, x_123);
-if (lean_obj_tag(x_127) == 0)
+x_129 = l_Lean_Meta_withExistingLocalDecls___at_Lean_Meta_Match_Alt_toMessageData___spec__3___rarg(x_127, x_128, x_5, x_6, x_7, x_8, x_125);
+if (lean_obj_tag(x_129) == 0)
 {
-lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; 
-x_128 = lean_ctor_get(x_127, 1);
-lean_inc(x_128);
-lean_dec(x_127);
-x_129 = lean_unsigned_to_nat(1u);
-x_130 = lean_nat_add(x_14, 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; 
+x_130 = lean_ctor_get(x_129, 1);
+lean_inc(x_130);
+lean_dec(x_129);
+x_131 = lean_unsigned_to_nat(1u);
+x_132 = lean_nat_add(x_14, x_131);
 lean_dec(x_14);
-x_131 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_131, 0, x_122);
-lean_ctor_set(x_131, 1, x_102);
-lean_ctor_set(x_131, 2, x_130);
-lean_ctor_set(x_131, 3, x_105);
+x_133 = lean_box(0);
+x_134 = lean_mk_array(x_132, x_133);
+x_135 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_135, 0, x_124);
+lean_ctor_set(x_135, 1, x_104);
+lean_ctor_set(x_135, 2, x_134);
+lean_ctor_set(x_135, 3, x_107);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_132 = l_Lean_Meta_Match_mkMatcher(x_131, x_5, x_6, x_7, x_8, x_128);
-if (lean_obj_tag(x_132) == 0)
-{
-lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; 
-x_133 = lean_ctor_get(x_132, 0);
-lean_inc(x_133);
-x_134 = lean_ctor_get(x_132, 1);
-lean_inc(x_134);
-lean_dec(x_132);
-x_135 = lean_ctor_get(x_133, 3);
-lean_inc(x_135);
-lean_inc(x_135);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-x_136 = lean_apply_5(x_135, x_5, x_6, x_7, x_8, x_134);
+x_136 = l_Lean_Meta_Match_mkMatcher(x_135, x_5, x_6, x_7, x_8, x_130);
 if (lean_obj_tag(x_136) == 0)
 {
-lean_object* x_137; lean_object* x_138; lean_object* x_139; 
-x_137 = lean_ctor_get(x_136, 1);
+lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+x_137 = lean_ctor_get(x_136, 0);
 lean_inc(x_137);
+x_138 = lean_ctor_get(x_136, 1);
+lean_inc(x_138);
 lean_dec(x_136);
-x_138 = lean_ctor_get(x_133, 0);
-lean_inc(x_138);
-lean_dec(x_133);
-lean_inc(x_138);
-x_139 = l_Lean_Meta_check(x_138, x_5, x_6, x_7, x_8, x_137);
-if (lean_obj_tag(x_139) == 0)
+x_139 = lean_ctor_get(x_137, 3);
+lean_inc(x_139);
+lean_inc(x_139);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_140 = lean_apply_5(x_139, x_5, x_6, x_7, x_8, x_138);
+if (lean_obj_tag(x_140) == 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; 
-x_140 = lean_ctor_get(x_139, 1);
-lean_inc(x_140);
-if (lean_is_exclusive(x_139)) {
- lean_ctor_release(x_139, 0);
- lean_ctor_release(x_139, 1);
- x_141 = x_139;
-} else {
- lean_dec_ref(x_139);
- x_141 = lean_box(0);
-}
-x_142 = lean_ctor_get(x_1, 5);
+lean_object* x_141; lean_object* x_142; lean_object* x_143; 
+x_141 = lean_ctor_get(x_140, 1);
+lean_inc(x_141);
+lean_dec(x_140);
+x_142 = lean_ctor_get(x_137, 0);
 lean_inc(x_142);
-lean_dec(x_1);
-x_143 = lean_array_push(x_142, x_3);
-x_144 = l_Lean_mkApp(x_138, x_101);
-x_145 = l_Lean_mkAppN(x_144, x_143);
-x_146 = l_Lean_mkAppN(x_145, x_118);
-x_147 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_147, 0, x_146);
-lean_ctor_set(x_147, 1, x_135);
-if (lean_is_scalar(x_141)) {
- x_148 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_148 = x_141;
-}
-lean_ctor_set(x_148, 0, x_147);
-lean_ctor_set(x_148, 1, x_140);
-return x_148;
-}
-else
+lean_dec(x_137);
+lean_inc(x_142);
+x_143 = l_Lean_Meta_check(x_142, x_5, x_6, x_7, x_8, x_141);
+if (lean_obj_tag(x_143) == 0)
 {
-lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
-lean_dec(x_138);
-lean_dec(x_135);
-lean_dec(x_118);
-lean_dec(x_101);
-lean_dec(x_3);
+lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
+x_144 = lean_ctor_get(x_143, 1);
+lean_inc(x_144);
+if (lean_is_exclusive(x_143)) {
+ lean_ctor_release(x_143, 0);
+ lean_ctor_release(x_143, 1);
+ x_145 = x_143;
+} else {
+ lean_dec_ref(x_143);
+ x_145 = lean_box(0);
+}
+x_146 = lean_ctor_get(x_1, 5);
+lean_inc(x_146);
 lean_dec(x_1);
-x_149 = lean_ctor_get(x_139, 0);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_139, 1);
-lean_inc(x_150);
-if (lean_is_exclusive(x_139)) {
- lean_ctor_release(x_139, 0);
- lean_ctor_release(x_139, 1);
- x_151 = x_139;
+x_147 = lean_array_push(x_146, x_3);
+x_148 = l_Lean_mkApp(x_142, x_103);
+x_149 = l_Lean_mkAppN(x_148, x_147);
+x_150 = l_Lean_mkAppN(x_149, x_120);
+x_151 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_151, 0, x_150);
+lean_ctor_set(x_151, 1, x_139);
+if (lean_is_scalar(x_145)) {
+ x_152 = lean_alloc_ctor(0, 2, 0);
 } else {
- lean_dec_ref(x_139);
- x_151 = lean_box(0);
+ x_152 = x_145;
 }
-if (lean_is_scalar(x_151)) {
- x_152 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_152 = x_151;
-}
-lean_ctor_set(x_152, 0, x_149);
-lean_ctor_set(x_152, 1, x_150);
+lean_ctor_set(x_152, 0, x_151);
+lean_ctor_set(x_152, 1, x_144);
 return x_152;
 }
-}
 else
 {
 lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 
-lean_dec(x_135);
-lean_dec(x_133);
-lean_dec(x_118);
-lean_dec(x_101);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
+lean_dec(x_142);
+lean_dec(x_139);
+lean_dec(x_120);
+lean_dec(x_103);
 lean_dec(x_3);
 lean_dec(x_1);
-x_153 = lean_ctor_get(x_136, 0);
+x_153 = lean_ctor_get(x_143, 0);
 lean_inc(x_153);
-x_154 = lean_ctor_get(x_136, 1);
+x_154 = lean_ctor_get(x_143, 1);
 lean_inc(x_154);
-if (lean_is_exclusive(x_136)) {
- lean_ctor_release(x_136, 0);
- lean_ctor_release(x_136, 1);
- x_155 = x_136;
+if (lean_is_exclusive(x_143)) {
+ lean_ctor_release(x_143, 0);
+ lean_ctor_release(x_143, 1);
+ x_155 = x_143;
 } else {
- lean_dec_ref(x_136);
+ lean_dec_ref(x_143);
  x_155 = lean_box(0);
 }
 if (lean_is_scalar(x_155)) {
@@ -16712,24 +16681,26 @@ return x_156;
 else
 {
 lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
-lean_dec(x_118);
-lean_dec(x_101);
+lean_dec(x_139);
+lean_dec(x_137);
+lean_dec(x_120);
+lean_dec(x_103);
 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_157 = lean_ctor_get(x_132, 0);
+x_157 = lean_ctor_get(x_140, 0);
 lean_inc(x_157);
-x_158 = lean_ctor_get(x_132, 1);
+x_158 = lean_ctor_get(x_140, 1);
 lean_inc(x_158);
-if (lean_is_exclusive(x_132)) {
- lean_ctor_release(x_132, 0);
- lean_ctor_release(x_132, 1);
- x_159 = x_132;
+if (lean_is_exclusive(x_140)) {
+ lean_ctor_release(x_140, 0);
+ lean_ctor_release(x_140, 1);
+ x_159 = x_140;
 } else {
- lean_dec_ref(x_132);
+ lean_dec_ref(x_140);
  x_159 = lean_box(0);
 }
 if (lean_is_scalar(x_159)) {
@@ -16745,28 +16716,24 @@ return x_160;
 else
 {
 lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-lean_dec(x_122);
-lean_dec(x_118);
-lean_dec(x_105);
-lean_dec(x_102);
-lean_dec(x_101);
-lean_dec(x_14);
+lean_dec(x_120);
+lean_dec(x_103);
 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_161 = lean_ctor_get(x_127, 0);
+x_161 = lean_ctor_get(x_136, 0);
 lean_inc(x_161);
-x_162 = lean_ctor_get(x_127, 1);
+x_162 = lean_ctor_get(x_136, 1);
 lean_inc(x_162);
-if (lean_is_exclusive(x_127)) {
- lean_ctor_release(x_127, 0);
- lean_ctor_release(x_127, 1);
- x_163 = x_127;
+if (lean_is_exclusive(x_136)) {
+ lean_ctor_release(x_136, 0);
+ lean_ctor_release(x_136, 1);
+ x_163 = x_136;
 } else {
- lean_dec_ref(x_127);
+ lean_dec_ref(x_136);
  x_163 = lean_box(0);
 }
 if (lean_is_scalar(x_163)) {
@@ -16782,27 +16749,28 @@ return x_164;
 else
 {
 lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
-lean_dec(x_105);
-lean_dec(x_102);
-lean_dec(x_101);
+lean_dec(x_124);
+lean_dec(x_120);
+lean_dec(x_107);
+lean_dec(x_104);
+lean_dec(x_103);
 lean_dec(x_14);
-lean_dec(x_11);
 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_165 = lean_ctor_get(x_117, 0);
+x_165 = lean_ctor_get(x_129, 0);
 lean_inc(x_165);
-x_166 = lean_ctor_get(x_117, 1);
+x_166 = lean_ctor_get(x_129, 1);
 lean_inc(x_166);
-if (lean_is_exclusive(x_117)) {
- lean_ctor_release(x_117, 0);
- lean_ctor_release(x_117, 1);
- x_167 = x_117;
+if (lean_is_exclusive(x_129)) {
+ lean_ctor_release(x_129, 0);
+ lean_ctor_release(x_129, 1);
+ x_167 = x_129;
 } else {
- lean_dec_ref(x_117);
+ lean_dec_ref(x_129);
  x_167 = lean_box(0);
 }
 if (lean_is_scalar(x_167)) {
@@ -16818,9 +16786,9 @@ return x_168;
 else
 {
 lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 
+lean_dec(x_107);
+lean_dec(x_104);
 lean_dec(x_103);
-lean_dec(x_102);
-lean_dec(x_101);
 lean_dec(x_14);
 lean_dec(x_11);
 lean_dec(x_8);
@@ -16829,16 +16797,16 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_169 = lean_ctor_get(x_104, 0);
+x_169 = lean_ctor_get(x_119, 0);
 lean_inc(x_169);
-x_170 = lean_ctor_get(x_104, 1);
+x_170 = lean_ctor_get(x_119, 1);
 lean_inc(x_170);
-if (lean_is_exclusive(x_104)) {
- lean_ctor_release(x_104, 0);
- lean_ctor_release(x_104, 1);
- x_171 = x_104;
+if (lean_is_exclusive(x_119)) {
+ lean_ctor_release(x_119, 0);
+ lean_ctor_release(x_119, 1);
+ x_171 = x_119;
 } else {
- lean_dec_ref(x_104);
+ lean_dec_ref(x_119);
  x_171 = lean_box(0);
 }
 if (lean_is_scalar(x_171)) {
@@ -16851,10 +16819,46 @@ lean_ctor_set(x_172, 1, x_170);
 return x_172;
 }
 }
+else
+{
+lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; 
+lean_dec(x_105);
+lean_dec(x_104);
+lean_dec(x_103);
+lean_dec(x_14);
+lean_dec(x_11);
+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_173 = lean_ctor_get(x_106, 0);
+lean_inc(x_173);
+x_174 = lean_ctor_get(x_106, 1);
+lean_inc(x_174);
+if (lean_is_exclusive(x_106)) {
+ lean_ctor_release(x_106, 0);
+ lean_ctor_release(x_106, 1);
+ x_175 = x_106;
+} else {
+ lean_dec_ref(x_106);
+ x_175 = lean_box(0);
+}
+if (lean_is_scalar(x_175)) {
+ x_176 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_176 = x_175;
+}
+lean_ctor_set(x_176, 0, x_173);
+lean_ctor_set(x_176, 1, x_174);
+return x_176;
+}
+}
 }
 else
 {
-uint8_t x_173; 
+uint8_t x_177; 
 lean_dec(x_14);
 lean_dec(x_11);
 lean_dec(x_8);
@@ -16865,29 +16869,29 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_173 = !lean_is_exclusive(x_17);
-if (x_173 == 0)
+x_177 = !lean_is_exclusive(x_17);
+if (x_177 == 0)
 {
 return x_17;
 }
 else
 {
-lean_object* x_174; lean_object* x_175; lean_object* x_176; 
-x_174 = lean_ctor_get(x_17, 0);
-x_175 = lean_ctor_get(x_17, 1);
-lean_inc(x_175);
-lean_inc(x_174);
+lean_object* x_178; lean_object* x_179; lean_object* x_180; 
+x_178 = lean_ctor_get(x_17, 0);
+x_179 = lean_ctor_get(x_17, 1);
+lean_inc(x_179);
+lean_inc(x_178);
 lean_dec(x_17);
-x_176 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_176, 0, x_174);
-lean_ctor_set(x_176, 1, x_175);
-return x_176;
+x_180 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_180, 0, x_178);
+lean_ctor_set(x_180, 1, x_179);
+return x_180;
 }
 }
 }
 else
 {
-uint8_t x_177; 
+uint8_t x_181; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -16896,23 +16900,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_177 = !lean_is_exclusive(x_10);
-if (x_177 == 0)
+x_181 = !lean_is_exclusive(x_10);
+if (x_181 == 0)
 {
 return x_10;
 }
 else
 {
-lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-x_178 = lean_ctor_get(x_10, 0);
-x_179 = lean_ctor_get(x_10, 1);
-lean_inc(x_179);
-lean_inc(x_178);
+lean_object* x_182; lean_object* x_183; lean_object* x_184; 
+x_182 = lean_ctor_get(x_10, 0);
+x_183 = lean_ctor_get(x_10, 1);
+lean_inc(x_183);
+lean_inc(x_182);
 lean_dec(x_10);
-x_180 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_180, 0, x_178);
-lean_ctor_set(x_180, 1, x_179);
-return x_180;
+x_184 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_184, 0, x_182);
+lean_ctor_set(x_184, 1, x_183);
+return x_184;
 }
 }
 }
@@ -23349,7 +23353,7 @@ lean_dec(x_3);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_6740_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_6748_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -23650,7 +23654,7 @@ l_Lean_Meta_IndPredBelow_mkBelow___closed__5 = _init_l_Lean_Meta_IndPredBelow_mk
 lean_mark_persistent(l_Lean_Meta_IndPredBelow_mkBelow___closed__5);
 l_Lean_Meta_IndPredBelow_mkBelow___closed__6 = _init_l_Lean_Meta_IndPredBelow_mkBelow___closed__6();
 lean_mark_persistent(l_Lean_Meta_IndPredBelow_mkBelow___closed__6);
-res = l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_6740_(lean_io_mk_world());
+res = l_Lean_Meta_IndPredBelow_initFn____x40_Lean_Meta_IndPredBelow___hyg_6748_(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/Match/Match.c b/stage0/stdlib/Lean/Meta/Match/Match.c
index b3f953e9a4..97072a721f 100644
--- a/stage0/stdlib/Lean/Meta/Match/Match.c
+++ b/stage0/stdlib/Lean/Meta/Match/Match.c
@@ -20,14 +20,17 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_mo
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__5;
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15___at_Lean_Meta_Match_mkMatcher___spec__16(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_Example_applyFVarSubst(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_moveToFront_loop___rarg___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__1;
 lean_object* lean_array_set(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__15(lean_object*, lean_object*, 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*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__13(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_Meta_Match_processInaccessibleAsCtor___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__2;
@@ -36,7 +39,6 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_mo
 LEAN_EXPORT lean_object* l_Lean_commitWhenSome_x3f___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__2___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_Match_0__Lean_Meta_updateAlts___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isConstructorTransition___spec__1(uint8_t, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__8;
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at_Lean_Meta_Match_processInaccessibleAsCtor___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkFreshLevelMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -63,24 +65,24 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_is
 LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Meta_Match_Unify_assign___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_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Std_AssocList_contains___at_Lean_Meta_FVarSubst_contains___spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___closed__2;
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___closed__1;
 static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__3___closed__3;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType(lean_object*, 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_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__1(lean_object*, lean_object*);
 static lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___spec__2___closed__1;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__8___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__2;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MkMatcherInput_numDiscrs___boxed(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_updateAlts___lambda__3___closed__2;
 uint8_t lean_usize_dec_eq(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4___boxed(lean_object**);
@@ -93,7 +95,6 @@ lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_processInaccessibleAsCtor___spec__4(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__6;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isArrayLitTransition___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4___closed__1;
@@ -106,6 +107,7 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_M
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_addArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search___closed__4;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go(lean_object*);
 extern lean_object* l_Lean_maxRecDepthErrorMessage;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoCtor_x3f___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -119,20 +121,22 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwIn
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2;
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___closed__6;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_saveState___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_matchMatcherApp_x3f___at_Lean_Meta_Match_withMkMatcherInput___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__4___closed__2;
 size_t lean_usize_sub(size_t, size_t);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___closed__5;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__12;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__6(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoCtor_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__13___boxed(lean_object**);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit_loop___spec__2(lean_object*, lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
@@ -148,25 +152,29 @@ LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_Match_
 static lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor___lambda__1___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Match_Unify_occurs(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__15___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__11(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_constructorApp_x3f(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__14(lean_object*, lean_object*, lean_object*, lean_object*, 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*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__6;
 extern lean_object* l_Lean_Meta_Match_instInhabitedAlt;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___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*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_unify_x3f___closed__3;
 extern lean_object* l_instInhabitedNat;
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9___closed__1;
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__7;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasValPattern___boxed(lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___lambda__1___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__17(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*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__15___boxed(lean_object**);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2___boxed(lean_object**);
 lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_collectValues(lean_object*);
 LEAN_EXPORT lean_object* l_List_filterAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__6___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_filterMapM___at_Lean_Meta_Match_mkMatcher___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isNextVar(lean_object*);
 lean_object* lean_array_get_size(lean_object*);
@@ -176,8 +184,11 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process
 LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Meta_Match_Unify_assign___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__13;
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasNatValPattern(lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__7(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 lean_object* l_Lean_MessageData_ofList(lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__5;
 lean_object* l_Lean_Meta_isTypeCorrect(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasVarPattern___spec__1(uint8_t, lean_object*);
@@ -197,18 +208,21 @@ LEAN_EXPORT lean_object* l_List_foldl___at___private_Lean_Meta_Match_Match_0__Le
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoCtor_x3f___spec__3(lean_object*, lean_object*, lean_object*);
 size_t lean_usize_shift_right(size_t, size_t);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___closed__4;
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandNatValuePattern___spec__1___closed__6;
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__14___closed__2;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isDone(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___closed__1;
 static lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___closed__1;
 LEAN_EXPORT lean_object* l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNextPatternTypes___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__14___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_matchMatcherApp_x3f___at_Lean_Meta_Match_withMkMatcherInput___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__3;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___lambda__1___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop(lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -216,14 +230,16 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_pr
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_withMkMatcherInput___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_lt(size_t, size_t);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__14___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasVarPattern___spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_traceStep(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__11___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__3___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_unify_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_State_fvarSubst___default;
 extern lean_object* l_Lean_levelZero;
@@ -231,6 +247,7 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlt
 lean_object* lean_nat_add(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__9;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected___rarg___closed__4;
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1(lean_object*, size_t, size_t);
 static lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor___lambda__1___closed__4;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__4;
 static lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__2___closed__1;
@@ -239,45 +256,49 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlt
 static lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___spec__2___closed__2;
 lean_object* l_Lean_Meta_mkEqRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasNonTrivialExample___spec__1(uint8_t, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___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*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__3;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_withMkMatcherInput___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit_loop___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__1;
 LEAN_EXPORT lean_object* l_List_foldl___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__6___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__7(lean_object*, lean_object*);
+lean_object* l_Array_zip___rarg(lean_object*, lean_object*);
 static lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___lambda__2___closed__3;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__18___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__19___closed__2;
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__2;
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__2;
 uint8_t l_Array_contains___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__3(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__3;
 size_t lean_uint64_to_usize(uint64_t);
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Match_Match___hyg_12131_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Match_Match___hyg_13034_(lean_object*);
 lean_object* l_Lean_Expr_FindImpl_findUnsafe_x3f(lean_object*, lean_object*);
 uint8_t l_Lean_Environment_hasUnsafe(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNextPatternTypes(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__7___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__7___boxed(lean_object**);
 static lean_object* l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__3;
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasVarPattern(lean_object*);
-static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__19___boxed(lean_object**);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandNatValuePattern___spec__1___closed__4;
 LEAN_EXPORT lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4___closed__3;
 lean_object* l_Lean_Meta_lambdaTelescope___at___private_Lean_Meta_Eqns_0__Lean_Meta_mkSimpleEqThm___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__19___closed__1;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__21(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isArrayLitTransition(lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasCtorPattern___spec__1(uint8_t, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__16;
 lean_object* l_Lean_ConstantInfo_levelParams(lean_object*);
 LEAN_EXPORT lean_object* l_Std_mkHashSet___at_Lean_Meta_Match_State_used___default___spec__1(lean_object*);
 lean_object* l_List_mapTRAux___at_Lean_MessageData_instCoeListExprMessageData___spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____lambda__1___boxed(lean_object*, lean_object*);
 static lean_object* l_List_forIn_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNextPatternTypes___spec__1___closed__2;
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__7___closed__2;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__15;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts(lean_object*);
@@ -290,25 +311,32 @@ uint8_t l_Lean_Option_get___at_Lean_getSanitizeNames___spec__1(lean_object*, lea
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__8(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__18;
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__10___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__19(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*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___closed__3;
 lean_object* l_Std_PersistentHashMap_instInhabitedPersistentHashMap___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_assign___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__9(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoCtor_x3f___spec__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_Pattern_toMessageData(lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__4;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__18___boxed(lean_object**);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__15___closed__2;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___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*);
 static lean_object* l_List_forIn_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNextPatternTypes___spec__1___closed__1;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_Pattern_toExpr_visit(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_constLevels_x21(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___boxed(lean_object**);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__8;
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__6;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNextPatternTypes___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -319,7 +347,7 @@ LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Meta_Match_Match_
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasArrayLitPattern(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__1;
 lean_object* l_Lean_mkRawNatLit(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___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*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor___closed__2;
 lean_object* l_Lean_Meta_mkHasTypeButIsExpectedMsg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -357,10 +385,12 @@ static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCa
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isVariableTransition(lean_object*);
 lean_object* l_Lean_Meta_mkLambdaFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__7;
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasRecursiveType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8___at_Lean_Meta_Match_mkMatcher___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__20___closed__2;
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasValPattern(lean_object*);
 lean_object* lean_name_append_index_after(lean_object*, lean_object*);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandNatValuePattern___spec__1___closed__5;
@@ -368,11 +398,13 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_pr
 lean_object* l_Lean_Meta_getInductiveUniverseAndParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasNonTrivialExample(lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__6;
 lean_object* l_Lean_ConstantInfo_name(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___lambda__1___closed__3;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor___lambda__1___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__16___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_moveToFront___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__7(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -390,12 +422,16 @@ static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__6(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_matcherExt;
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15___at_Lean_Meta_Match_mkMatcher___spec__16___at_Lean_Meta_Match_mkMatcher___spec__17(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__17___closed__1;
 extern lean_object* l_Lean_Expr_instHashableExpr;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_assign(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__12___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_inLocalDecls___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 uint64_t l_Lean_Expr_hash(lean_object*);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandNatValuePattern___spec__1___closed__7;
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__20___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_State_counterExamples___default;
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__1;
@@ -403,7 +439,9 @@ LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isConst
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__8;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_updateAlts___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__2___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__17___boxed(lean_object**);
 lean_object* l_Lean_LocalContext_getFVar_x21(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___closed__4;
 LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isConstructorTransition___spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -411,7 +449,6 @@ size_t lean_usize_shift_left(size_t, size_t);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processAsPattern___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_array_to_list(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_InfoCacheKey_instHashableInfoCacheKey___boxed(lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__5;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__2;
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isFirstPatternVar(lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Match_Unify_occurs___lambda__1(lean_object*, lean_object*);
@@ -420,12 +457,13 @@ uint64_t lean_uint64_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_List_foldl___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_collectValues___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__16(lean_object*, lean_object*, 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*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr;
 lean_object* l_Lean_Meta_Match_addMatcherInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_addArg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2___closed__1;
 size_t lean_usize_modn(size_t, lean_object*);
@@ -442,6 +480,7 @@ static lean_object* l_Lean_Meta_Match_Unify_assign___closed__8;
 static lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___closed__1;
 static lean_object* l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__1;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
+extern lean_object* l_Lean_Meta_Match_instInhabitedDiscrInfo;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__2(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_unify_x3f___closed__4;
@@ -451,6 +490,8 @@ static lean_object* l_Lean_Meta_Match_Unify_unify___closed__1;
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_moveToFront_loop___spec__1___rarg(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__2;
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__11___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isVariableTransition___spec__1(uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_moveToFront___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -463,20 +504,23 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_processInaccessibleAsCtor___lambda__1
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__1;
 LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasValPattern___spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isValueTransition___spec__1(uint8_t, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8___closed__2;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__5___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__6;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MkMatcherInput_numDiscrs(lean_object*);
 lean_object* l_Lean_mkFVar(lean_object*);
 uint8_t l_List_elem___at_Lean_Occurrences_contains___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_indexOfAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SavedState_restore(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2___closed__3;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_withMkMatcherInput___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkSimpleThunkType(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7(size_t, size_t, lean_object*);
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__4;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__2___closed__2;
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
@@ -485,13 +529,13 @@ LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Matc
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__7(lean_object*, lean_object*, lean_object*);
 lean_object* l_instBEqProd___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at_Lean_Meta_Match_Unify_assign___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__13(lean_object*, lean_object*, 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*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Std_HashSetImp_contains___at_Lean_Meta_Match_mkMatcher___spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasNonTrivialExample___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withMVarContext___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_synthPendingImp___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___closed__1;
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8___closed__1;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__2;
 size_t lean_usize_land(size_t, size_t);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__5;
@@ -500,16 +544,16 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_Li
 lean_object* l___private_Lean_Util_Trace_0__Lean_addTraceOptions(lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasCtorPattern(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException(lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldRevM_loop___at_Lean_Meta_MatcherApp_addArg___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__5___closed__1;
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__5;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_isCurrVarInductive___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescope___at___private_Lean_Meta_InferType_0__Lean_Meta_inferForallType___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__7___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__2;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Match_getNumEqsFromDiscrInfos(lean_object*);
 lean_object* l_Lean_Meta_FVarSubst_get(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandNatValuePattern___spec__1(lean_object*, lean_object*);
@@ -519,7 +563,6 @@ LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Le
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__2___closed__3;
 lean_object* l_Lean_Meta_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__3;
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__1___closed__1;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_checkVarDeps___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -530,6 +573,7 @@ lean_object* l_Std_PersistentArray_push___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Cases_cases(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___closed__5;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isNatValueTransition___boxed(lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1;
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__4(lean_object*, lean_object*, lean_object*);
@@ -550,6 +594,7 @@ uint8_t lean_expr_eqv(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isValueTransition(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__1(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_abstractRange___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_assignGoalOf___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t lean_usize_dec_le(size_t, size_t);
@@ -576,6 +621,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_ha
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__1;
 lean_object* l_Lean_Meta_isLevelDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_instantiateForallAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__9;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_assignGoalOf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_withMkMatcherInput___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_admit(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -584,7 +630,7 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_M
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__4(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasNatValPattern___boxed(lean_object*);
 static lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__4;
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+LEAN_EXPORT uint8_t l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____lambda__1(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_processInaccessibleAsCtor___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasValPattern___spec__1(uint8_t, lean_object*);
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__1___closed__2;
@@ -595,6 +641,7 @@ LEAN_EXPORT lean_object* l_List_foldr___at___private_Lean_Meta_Match_Match_0__Le
 LEAN_EXPORT lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_updateAlts___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoCtor_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_filterMapM___at_Lean_Meta_Match_mkMatcher___spec__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__10;
 LEAN_EXPORT lean_object* l_Array_indexOfAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_ofSubarray___rarg(lean_object*);
@@ -603,6 +650,7 @@ lean_object* l_Lean_Meta_getLevel(lean_object*, lean_object*, lean_object*, lean
 static lean_object* l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__2;
 LEAN_EXPORT lean_object* l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_mul(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_mkMatcher___spec__12(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_traceState(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__5(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2;
@@ -617,9 +665,11 @@ lean_object* l_Lean_Meta_Match_Example_replaceFVarId(lean_object*, lean_object*,
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___closed__1;
 LEAN_EXPORT lean_object* l_Std_HashSetImp_contains___at_Lean_Meta_Match_mkMatcher___spec__3___boxed(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___boxed(lean_object**);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__9;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwNonSupported___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_List_filterAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoCtor_x3f___spec__2(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__14___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isNatValueTransition___spec__1(uint8_t, lean_object*);
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__5;
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -634,8 +684,10 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_hasArrayLitPattern___spec__1(uint8_t, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__18(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*);
 lean_object* l_instBEq___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_infer_type(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8___at_Lean_Meta_Match_mkMatcher___spec__9___at_Lean_Meta_Match_mkMatcher___spec__10(lean_object*, lean_object*);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__6___closed__1;
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -643,6 +695,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_is
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_updateAlts___lambda__3___closed__1;
 lean_object* l_Lean_Meta_Match_withGoalOf___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___at_Lean_Meta_reduceMatcher_x3f___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit_loop___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected___spec__1(lean_object*);
@@ -669,9 +722,12 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_occurs___boxed(lean_object*, le
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_traceStep___closed__1;
 uint64_t lean_uint64_mix_hash(uint64_t, uint64_t);
 lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__5;
 extern lean_object* l_Lean_Expr_instBEqExpr;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_unify_x3f___closed__1;
+LEAN_EXPORT lean_object* l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwNonSupported(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNextPatternTypes___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_findNext(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -681,6 +737,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__4;
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_traceStep___closed__2;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processAsPattern___closed__2;
@@ -688,7 +745,10 @@ LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0_
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__1___closed__6;
 lean_object* l_Lean_indentD(lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____lambda__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__3(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___closed__3;
 lean_object* l_Lean_Meta_Match_examplesToMessageData(lean_object*);
 static size_t l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__2___closed__2;
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -701,20 +761,19 @@ lean_object* l_Lean_Meta_whnfD(lean_object*, lean_object*, lean_object*, lean_ob
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_instantiateLambdaAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_unify_x3f___closed__2;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_getMkMatcherInputInContext___lambda__3___closed__1;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__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*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_inLocalDecls___boxed(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____lambda__1(uint8_t, uint8_t);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___closed__1;
 lean_object* l_Lean_Meta_setInlineAttribute(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__6(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___closed__3;
 LEAN_EXPORT lean_object* l_Std_HashSetImp_expand___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__4(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs(lean_object*);
 lean_object* l_Lean_Expr_getAppFn(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__3(lean_object*, lean_object*, lean_object*);
@@ -722,7 +781,6 @@ static lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInpu
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_assignGoalOf___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___lambda__2___closed__4;
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__4;
 lean_object* l_Lean_Meta_Match_MatcherInfo_numAlts(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -737,28 +795,35 @@ LEAN_EXPORT lean_object* l_panic___at___private_Lean_Meta_Match_Match_0__Lean_Me
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_unify_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instHashableBool___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__14(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_mkLevelParam(lean_object*);
 static lean_object* l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__4;
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__11;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___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* lean_usize_to_nat(size_t);
 static lean_object* l_Lean_Meta_Match_withMkMatcherInput___rarg___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_bootstrap_genMatcherCode;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_moveToFront(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Unify_assign___closed__6;
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_inLocalDecls___spec__1(lean_object*, uint8_t, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__20(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*);
 uint8_t lean_level_eq(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___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*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___boxed(lean_object**);
 lean_object* l_EStateM_pure___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_mkEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isVariableTransition___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__2(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashSetImp_moveEntries___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___spec__5(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___closed__1;
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1;
 lean_object* l_Lean_indentExpr(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_mkMatcher___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2___closed__6;
 static lean_object* l_Lean_Meta_MatcherApp_addArg___lambda__2___closed__2;
+static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2;
 extern lean_object* l_Lean_Meta_Match_instInhabitedProblem;
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__4(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -781,8 +846,8 @@ LEAN_EXPORT lean_object* l_List_filterMapM_loop___at___private_Lean_Meta_Match_M
 lean_object* l_Lean_Meta_Match_Alt_applyFVarSubst(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_moveToFront_loop___spec__1(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwCasesException___rarg___closed__12;
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593_(lean_object*);
 static lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_withMkMatcherInput___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_tryToProcess___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -790,36 +855,34 @@ static lean_object* l_panic___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Ma
 lean_object* l_Std_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
 lean_object* l_List_appendTR___rarg(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_isArrayLitTransition___spec__1(uint8_t, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__6;
 static lean_object* l_Array_mapIdxM_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__10___lambda__2___closed__2;
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_isAltVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__5(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processLeaf___closed__4;
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwInductiveTypeExpected___rarg___closed__2;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_moveToFront___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_expandIfVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__9;
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkConstWithLevelParams___at_Lean_Meta_mkSimpCongrTheorem___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instInhabitedMetaM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Unify_assign___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_withMkMatcherInput___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_applyFVarSubst(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__3;
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___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_Lean_Meta_check(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__2(lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_moveToFront(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__4;
 lean_object* l_Lean_Exception_toMessageData(lean_object*);
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_MatcherApp_addArg___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_throwNonSupported___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_mkMatcherAuxDefinition___spec__2___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___closed__5;
 static lean_object* l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2___closed__8;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_updateAlts___lambda__2___closed__1;
@@ -876,26 +939,24 @@ return x_2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns(lean_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; uint8_t x_9; uint8_t x_10; 
-x_8 = lean_array_get_size(x_1);
-x_9 = 0;
-x_10 = l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___spec__1(x_8, x_9, x_2);
-lean_dec(x_8);
-if (x_10 == 0)
+uint8_t x_8; uint8_t x_9; 
+x_8 = 0;
+x_9 = l_List_foldr___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___spec__1(x_1, x_8, x_2);
+if (x_9 == 0)
 {
-lean_object* x_11; lean_object* x_12; 
-x_11 = lean_box(0);
-x_12 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_12, 0, x_11);
-lean_ctor_set(x_12, 1, x_7);
-return x_12;
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_box(0);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_7);
+return x_11;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; 
-x_13 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__2;
-x_14 = l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(x_13, x_3, x_4, x_5, x_6, x_7);
-return x_14;
+lean_object* x_12; lean_object* x_13; 
+x_12 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__2;
+x_13 = l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(x_12, x_3, x_4, x_5, x_6, x_7);
+return x_13;
 }
 }
 }
@@ -926,6 +987,154 @@ lean_dec(x_1);
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_13 = lean_unsigned_to_nat(1u);
+x_14 = lean_nat_add(x_1, x_13);
+lean_dec(x_1);
+x_15 = lean_array_push(x_2, x_7);
+x_16 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___rarg(x_3, x_4, x_5, x_6, x_14, x_15, x_8, x_9, x_10, x_11, x_12);
+return x_16;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___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, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; uint8_t x_13; 
+x_12 = lean_array_get_size(x_1);
+x_13 = lean_nat_dec_lt(x_5, x_12);
+lean_dec(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_14 = lean_apply_6(x_4, x_6, x_7, x_8, x_9, x_10, x_11);
+return x_14;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = l_Lean_Meta_Match_instInhabitedDiscrInfo;
+x_16 = lean_array_get(x_15, x_3, x_5);
+if (lean_obj_tag(x_16) == 0)
+{
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_unsigned_to_nat(1u);
+x_18 = lean_nat_add(x_5, x_17);
+lean_dec(x_5);
+x_5 = x_18;
+goto _start;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_20 = lean_ctor_get(x_16, 0);
+lean_inc(x_20);
+lean_dec(x_16);
+x_21 = l_Lean_instInhabitedExpr;
+x_22 = lean_array_get(x_21, x_1, x_5);
+x_23 = lean_array_get(x_21, x_2, x_5);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_24 = l_Lean_Meta_mkEq(x_22, x_23, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_24) == 0)
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; 
+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_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___rarg___lambda__1), 12, 6);
+lean_closure_set(x_27, 0, x_5);
+lean_closure_set(x_27, 1, x_6);
+lean_closure_set(x_27, 2, x_1);
+lean_closure_set(x_27, 3, x_2);
+lean_closure_set(x_27, 4, x_3);
+lean_closure_set(x_27, 5, x_4);
+x_28 = 0;
+x_29 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_20, x_28, x_25, x_27, x_7, x_8, x_9, x_10, x_26);
+return x_29;
+}
+else
+{
+uint8_t x_30; 
+lean_dec(x_20);
+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_30 = !lean_is_exclusive(x_24);
+if (x_30 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_24, 0);
+x_32 = lean_ctor_get(x_24, 1);
+lean_inc(x_32);
+lean_inc(x_31);
+lean_dec(x_24);
+x_33 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+return x_33;
+}
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___rarg), 11, 0);
+return x_2;
+}
+}
+static lean_object* _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_10 = lean_unsigned_to_nat(0u);
+x_11 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
+x_12 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs_go___rarg(x_1, x_2, x_3, x_4, x_10, x_11, x_5, x_6, x_7, x_8, x_9);
+return x_12;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg), 9, 0);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___spec__1(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
@@ -1001,56 +1210,67 @@ return x_25;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_11; 
+lean_object* x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; lean_object* x_13; 
+x_9 = l_Array_append___rarg(x_1, x_3);
+x_10 = 0;
+x_11 = 1;
+x_12 = 1;
+x_13 = l_Lean_Meta_mkForallFVars(x_9, x_2, x_10, x_11, x_12, x_4, x_5, x_6, x_7, x_8);
+return x_13;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__2(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, 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_inc(x_11);
+lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_11 = l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___spec__1(x_1, x_2, x_3, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_11) == 0)
+x_13 = l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___spec__1(x_1, x_2, x_3, x_8, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_13) == 0)
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; uint8_t x_16; uint8_t x_17; lean_object* x_18; 
-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 = l_Lean_mkAppN(x_4, x_12);
-x_15 = 0;
-x_16 = 1;
-x_17 = 1;
-x_18 = l_Lean_Meta_mkForallFVars(x_5, x_14, x_15, x_16, x_17, x_6, x_7, x_8, x_9, x_13);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+lean_inc(x_14);
+x_16 = l_Lean_mkAppN(x_4, x_14);
+x_17 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1___boxed), 8, 2);
+lean_closure_set(x_17, 0, x_5);
+lean_closure_set(x_17, 1, x_16);
+x_18 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg(x_6, x_14, x_7, x_17, x_8, x_9, x_10, x_11, x_15);
 return x_18;
 }
 else
 {
 uint8_t x_19; 
+lean_dec(x_11);
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_19 = !lean_is_exclusive(x_11);
+x_19 = !lean_is_exclusive(x_13);
 if (x_19 == 0)
 {
-return x_11;
+return x_13;
 }
 else
 {
 lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_20 = lean_ctor_get(x_11, 0);
-x_21 = lean_ctor_get(x_11, 1);
+x_20 = lean_ctor_get(x_13, 0);
+x_21 = lean_ctor_get(x_13, 1);
 lean_inc(x_21);
 lean_inc(x_20);
-lean_dec(x_11);
+lean_dec(x_13);
 x_22 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_22, 0, x_20);
 lean_ctor_set(x_22, 1, x_21);
@@ -1068,32 +1288,34 @@ x_2 = lean_box_usize(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_9 = lean_ctor_get(x_3, 1);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_3, 2);
-lean_inc(x_10);
-lean_dec(x_3);
-x_11 = l_List_redLength___rarg(x_10);
-x_12 = lean_mk_empty_array_with_capacity(x_11);
-lean_dec(x_11);
-x_13 = l_List_toArrayAux___rarg(x_10, x_12);
-x_14 = lean_array_get_size(x_13);
-x_15 = lean_usize_of_nat(x_14);
-lean_dec(x_14);
-x_16 = lean_box_usize(x_15);
-x_17 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___boxed__const__1;
-x_18 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1___boxed), 10, 5);
-lean_closure_set(x_18, 0, x_16);
-lean_closure_set(x_18, 1, x_17);
-lean_closure_set(x_18, 2, x_13);
-lean_closure_set(x_18, 3, x_1);
-lean_closure_set(x_18, 4, x_2);
-x_19 = l_Lean_Meta_withExistingLocalDecls___at_Lean_Meta_Match_Alt_toMessageData___spec__3___rarg(x_9, x_18, x_4, x_5, x_6, x_7, x_8);
-return x_19;
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_11 = lean_ctor_get(x_5, 1);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_5, 2);
+lean_inc(x_12);
+lean_dec(x_5);
+x_13 = l_List_redLength___rarg(x_12);
+x_14 = lean_mk_empty_array_with_capacity(x_13);
+lean_dec(x_13);
+x_15 = l_List_toArrayAux___rarg(x_12, x_14);
+x_16 = lean_array_get_size(x_15);
+x_17 = lean_usize_of_nat(x_16);
+lean_dec(x_16);
+x_18 = lean_box_usize(x_17);
+x_19 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___boxed__const__1;
+x_20 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__2___boxed), 12, 7);
+lean_closure_set(x_20, 0, x_18);
+lean_closure_set(x_20, 1, x_19);
+lean_closure_set(x_20, 2, x_15);
+lean_closure_set(x_20, 3, x_1);
+lean_closure_set(x_20, 4, x_4);
+lean_closure_set(x_20, 5, x_2);
+lean_closure_set(x_20, 6, x_3);
+x_21 = l_Lean_Meta_withExistingLocalDecls___at_Lean_Meta_Match_Alt_toMessageData___spec__3___rarg(x_11, x_20, x_6, x_7, x_8, x_9, x_10);
+return x_21;
 }
 }
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___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) {
@@ -1108,16 +1330,61 @@ x_11 = l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_Match_0__Lean_Meta_
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___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_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___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) {
 _start:
 {
-size_t x_11; size_t x_12; lean_object* x_13; 
-x_11 = lean_unbox_usize(x_1);
+lean_object* x_9; 
+x_9 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1(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);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+size_t x_13; size_t x_14; lean_object* x_15; 
+x_13 = lean_unbox_usize(x_1);
 lean_dec(x_1);
-x_12 = lean_unbox_usize(x_2);
+x_14 = lean_unbox_usize(x_2);
 lean_dec(x_2);
-x_13 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__1(x_11, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_13;
+x_15 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___lambda__2(x_13, x_14, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+return x_15;
+}
+}
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1(lean_object* x_1, size_t x_2, size_t x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_usize_dec_eq(x_2, x_3);
+if (x_4 == 0)
+{
+lean_object* x_5; 
+x_5 = lean_array_uget(x_1, x_2);
+if (lean_obj_tag(x_5) == 0)
+{
+size_t x_6; size_t x_7; 
+x_6 = 1;
+x_7 = lean_usize_add(x_2, x_6);
+x_2 = x_7;
+goto _start;
+}
+else
+{
+uint8_t x_9; 
+lean_dec(x_5);
+x_9 = 1;
+return x_9;
+}
+}
+else
+{
+uint8_t x_10; 
+x_10 = 0;
+return x_10;
+}
 }
 }
 static lean_object* _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__1() {
@@ -1166,84 +1433,86 @@ x_3 = l_Lean_mkConst(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
 _start:
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-lean_inc(x_13);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_13);
-lean_ctor_set(x_19, 1, x_1);
-x_20 = lean_array_push(x_2, x_19);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
 lean_inc(x_15);
-x_21 = l_List_mapM___at_Lean_Meta_Match_instantiateAltLHSMVars___spec__1(x_3, x_14, x_15, x_16, x_17, x_18);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_15);
+lean_ctor_set(x_21, 1, x_1);
+x_22 = lean_array_push(x_2, x_21);
+lean_inc(x_17);
+x_23 = l_List_mapM___at_Lean_Meta_Match_instantiateAltLHSMVars___spec__1(x_3, x_16, x_17, x_18, x_19, x_20);
 if (x_4 == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = l_Lean_mkAppN(x_13, x_5);
-x_25 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_25, 0, x_6);
-lean_ctor_set(x_25, 1, x_7);
-lean_ctor_set(x_25, 2, x_24);
-lean_ctor_set(x_25, 3, x_22);
-lean_ctor_set(x_25, 4, x_8);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_9);
-x_27 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(x_10, x_11, x_12, x_26, x_20, x_14, x_15, x_16, x_17, x_23);
-return x_27;
+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_dec(x_14);
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__5;
+x_27 = l_Lean_mkApp(x_15, x_26);
+x_28 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_28, 0, x_5);
+lean_ctor_set(x_28, 1, x_6);
+lean_ctor_set(x_28, 2, x_27);
+lean_ctor_set(x_28, 3, x_24);
+lean_ctor_set(x_28, 4, x_7);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_8);
+x_30 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(x_9, x_10, x_11, x_12, x_13, x_29, x_22, x_16, x_17, x_18, x_19, x_25);
+return x_30;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-lean_dec(x_5);
-x_28 = lean_ctor_get(x_21, 0);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_21, 1);
-lean_inc(x_29);
-lean_dec(x_21);
-x_30 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__5;
-x_31 = l_Lean_mkApp(x_13, x_30);
-x_32 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_32, 0, x_6);
-lean_ctor_set(x_32, 1, x_7);
-lean_ctor_set(x_32, 2, x_31);
-lean_ctor_set(x_32, 3, x_28);
-lean_ctor_set(x_32, 4, x_8);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_32);
-lean_ctor_set(x_33, 1, x_9);
-x_34 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(x_10, x_11, x_12, x_33, x_20, x_14, x_15, x_16, x_17, x_29);
-return x_34;
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_31 = lean_ctor_get(x_23, 0);
+lean_inc(x_31);
+x_32 = lean_ctor_get(x_23, 1);
+lean_inc(x_32);
+lean_dec(x_23);
+x_33 = l_Lean_mkAppN(x_15, x_14);
+x_34 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_34, 0, x_5);
+lean_ctor_set(x_34, 1, x_6);
+lean_ctor_set(x_34, 2, x_33);
+lean_ctor_set(x_34, 3, x_31);
+lean_ctor_set(x_34, 4, x_7);
+x_35 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_8);
+x_36 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(x_9, x_10, x_11, x_12, x_13, x_35, x_22, x_16, x_17, x_18, x_19, x_32);
+return x_36;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21, lean_object* x_22) {
 _start:
 {
-lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; 
-x_21 = lean_box(x_4);
-x_22 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___boxed), 18, 12);
-lean_closure_set(x_22, 0, x_1);
-lean_closure_set(x_22, 1, x_2);
-lean_closure_set(x_22, 2, x_3);
-lean_closure_set(x_22, 3, x_21);
-lean_closure_set(x_22, 4, x_5);
-lean_closure_set(x_22, 5, x_6);
-lean_closure_set(x_22, 6, x_7);
-lean_closure_set(x_22, 7, x_8);
-lean_closure_set(x_22, 8, x_9);
-lean_closure_set(x_22, 9, x_10);
-lean_closure_set(x_22, 10, x_11);
-lean_closure_set(x_22, 11, x_12);
-x_23 = 0;
-x_24 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_13, x_23, x_14, x_22, x_16, x_17, x_18, x_19, x_20);
-return x_24;
+lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; 
+x_23 = lean_box(x_4);
+x_24 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___boxed), 20, 14);
+lean_closure_set(x_24, 0, x_1);
+lean_closure_set(x_24, 1, x_2);
+lean_closure_set(x_24, 2, x_3);
+lean_closure_set(x_24, 3, x_23);
+lean_closure_set(x_24, 4, x_5);
+lean_closure_set(x_24, 5, x_6);
+lean_closure_set(x_24, 6, x_7);
+lean_closure_set(x_24, 7, x_8);
+lean_closure_set(x_24, 8, x_9);
+lean_closure_set(x_24, 9, x_10);
+lean_closure_set(x_24, 10, x_11);
+lean_closure_set(x_24, 11, x_12);
+lean_closure_set(x_24, 12, x_13);
+lean_closure_set(x_24, 13, x_14);
+x_25 = 0;
+x_26 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_15, x_25, x_16, x_24, x_18, x_19, x_20, x_21, x_22);
+return x_26;
 }
 }
 static lean_object* _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__1() {
@@ -1369,200 +1638,272 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___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, lean_object* x_10) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___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, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-if (lean_obj_tag(x_3) == 0)
+if (lean_obj_tag(x_5) == 0)
 {
-lean_object* x_11; lean_object* x_12; 
+lean_object* x_13; lean_object* x_14; 
+lean_dec(x_3);
+lean_dec(x_2);
 lean_dec(x_1);
-x_11 = l_List_reverse___rarg(x_4);
-x_12 = lean_apply_7(x_2, x_11, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_12;
+x_13 = l_List_reverse___rarg(x_6);
+x_14 = lean_apply_7(x_4, x_13, x_7, x_8, x_9, x_10, x_11, x_12);
+return x_14;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; size_t x_22; size_t x_23; lean_object* x_24; lean_object* x_25; 
-x_13 = lean_ctor_get(x_3, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_3, 1);
-lean_inc(x_14);
-lean_dec(x_3);
-x_15 = lean_ctor_get(x_13, 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; size_t x_24; size_t x_25; lean_object* x_26; lean_object* x_27; 
+x_15 = lean_ctor_get(x_5, 0);
 lean_inc(x_15);
-x_16 = lean_ctor_get(x_13, 1);
+x_16 = lean_ctor_get(x_5, 1);
 lean_inc(x_16);
-x_17 = lean_ctor_get(x_13, 2);
+lean_dec(x_5);
+x_17 = lean_ctor_get(x_15, 0);
 lean_inc(x_17);
-x_18 = l_List_redLength___rarg(x_16);
-x_19 = lean_mk_empty_array_with_capacity(x_18);
-lean_dec(x_18);
-lean_inc(x_16);
-x_20 = l_List_toArrayAux___rarg(x_16, x_19);
-x_21 = lean_array_get_size(x_20);
-x_22 = lean_usize_of_nat(x_21);
-lean_dec(x_21);
-x_23 = 0;
-x_24 = l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(x_22, x_23, x_20);
+x_18 = lean_ctor_get(x_15, 1);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_15, 2);
+lean_inc(x_19);
+x_20 = l_List_redLength___rarg(x_18);
+x_21 = lean_mk_empty_array_with_capacity(x_20);
+lean_dec(x_20);
+lean_inc(x_18);
+x_22 = l_List_toArrayAux___rarg(x_18, x_21);
+x_23 = lean_array_get_size(x_22);
+x_24 = lean_usize_of_nat(x_23);
+lean_dec(x_23);
+x_25 = 0;
+x_26 = l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(x_24, x_25, x_22);
+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_24);
-lean_inc(x_1);
-x_25 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType(x_1, x_24, x_13, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_25) == 0)
-{
-lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; 
-x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = l_Array_isEmpty___rarg(x_24);
-if (x_28 == 0)
+lean_inc(x_3);
+lean_inc(x_2);
+lean_inc(x_1);
+x_27 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType(x_1, x_2, x_3, x_26, x_15, x_8, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_27) == 0)
 {
-lean_object* x_68; 
-x_68 = lean_array_get_size(x_24);
-x_29 = x_26;
-x_30 = x_68;
-goto block_67;
-}
-else
-{
-lean_object* x_69; lean_object* x_70; 
-x_69 = l_Lean_mkSimpleThunkType(x_26);
-x_70 = lean_unsigned_to_nat(1u);
-x_29 = x_69;
-x_30 = x_70;
-goto block_67;
-}
-block_67:
-{
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; 
-x_31 = lean_unsigned_to_nat(0u);
-x_32 = l_List_lengthTRAux___rarg(x_4, x_31);
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_32, x_33);
-x_35 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__2;
-x_36 = lean_name_append_index_after(x_35, x_34);
-x_37 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__8;
-x_56 = lean_st_ref_get(x_9, x_27);
-x_57 = lean_ctor_get(x_56, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_57, 3);
-lean_inc(x_58);
-lean_dec(x_57);
-x_59 = lean_ctor_get_uint8(x_58, sizeof(void*)*1);
-lean_dec(x_58);
-if (x_59 == 0)
-{
-lean_object* x_60; uint8_t x_61; 
-x_60 = lean_ctor_get(x_56, 1);
-lean_inc(x_60);
-lean_dec(x_56);
-x_61 = 0;
-x_38 = x_61;
-x_39 = x_60;
-goto block_55;
-}
-else
-{
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; 
-x_62 = lean_ctor_get(x_56, 1);
-lean_inc(x_62);
-lean_dec(x_56);
-x_63 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_37, x_6, x_7, x_8, x_9, x_62);
-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_unbox(x_64);
-lean_dec(x_64);
-x_38 = x_66;
-x_39 = x_65;
-goto block_55;
-}
-block_55:
-{
-if (x_38 == 0)
-{
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_box(0);
-x_41 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(x_30, x_5, x_16, x_28, x_24, x_15, x_32, x_17, x_4, x_1, x_2, x_14, x_36, x_29, x_40, x_6, x_7, x_8, x_9, x_39);
-return x_41;
-}
-else
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 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_inc(x_36);
-x_42 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_42, 0, x_36);
-x_43 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__10;
-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___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__12;
-x_46 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_46, 0, x_44);
-lean_ctor_set(x_46, 1, x_45);
+lean_object* x_28; lean_object* x_29; uint8_t x_30; uint8_t x_78; 
+x_28 = lean_ctor_get(x_27, 0);
+lean_inc(x_28);
+x_29 = lean_ctor_get(x_27, 1);
 lean_inc(x_29);
-x_47 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_47, 0, x_29);
-x_48 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-x_49 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
-x_50 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-x_51 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_37, x_50, x_6, x_7, x_8, x_9, x_39);
-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___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(x_30, x_5, x_16, x_28, x_24, x_15, x_32, x_17, x_4, x_1, x_2, x_14, x_36, x_29, x_52, x_6, x_7, x_8, x_9, x_53);
-lean_dec(x_52);
-return x_54;
+lean_dec(x_27);
+x_78 = l_Array_isEmpty___rarg(x_26);
+if (x_78 == 0)
+{
+uint8_t x_79; 
+x_79 = 1;
+x_30 = x_79;
+goto block_77;
+}
+else
+{
+lean_object* x_80; lean_object* x_81; uint8_t x_82; 
+x_80 = lean_array_get_size(x_3);
+x_81 = lean_unsigned_to_nat(0u);
+x_82 = lean_nat_dec_lt(x_81, x_80);
+if (x_82 == 0)
+{
+uint8_t x_83; 
+lean_dec(x_80);
+x_83 = 0;
+x_30 = x_83;
+goto block_77;
+}
+else
+{
+uint8_t x_84; 
+x_84 = lean_nat_dec_le(x_80, x_80);
+if (x_84 == 0)
+{
+uint8_t x_85; 
+lean_dec(x_80);
+x_85 = 0;
+x_30 = x_85;
+goto block_77;
+}
+else
+{
+size_t x_86; uint8_t x_87; 
+x_86 = lean_usize_of_nat(x_80);
+lean_dec(x_80);
+x_87 = l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1(x_3, x_25, x_86);
+x_30 = x_87;
+goto block_77;
+}
+}
+}
+block_77:
+{
+uint8_t x_31; 
+if (x_30 == 0)
+{
+uint8_t x_75; 
+x_75 = 0;
+x_31 = x_75;
+goto block_74;
+}
+else
+{
+uint8_t x_76; 
+x_76 = 1;
+x_31 = x_76;
+goto block_74;
+}
+block_74:
+{
+lean_object* x_32; lean_object* x_33; 
+if (x_31 == 0)
+{
+lean_object* x_71; lean_object* x_72; 
+x_71 = l_Lean_mkSimpleThunkType(x_28);
+x_72 = lean_unsigned_to_nat(1u);
+x_32 = x_71;
+x_33 = x_72;
+goto block_70;
+}
+else
+{
+lean_object* x_73; 
+x_73 = lean_array_get_size(x_26);
+x_32 = x_28;
+x_33 = x_73;
+goto block_70;
+}
+block_70:
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_62; 
+x_34 = lean_unsigned_to_nat(0u);
+x_35 = l_List_lengthTRAux___rarg(x_6, x_34);
+x_36 = lean_unsigned_to_nat(1u);
+x_37 = lean_nat_add(x_35, x_36);
+x_38 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__2;
+x_39 = lean_name_append_index_after(x_38, x_37);
+x_40 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__8;
+x_59 = lean_st_ref_get(x_11, x_29);
+x_60 = lean_ctor_get(x_59, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_60, 3);
+lean_inc(x_61);
+lean_dec(x_60);
+x_62 = lean_ctor_get_uint8(x_61, sizeof(void*)*1);
+lean_dec(x_61);
+if (x_62 == 0)
+{
+lean_object* x_63; uint8_t x_64; 
+x_63 = lean_ctor_get(x_59, 1);
+lean_inc(x_63);
+lean_dec(x_59);
+x_64 = 0;
+x_41 = x_64;
+x_42 = x_63;
+goto block_58;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; uint8_t x_69; 
+x_65 = lean_ctor_get(x_59, 1);
+lean_inc(x_65);
+lean_dec(x_59);
+x_66 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_40, x_8, x_9, x_10, x_11, 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 = lean_unbox(x_67);
+lean_dec(x_67);
+x_41 = x_69;
+x_42 = x_68;
+goto block_58;
+}
+block_58:
+{
+if (x_41 == 0)
+{
+lean_object* x_43; lean_object* x_44; 
+x_43 = lean_box(0);
+x_44 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(x_33, x_7, x_18, x_31, x_17, x_35, x_19, x_6, x_1, x_2, x_3, x_4, x_16, x_26, x_39, x_32, x_43, x_8, x_9, x_10, x_11, x_42);
+return x_44;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+lean_inc(x_39);
+x_45 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_45, 0, x_39);
+x_46 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__10;
+x_47 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_47, 0, x_46);
+lean_ctor_set(x_47, 1, x_45);
+x_48 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__12;
+x_49 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+lean_inc(x_32);
+x_50 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_50, 0, x_32);
+x_51 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_51, 0, x_49);
+lean_ctor_set(x_51, 1, x_50);
+x_52 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_53 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set(x_53, 1, x_52);
+x_54 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_40, x_53, x_8, x_9, x_10, x_11, x_42);
+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_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(x_33, x_7, x_18, x_31, x_17, x_35, x_19, x_6, x_1, x_2, x_3, x_4, x_16, x_26, x_39, x_32, x_55, x_8, x_9, x_10, x_11, x_56);
+lean_dec(x_55);
+return x_57;
+}
+}
 }
 }
 }
 }
 else
 {
-uint8_t x_71; 
-lean_dec(x_24);
+uint8_t x_88; 
+lean_dec(x_26);
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
+lean_dec(x_11);
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_5);
 lean_dec(x_4);
+lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_71 = !lean_is_exclusive(x_25);
-if (x_71 == 0)
+x_88 = !lean_is_exclusive(x_27);
+if (x_88 == 0)
 {
-return x_25;
+return x_27;
 }
 else
 {
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_25, 0);
-x_73 = lean_ctor_get(x_25, 1);
-lean_inc(x_73);
-lean_inc(x_72);
-lean_dec(x_25);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-return x_74;
+lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_89 = lean_ctor_get(x_27, 0);
+x_90 = lean_ctor_get(x_27, 1);
+lean_inc(x_90);
+lean_inc(x_89);
+lean_dec(x_27);
+x_91 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_91, 0, x_89);
+lean_ctor_set(x_91, 1, x_90);
+return x_91;
 }
 }
 }
@@ -1572,39 +1913,25 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_wi
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg), 10, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg), 12, 0);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___boxed(lean_object** _args) {
-lean_object* x_1 = _args[0];
-lean_object* x_2 = _args[1];
-lean_object* x_3 = _args[2];
-lean_object* x_4 = _args[3];
-lean_object* x_5 = _args[4];
-lean_object* x_6 = _args[5];
-lean_object* x_7 = _args[6];
-lean_object* x_8 = _args[7];
-lean_object* x_9 = _args[8];
-lean_object* x_10 = _args[9];
-lean_object* x_11 = _args[10];
-lean_object* x_12 = _args[11];
-lean_object* x_13 = _args[12];
-lean_object* x_14 = _args[13];
-lean_object* x_15 = _args[14];
-lean_object* x_16 = _args[15];
-lean_object* x_17 = _args[16];
-lean_object* x_18 = _args[17];
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-uint8_t x_19; lean_object* x_20; 
-x_19 = lean_unbox(x_4);
-lean_dec(x_4);
-x_20 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1(x_1, x_2, x_3, x_19, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-return x_20;
+size_t x_4; size_t x_5; uint8_t x_6; lean_object* x_7; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_6 = l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1(x_1, x_4, x_5);
+lean_dec(x_1);
+x_7 = lean_box(x_6);
+return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2___boxed(lean_object** _args) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___boxed(lean_object** _args) {
 lean_object* x_1 = _args[0];
 lean_object* x_2 = _args[1];
 lean_object* x_3 = _args[2];
@@ -1630,35 +1957,58 @@ _start:
 uint8_t x_21; lean_object* x_22; 
 x_21 = lean_unbox(x_4);
 lean_dec(x_4);
-x_22 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(x_1, x_2, x_3, x_21, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-lean_dec(x_15);
+x_22 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1(x_1, x_2, x_3, x_21, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
 return x_22;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1() {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+lean_object* x_22 = _args[21];
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(0u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
+uint8_t x_23; lean_object* x_24; 
+x_23 = lean_unbox(x_4);
+lean_dec(x_4);
+x_24 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__2(x_1, x_2, x_3, x_23, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22);
+lean_dec(x_17);
+return x_24;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___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, lean_object* x_10) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_9 = lean_box(0);
-x_10 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
-x_11 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(x_1, x_3, x_2, x_9, x_10, x_4, x_5, x_6, x_7, x_8);
-return x_11;
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_box(0);
+x_12 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
+x_13 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg(x_1, x_2, x_3, x_5, x_4, x_11, x_12, x_6, x_7, x_8, x_9, x_10);
+return x_13;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg), 8, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg), 10, 0);
 return x_2;
 }
 }
@@ -3000,7 +3350,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__2;
-x_3 = lean_unsigned_to_nat(148u);
+x_3 = lean_unsigned_to_nat(165u);
 x_4 = lean_unsigned_to_nat(19u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -3200,7 +3550,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__2;
-x_3 = lean_unsigned_to_nat(144u);
+x_3 = lean_unsigned_to_nat(161u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4904,7 +5254,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processAsPattern___closed__1;
-x_3 = lean_unsigned_to_nat(166u);
+x_3 = lean_unsigned_to_nat(183u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4971,7 +5321,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___spec__2___closed__1;
-x_3 = lean_unsigned_to_nat(206u);
+x_3 = lean_unsigned_to_nat(223u);
 x_4 = lean_unsigned_to_nat(40u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -5453,7 +5803,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processVariable___spec__2___closed__1;
-x_3 = lean_unsigned_to_nat(201u);
+x_3 = lean_unsigned_to_nat(218u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9683,7 +10033,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_Lean_Meta_Match_processInaccessibleAsCtor___closed__1;
-x_3 = lean_unsigned_to_nat(347u);
+x_3 = lean_unsigned_to_nat(364u);
 x_4 = lean_unsigned_to_nat(9u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -11206,7 +11556,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__10___closed__1;
-x_3 = lean_unsigned_to_nat(415u);
+x_3 = lean_unsigned_to_nat(432u);
 x_4 = lean_unsigned_to_nat(48u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -11834,7 +12184,7 @@ static lean_object* _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_p
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_1 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 x_2 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -11983,7 +12333,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___spec__10___closed__1;
-x_3 = lean_unsigned_to_nat(368u);
+x_3 = lean_unsigned_to_nat(385u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -12043,7 +12393,7 @@ lean_closure_set(x_19, 0, x_15);
 lean_closure_set(x_19, 1, x_17);
 lean_closure_set(x_19, 2, x_1);
 x_20 = l_Lean_Expr_fvarId_x21(x_17);
-x_21 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_21 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
@@ -12339,7 +12689,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__1;
-x_3 = lean_unsigned_to_nat(445u);
+x_3 = lean_unsigned_to_nat(462u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -12764,7 +13114,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__1;
-x_3 = lean_unsigned_to_nat(434u);
+x_3 = lean_unsigned_to_nat(451u);
 x_4 = lean_unsigned_to_nat(21u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13357,7 +13707,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_filterMapM_loop___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processNonVariable___spec__1___closed__1;
-x_3 = lean_unsigned_to_nat(420u);
+x_3 = lean_unsigned_to_nat(437u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13479,7 +13829,7 @@ lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_2 = lean_ctor_get(x_1, 2);
 lean_inc(x_2);
 lean_dec(x_1);
-x_3 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_3 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 x_4 = l_List_foldl___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_collectValues___spec__1(x_3, x_2);
 return x_4;
 }
@@ -13912,7 +14262,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__6___closed__1;
-x_3 = lean_unsigned_to_nat(485u);
+x_3 = lean_unsigned_to_nat(502u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -14842,7 +15192,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processValue___spec__6___closed__1;
-x_3 = lean_unsigned_to_nat(462u);
+x_3 = lean_unsigned_to_nat(479u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -15229,7 +15579,7 @@ lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_2 = lean_ctor_get(x_1, 2);
 lean_inc(x_2);
 lean_dec(x_1);
-x_3 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_3 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 x_4 = l_List_foldl___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_collectArraySizes___spec__1(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -15776,7 +16126,7 @@ lean_inc(x_12);
 lean_dec(x_10);
 x_13 = l_Lean_LocalDecl_userName(x_11);
 lean_dec(x_11);
-x_14 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_14 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 x_15 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_expandVarIntoArrayLit_loop(x_2, x_1, x_3, x_13, x_4, x_14, x_5, x_6, x_7, x_8, x_12);
 return x_15;
 }
@@ -16311,7 +16661,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__8___closed__1;
-x_3 = lean_unsigned_to_nat(542u);
+x_3 = lean_unsigned_to_nat(559u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -17023,7 +17373,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l_List_mapM___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processArrayLit___spec__8___closed__1;
-x_3 = lean_unsigned_to_nat(518u);
+x_3 = lean_unsigned_to_nat(535u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -19093,7 +19443,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_List_moveToFront_loop___rarg___closed__1;
-x_3 = lean_unsigned_to_nat(591u);
+x_3 = lean_unsigned_to_nat(608u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -19502,7 +19852,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_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__1;
 x_2 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_checkVarDeps___closed__1;
-x_3 = lean_unsigned_to_nat(658u);
+x_3 = lean_unsigned_to_nat(675u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_List_mapTRAux___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processSkipInaccessible___spec__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -22165,7 +22515,7 @@ lean_dec(x_2);
 return x_7;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -22173,17 +22523,17 @@ x_1 = lean_mk_string("bootstrap");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__2() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__3() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -22191,17 +22541,17 @@ x_1 = lean_mk_string("genMatcherCode");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__4() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__2;
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__3;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__2;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__5() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -22209,13 +22559,13 @@ x_1 = lean_mk_string("disable code generation for auxiliary matcher function");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__6() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__6() {
 _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_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1;
-x_3 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__5;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1;
+x_3 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__5;
 x_4 = lean_box(x_1);
 x_5 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_5, 0, x_4);
@@ -22224,17 +22574,17 @@ lean_ctor_set(x_5, 2, x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__4;
-x_3 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__6;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__4;
+x_3 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__6;
 x_4 = l_Lean_Option_register___at_Std_Format_initFn____x40_Lean_Data_Format___hyg_54____spec__1(x_2, x_3, x_1);
 return x_4;
 }
 }
-LEAN_EXPORT uint8_t l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____lambda__1(uint8_t x_1, uint8_t x_2) {
+LEAN_EXPORT uint8_t l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____lambda__1(uint8_t x_1, uint8_t x_2) {
 _start:
 {
 if (x_1 == 0)
@@ -22258,37 +22608,37 @@ return x_2;
 }
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__1() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____lambda__1___boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____lambda__1___boxed), 2, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__2() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__1;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__1;
 x_2 = lean_alloc_closure((void*)(l_instBEq___rarg), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__3() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Expr_instBEqExpr;
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__2;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__2;
 x_3 = lean_alloc_closure((void*)(l_instBEqProd___rarg), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__4() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -22296,19 +22646,19 @@ x_1 = lean_alloc_closure((void*)(l_instHashableBool___boxed), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__5() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Expr_instHashableExpr;
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__4;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__4;
 x_3 = lean_alloc_closure((void*)(l_instHashableProd___rarg___boxed), 3, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__6() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -22316,21 +22666,21 @@ x_1 = l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_box(0), lean_box(0));
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__6;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__6;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__8() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -22338,26 +22688,26 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__9() {
+static lean_object* _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__8;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__8;
 x_2 = lean_alloc_closure((void*)(l_EStateM_pure___rarg), 2, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__9;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__9;
 x_3 = l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____lambda__1___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____lambda__1___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; uint8_t x_4; uint8_t x_5; lean_object* x_6; 
@@ -22365,7 +22715,7 @@ x_3 = lean_unbox(x_1);
 lean_dec(x_1);
 x_4 = lean_unbox(x_2);
 lean_dec(x_2);
-x_5 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____lambda__1(x_3, x_4);
+x_5 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____lambda__1(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
 }
@@ -23538,7 +23888,7 @@ static lean_object* _init_l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -23561,7 +23911,7 @@ static lean_object* _init_l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -23581,7 +23931,7 @@ static lean_object* _init_l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -23593,7 +23943,7 @@ static lean_object* _init_l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -23627,7 +23977,7 @@ static lean_object* _init_l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__2__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -24124,8 +24474,8 @@ static lean_object* _init_l_Lean_Meta_Match_mkMatcherAuxDefinition___lambda__4__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__3;
-x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__5;
+x_1 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__3;
+x_2 = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__5;
 x_3 = l_Std_PersistentHashMap_instInhabitedPersistentHashMap___rarg(x_1, x_2);
 return x_3;
 }
@@ -24778,6 +25128,24 @@ lean_dec(x_6);
 return x_13;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MkMatcherInput_numDiscrs(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_ctor_get(x_1, 2);
+x_3 = lean_array_get_size(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MkMatcherInput_numDiscrs___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Meta_Match_MkMatcherInput_numDiscrs(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -24914,29 +25282,31 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(size_t x_1, size_t x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
-uint8_t x_4; 
-x_4 = lean_usize_dec_lt(x_2, x_1);
-if (x_4 == 0)
+uint8_t x_5; 
+x_5 = lean_usize_dec_lt(x_3, x_2);
+if (x_5 == 0)
 {
-return x_3;
+return x_4;
 }
 else
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; 
-x_5 = lean_array_uget(x_3, x_2);
-x_6 = lean_unsigned_to_nat(0u);
-x_7 = lean_array_uset(x_3, x_2, x_6);
-x_8 = lean_ctor_get(x_5, 1);
-lean_inc(x_8);
-lean_dec(x_5);
-x_9 = 1;
-x_10 = lean_usize_add(x_2, x_9);
-x_11 = lean_array_uset(x_7, x_2, x_8);
-x_2 = x_10;
-x_3 = x_11;
+lean_object* x_6; 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_6 = lean_array_uget(x_4, x_3);
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = lean_array_uset(x_4, x_3, x_7);
+x_9 = lean_ctor_get(x_6, 1);
+lean_inc(x_9);
+lean_dec(x_6);
+x_10 = lean_nat_add(x_9, x_1);
+lean_dec(x_9);
+x_11 = 1;
+x_12 = lean_usize_add(x_3, x_11);
+x_13 = lean_array_uset(x_8, x_3, x_10);
+x_3 = x_12;
+x_4 = x_13;
 goto _start;
 }
 }
@@ -24991,6 +25361,593 @@ goto _start;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7(size_t x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_usize_dec_lt(x_2, x_1);
+if (x_4 == 0)
+{
+return x_3;
+}
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; 
+x_5 = lean_array_uget(x_3, x_2);
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_array_uset(x_3, x_2, x_6);
+x_8 = lean_ctor_get(x_5, 1);
+lean_inc(x_8);
+lean_dec(x_5);
+x_9 = 1;
+x_10 = lean_usize_add(x_2, x_9);
+x_11 = lean_array_uset(x_7, x_2, x_8);
+x_2 = x_10;
+x_3 = x_11;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_5; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_5 = l_List_reverse___rarg(x_4);
+return x_5;
+}
+else
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_3);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_7 = lean_ctor_get(x_3, 0);
+x_8 = lean_ctor_get(x_3, 1);
+lean_inc(x_2);
+x_9 = lean_apply_1(x_2, x_7);
+lean_inc(x_1);
+x_10 = lean_apply_1(x_1, x_9);
+lean_ctor_set(x_3, 1, x_4);
+lean_ctor_set(x_3, 0, x_10);
+{
+lean_object* _tmp_2 = x_8;
+lean_object* _tmp_3 = x_3;
+x_3 = _tmp_2;
+x_4 = _tmp_3;
+}
+goto _start;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_12 = lean_ctor_get(x_3, 0);
+x_13 = lean_ctor_get(x_3, 1);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_3);
+lean_inc(x_2);
+x_14 = lean_apply_1(x_2, x_12);
+lean_inc(x_1);
+x_15 = lean_apply_1(x_1, x_14);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_4);
+x_3 = x_13;
+x_4 = x_16;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8___at_Lean_Meta_Match_mkMatcher___spec__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_5; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_5 = l_List_reverse___rarg(x_4);
+return x_5;
+}
+else
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_3);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_7 = lean_ctor_get(x_3, 0);
+x_8 = lean_ctor_get(x_3, 1);
+lean_inc(x_2);
+x_9 = lean_apply_1(x_2, x_7);
+lean_inc(x_1);
+x_10 = lean_apply_1(x_1, x_9);
+x_11 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_3, 1, x_4);
+lean_ctor_set(x_3, 0, x_11);
+{
+lean_object* _tmp_2 = x_8;
+lean_object* _tmp_3 = x_3;
+x_3 = _tmp_2;
+x_4 = _tmp_3;
+}
+goto _start;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_13 = lean_ctor_get(x_3, 0);
+x_14 = lean_ctor_get(x_3, 1);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_dec(x_3);
+lean_inc(x_2);
+x_15 = lean_apply_1(x_2, x_13);
+lean_inc(x_1);
+x_16 = lean_apply_1(x_1, x_15);
+x_17 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_16);
+x_18 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_4);
+x_3 = x_14;
+x_4 = x_18;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8___at_Lean_Meta_Match_mkMatcher___spec__9___at_Lean_Meta_Match_mkMatcher___spec__10(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_3; 
+x_3 = l_List_reverse___rarg(x_2);
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = l_Nat_repr(x_5);
+x_8 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_8, 0, x_7);
+x_9 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_9, 0, x_8);
+lean_ctor_set(x_1, 1, x_2);
+lean_ctor_set(x_1, 0, x_9);
+{
+lean_object* _tmp_0 = x_6;
+lean_object* _tmp_1 = x_1;
+x_1 = _tmp_0;
+x_2 = _tmp_1;
+}
+goto _start;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_11 = lean_ctor_get(x_1, 0);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_dec(x_1);
+x_13 = l_Nat_repr(x_11);
+x_14 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+x_15 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_2);
+x_1 = x_12;
+x_2 = x_16;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_mkMatcher___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* x_8, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; 
+x_10 = lean_usize_dec_eq(x_2, x_3);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_array_uget(x_1, x_2);
+x_12 = lean_ctor_get(x_11, 1);
+lean_inc(x_12);
+if (lean_obj_tag(x_12) == 0)
+{
+size_t x_13; size_t x_14; 
+lean_dec(x_11);
+x_13 = 1;
+x_14 = lean_usize_add(x_2, x_13);
+x_2 = x_14;
+goto _start;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; 
+lean_dec(x_12);
+x_16 = lean_ctor_get(x_11, 0);
+lean_inc(x_16);
+lean_dec(x_11);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_17 = l_Lean_Meta_mkEqRefl(x_16, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; size_t x_21; size_t x_22; 
+x_18 = lean_ctor_get(x_17, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_17, 1);
+lean_inc(x_19);
+lean_dec(x_17);
+x_20 = lean_array_push(x_4, x_18);
+x_21 = 1;
+x_22 = lean_usize_add(x_2, x_21);
+x_2 = x_22;
+x_4 = x_20;
+x_9 = x_19;
+goto _start;
+}
+else
+{
+uint8_t x_24; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_24 = !lean_is_exclusive(x_17);
+if (x_24 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = lean_ctor_get(x_17, 0);
+x_26 = lean_ctor_get(x_17, 1);
+lean_inc(x_26);
+lean_inc(x_25);
+lean_dec(x_17);
+x_27 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_27, 0, x_25);
+lean_ctor_set(x_27, 1, x_26);
+return x_27;
+}
+}
+}
+}
+else
+{
+lean_object* x_28; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_4);
+lean_ctor_set(x_28, 1, x_9);
+return x_28;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_filterMapM___at_Lean_Meta_Match_mkMatcher___spec__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; 
+x_9 = lean_nat_dec_lt(x_2, x_3);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
+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_10 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_8);
+return x_11;
+}
+else
+{
+lean_object* x_12; uint8_t x_13; 
+x_12 = lean_array_get_size(x_1);
+x_13 = lean_nat_dec_le(x_3, x_12);
+lean_dec(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; 
+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_14 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_8);
+return x_15;
+}
+else
+{
+size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; 
+x_16 = lean_usize_of_nat(x_2);
+lean_dec(x_2);
+x_17 = lean_usize_of_nat(x_3);
+lean_dec(x_3);
+x_18 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
+x_19 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_mkMatcher___spec__12(x_1, x_16, x_17, x_18, x_4, x_5, x_6, x_7, x_8);
+return x_19;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__13(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; uint8_t x_6; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = lean_nat_dec_eq(x_3, x_5);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+x_7 = lean_unsigned_to_nat(1u);
+x_8 = lean_nat_sub(x_3, x_7);
+lean_dec(x_3);
+x_9 = lean_nat_add(x_8, x_7);
+x_10 = lean_nat_sub(x_2, x_9);
+lean_dec(x_9);
+x_11 = lean_ctor_get(x_1, 0);
+x_12 = l_Std_HashSetImp_contains___at_Lean_Meta_Match_mkMatcher___spec__3(x_11, x_10);
+if (x_12 == 0)
+{
+lean_object* x_13; 
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_10);
+lean_ctor_set(x_13, 1, x_4);
+x_3 = x_8;
+x_4 = x_13;
+goto _start;
+}
+else
+{
+lean_dec(x_10);
+x_3 = x_8;
+goto _start;
+}
+}
+else
+{
+lean_dec(x_3);
+return x_4;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__14(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = lean_usize_dec_lt(x_3, x_2);
+if (x_5 == 0)
+{
+return x_4;
+}
+else
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; lean_object* x_13; 
+x_6 = lean_array_uget(x_4, x_3);
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = lean_array_uset(x_4, x_3, x_7);
+x_9 = lean_ctor_get(x_6, 1);
+lean_inc(x_9);
+lean_dec(x_6);
+x_10 = lean_nat_add(x_9, x_1);
+lean_dec(x_9);
+x_11 = 1;
+x_12 = lean_usize_add(x_3, x_11);
+x_13 = lean_array_uset(x_8, x_3, x_10);
+x_3 = x_12;
+x_4 = x_13;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_5; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_5 = l_List_reverse___rarg(x_4);
+return x_5;
+}
+else
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_3);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_7 = lean_ctor_get(x_3, 0);
+x_8 = lean_ctor_get(x_3, 1);
+lean_inc(x_2);
+x_9 = lean_apply_1(x_2, x_7);
+lean_inc(x_1);
+x_10 = lean_apply_1(x_1, x_9);
+lean_ctor_set(x_3, 1, x_4);
+lean_ctor_set(x_3, 0, x_10);
+{
+lean_object* _tmp_2 = x_8;
+lean_object* _tmp_3 = x_3;
+x_3 = _tmp_2;
+x_4 = _tmp_3;
+}
+goto _start;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_12 = lean_ctor_get(x_3, 0);
+x_13 = lean_ctor_get(x_3, 1);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_3);
+lean_inc(x_2);
+x_14 = lean_apply_1(x_2, x_12);
+lean_inc(x_1);
+x_15 = lean_apply_1(x_1, x_14);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_4);
+x_3 = x_13;
+x_4 = x_16;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15___at_Lean_Meta_Match_mkMatcher___spec__16(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_5; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_5 = l_List_reverse___rarg(x_4);
+return x_5;
+}
+else
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_3);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_7 = lean_ctor_get(x_3, 0);
+x_8 = lean_ctor_get(x_3, 1);
+lean_inc(x_2);
+x_9 = lean_apply_1(x_2, x_7);
+lean_inc(x_1);
+x_10 = lean_apply_1(x_1, x_9);
+x_11 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_3, 1, x_4);
+lean_ctor_set(x_3, 0, x_11);
+{
+lean_object* _tmp_2 = x_8;
+lean_object* _tmp_3 = x_3;
+x_3 = _tmp_2;
+x_4 = _tmp_3;
+}
+goto _start;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_13 = lean_ctor_get(x_3, 0);
+x_14 = lean_ctor_get(x_3, 1);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_dec(x_3);
+lean_inc(x_2);
+x_15 = lean_apply_1(x_2, x_13);
+lean_inc(x_1);
+x_16 = lean_apply_1(x_1, x_15);
+x_17 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_16);
+x_18 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_4);
+x_3 = x_14;
+x_4 = x_18;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15___at_Lean_Meta_Match_mkMatcher___spec__16___at_Lean_Meta_Match_mkMatcher___spec__17(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_3; 
+x_3 = l_List_reverse___rarg(x_2);
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = l_Nat_repr(x_5);
+x_8 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_8, 0, x_7);
+x_9 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_9, 0, x_8);
+lean_ctor_set(x_1, 1, x_2);
+lean_ctor_set(x_1, 0, x_9);
+{
+lean_object* _tmp_0 = x_6;
+lean_object* _tmp_1 = x_1;
+x_1 = _tmp_0;
+x_2 = _tmp_1;
+}
+goto _start;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_11 = lean_ctor_get(x_1, 0);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_dec(x_1);
+x_13 = l_Nat_repr(x_11);
+x_14 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+x_15 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_2);
+x_1 = x_12;
+x_2 = x_16;
+goto _start;
+}
+}
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
@@ -25050,200 +26007,208 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__2___boxed
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, size_t x_9, size_t x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, size_t x_10, size_t x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
 _start:
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = l_Lean_Expr_getAppFn(x_1);
-x_20 = l_Lean_Expr_constLevels_x21(x_19);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = l_Lean_Expr_getAppFn(x_1);
+x_22 = l_Lean_Expr_constLevels_x21(x_21);
+lean_inc(x_19);
+lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
-lean_inc(x_15);
-lean_inc(x_14);
 lean_inc(x_2);
-x_21 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f(x_20, x_2, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_21) == 0)
+x_23 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f(x_22, x_2, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_23) == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+lean_inc(x_19);
+lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
-lean_inc(x_15);
-lean_inc(x_14);
-x_24 = l_Lean_Meta_isLevelDefEq(x_2, x_3, x_14, x_15, x_16, x_17, x_23);
-if (lean_obj_tag(x_24) == 0)
+x_26 = l_Lean_Meta_isLevelDefEq(x_2, x_3, x_16, x_17, x_18, x_19, x_25);
+if (lean_obj_tag(x_26) == 0)
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_24, 1);
-lean_inc(x_25);
-lean_dec(x_24);
-x_26 = lean_st_ref_get(x_17, x_25);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_26, 1);
+lean_inc(x_27);
+lean_dec(x_26);
+x_28 = lean_st_ref_get(x_19, x_27);
 if (lean_obj_tag(x_8) == 0)
 {
-lean_object* x_53; 
-lean_dec(x_22);
+lean_object* x_55; 
+lean_dec(x_24);
+lean_dec(x_14);
+lean_dec(x_13);
 lean_dec(x_12);
-lean_dec(x_11);
-x_53 = l_Lean_Meta_Match_mkMatcher___lambda__3___closed__3;
-x_27 = x_53;
-goto block_52;
+lean_dec(x_9);
+x_55 = l_Lean_Meta_Match_mkMatcher___lambda__3___closed__3;
+x_29 = x_55;
+goto block_54;
 }
 else
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_54 = lean_ctor_get(x_8, 0);
-lean_inc(x_54);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_56 = lean_ctor_get(x_8, 0);
+lean_inc(x_56);
 lean_dec(x_8);
-x_55 = lean_unsigned_to_nat(0u);
-x_56 = l_Lean_Expr_getAppNumArgsAux(x_1, x_55);
-x_57 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(x_9, x_10, x_11);
-x_58 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_58, 0, x_56);
-lean_ctor_set(x_58, 1, x_12);
-lean_ctor_set(x_58, 2, x_57);
-lean_ctor_set(x_58, 3, x_22);
-x_59 = lean_apply_1(x_54, x_58);
-x_27 = x_59;
-goto block_52;
+x_57 = lean_unsigned_to_nat(0u);
+x_58 = l_Lean_Expr_getAppNumArgsAux(x_1, x_57);
+x_59 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(x_9, x_10, x_11, x_12);
+lean_dec(x_9);
+x_60 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_13);
+lean_ctor_set(x_60, 2, x_59);
+lean_ctor_set(x_60, 3, x_24);
+lean_ctor_set(x_60, 4, x_14);
+x_61 = lean_apply_1(x_56, x_60);
+x_29 = x_61;
+goto block_54;
 }
-block_52:
+block_54:
 {
-uint8_t x_28; lean_object* x_29; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
-x_42 = lean_ctor_get(x_26, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_42, 3);
-lean_inc(x_43);
-lean_dec(x_42);
-x_44 = lean_ctor_get_uint8(x_43, sizeof(void*)*1);
-lean_dec(x_43);
-if (x_44 == 0)
-{
-lean_object* x_45; uint8_t x_46; 
-x_45 = lean_ctor_get(x_26, 1);
+uint8_t x_30; lean_object* x_31; lean_object* x_44; lean_object* x_45; uint8_t x_46; 
+x_44 = lean_ctor_get(x_28, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_44, 3);
 lean_inc(x_45);
-lean_dec(x_26);
-x_46 = 0;
-x_28 = x_46;
-x_29 = x_45;
-goto block_41;
-}
-else
+lean_dec(x_44);
+x_46 = lean_ctor_get_uint8(x_45, sizeof(void*)*1);
+lean_dec(x_45);
+if (x_46 == 0)
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
-x_47 = lean_ctor_get(x_26, 1);
+lean_object* x_47; uint8_t x_48; 
+x_47 = lean_ctor_get(x_28, 1);
 lean_inc(x_47);
-lean_dec(x_26);
-lean_inc(x_7);
-x_48 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_14, x_15, x_16, x_17, x_47);
-x_49 = lean_ctor_get(x_48, 0);
+lean_dec(x_28);
+x_48 = 0;
+x_30 = x_48;
+x_31 = x_47;
+goto block_43;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+x_49 = lean_ctor_get(x_28, 1);
 lean_inc(x_49);
-x_50 = lean_ctor_get(x_48, 1);
-lean_inc(x_50);
-lean_dec(x_48);
-x_51 = lean_unbox(x_49);
-lean_dec(x_49);
-x_28 = x_51;
-x_29 = x_50;
-goto block_41;
+lean_dec(x_28);
+lean_inc(x_7);
+x_50 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_16, x_17, x_18, x_19, 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_unbox(x_51);
+lean_dec(x_51);
+x_30 = x_53;
+x_31 = x_52;
+goto block_43;
 }
-block_41:
+block_43:
 {
-if (x_28 == 0)
+if (x_30 == 0)
 {
-lean_object* x_30; lean_object* x_31; 
+lean_object* x_32; lean_object* x_33; 
 lean_dec(x_7);
-x_30 = lean_box(0);
-x_31 = l_Lean_Meta_Match_mkMatcher___lambda__1(x_4, x_5, x_6, x_1, x_27, x_30, x_14, x_15, x_16, x_17, x_29);
+x_32 = lean_box(0);
+x_33 = l_Lean_Meta_Match_mkMatcher___lambda__1(x_4, x_5, x_6, x_1, x_29, x_32, x_16, x_17, x_18, x_19, x_31);
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_31;
+return x_33;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 lean_inc(x_1);
-x_32 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_32, 0, x_1);
-x_33 = l_Lean_Meta_Match_mkMatcher___lambda__3___closed__2;
-x_34 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_32);
-x_35 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_34 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_34, 0, x_1);
+x_35 = l_Lean_Meta_Match_mkMatcher___lambda__3___closed__2;
 x_36 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-x_37 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_36, x_14, x_15, x_16, x_17, x_29);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-x_40 = l_Lean_Meta_Match_mkMatcher___lambda__1(x_4, x_5, x_6, x_1, x_27, x_38, x_14, x_15, x_16, x_17, x_39);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_38 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_38, 0, x_36);
+lean_ctor_set(x_38, 1, x_37);
+x_39 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_38, x_16, x_17, x_18, x_19, x_31);
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_39, 1);
+lean_inc(x_41);
+lean_dec(x_39);
+x_42 = l_Lean_Meta_Match_mkMatcher___lambda__1(x_4, x_5, x_6, x_1, x_29, x_40, x_16, x_17, x_18, x_19, x_41);
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_38);
+lean_dec(x_40);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_40;
+return x_42;
 }
 }
 }
 }
 else
 {
-uint8_t x_60; 
-lean_dec(x_22);
+uint8_t x_62; 
+lean_dec(x_24);
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
 lean_dec(x_14);
+lean_dec(x_13);
 lean_dec(x_12);
-lean_dec(x_11);
+lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_60 = !lean_is_exclusive(x_24);
-if (x_60 == 0)
+x_62 = !lean_is_exclusive(x_26);
+if (x_62 == 0)
 {
-return x_24;
+return x_26;
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_ctor_get(x_24, 0);
-x_62 = lean_ctor_get(x_24, 1);
-lean_inc(x_62);
-lean_inc(x_61);
-lean_dec(x_24);
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_61);
-lean_ctor_set(x_63, 1, x_62);
-return x_63;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_63 = lean_ctor_get(x_26, 0);
+x_64 = lean_ctor_get(x_26, 1);
+lean_inc(x_64);
+lean_inc(x_63);
+lean_dec(x_26);
+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_64; 
+uint8_t x_66; 
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
 lean_dec(x_14);
+lean_dec(x_13);
 lean_dec(x_12);
-lean_dec(x_11);
+lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -25252,23 +26217,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_64 = !lean_is_exclusive(x_21);
-if (x_64 == 0)
+x_66 = !lean_is_exclusive(x_23);
+if (x_66 == 0)
 {
-return x_21;
+return x_23;
 }
 else
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_65 = lean_ctor_get(x_21, 0);
-x_66 = lean_ctor_get(x_21, 1);
-lean_inc(x_66);
-lean_inc(x_65);
-lean_dec(x_21);
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_66);
-return x_67;
+lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_67 = lean_ctor_get(x_23, 0);
+x_68 = lean_ctor_get(x_23, 1);
+lean_inc(x_68);
+lean_inc(x_67);
+lean_dec(x_23);
+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;
 }
 }
 }
@@ -25307,148 +26272,150 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, size_t x_10, size_t x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, size_t x_11, size_t x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21) {
 _start:
 {
-lean_object* x_20; 
-lean_dec(x_14);
+lean_object* x_22; 
+lean_dec(x_16);
+lean_inc(x_20);
+lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
-x_20 = l_Lean_Meta_Match_mkMatcherAuxDefinition(x_1, x_2, x_3, x_15, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_20) == 0)
+x_22 = l_Lean_Meta_Match_mkMatcherAuxDefinition(x_1, x_2, x_3, x_17, x_18, x_19, x_20, x_21);
+if (lean_obj_tag(x_22) == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
-lean_inc(x_22);
-lean_dec(x_20);
-x_23 = lean_ctor_get(x_21, 0);
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_23 = lean_ctor_get(x_22, 0);
 lean_inc(x_23);
-x_24 = lean_ctor_get(x_21, 1);
+x_24 = lean_ctor_get(x_22, 1);
 lean_inc(x_24);
-lean_dec(x_21);
-x_46 = lean_st_ref_get(x_18, x_22);
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_47, 3);
-lean_inc(x_48);
-lean_dec(x_47);
-x_49 = lean_ctor_get_uint8(x_48, sizeof(void*)*1);
-lean_dec(x_48);
-if (x_49 == 0)
-{
-lean_object* x_50; uint8_t x_51; 
-x_50 = lean_ctor_get(x_46, 1);
+lean_dec(x_22);
+x_25 = lean_ctor_get(x_23, 0);
+lean_inc(x_25);
+x_26 = lean_ctor_get(x_23, 1);
+lean_inc(x_26);
+lean_dec(x_23);
+x_48 = lean_st_ref_get(x_20, x_24);
+x_49 = lean_ctor_get(x_48, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_49, 3);
 lean_inc(x_50);
-lean_dec(x_46);
-x_51 = 0;
-x_25 = x_51;
-x_26 = x_50;
-goto block_45;
-}
-else
+lean_dec(x_49);
+x_51 = lean_ctor_get_uint8(x_50, sizeof(void*)*1);
+lean_dec(x_50);
+if (x_51 == 0)
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_52 = lean_ctor_get(x_46, 1);
+lean_object* x_52; uint8_t x_53; 
+x_52 = lean_ctor_get(x_48, 1);
 lean_inc(x_52);
-lean_dec(x_46);
-lean_inc(x_9);
-x_53 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_15, x_16, x_17, x_18, x_52);
-x_54 = lean_ctor_get(x_53, 0);
-lean_inc(x_54);
-x_55 = lean_ctor_get(x_53, 1);
-lean_inc(x_55);
-lean_dec(x_53);
-x_56 = lean_unbox(x_54);
-lean_dec(x_54);
-x_25 = x_56;
-x_26 = x_55;
-goto block_45;
-}
-block_45:
-{
-if (x_25 == 0)
-{
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_box(0);
-x_28 = l_Lean_Meta_Match_mkMatcher___lambda__3(x_23, x_4, x_5, x_6, x_7, x_8, x_9, x_24, x_10, x_11, x_12, x_13, x_27, x_15, x_16, x_17, x_18, x_26);
-return x_28;
+lean_dec(x_48);
+x_53 = 0;
+x_27 = x_53;
+x_28 = x_52;
+goto block_47;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_29 = l_Lean_Expr_getAppFn(x_23);
-x_30 = l_Lean_Expr_constLevels_x21(x_29);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; 
+x_54 = lean_ctor_get(x_48, 1);
+lean_inc(x_54);
+lean_dec(x_48);
+lean_inc(x_9);
+x_55 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_17, x_18, x_19, x_20, x_54);
+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_unbox(x_56);
+lean_dec(x_56);
+x_27 = x_58;
+x_28 = x_57;
+goto block_47;
+}
+block_47:
+{
+if (x_27 == 0)
+{
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_box(0);
+x_30 = l_Lean_Meta_Match_mkMatcher___lambda__3(x_25, x_4, x_5, x_6, x_7, x_8, x_9, x_26, x_10, x_11, x_12, x_13, x_14, x_15, x_29, x_17, x_18, x_19, x_20, x_28);
+return x_30;
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_31 = l_Lean_Expr_getAppFn(x_25);
+x_32 = l_Lean_Expr_constLevels_x21(x_31);
 lean_inc(x_8);
-x_31 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__6(x_30, x_8);
-x_32 = l_Lean_MessageData_ofList(x_31);
-lean_dec(x_31);
-x_33 = l_Lean_Meta_Match_mkMatcher___lambda__4___closed__2;
-x_34 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_32);
-x_35 = l_Lean_Meta_Match_mkMatcher___lambda__4___closed__4;
+x_33 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__6(x_32, x_8);
+x_34 = l_Lean_MessageData_ofList(x_33);
+lean_dec(x_33);
+x_35 = l_Lean_Meta_Match_mkMatcher___lambda__4___closed__2;
 x_36 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-lean_inc(x_4);
-x_37 = lean_alloc_ctor(3, 1, 0);
-lean_ctor_set(x_37, 0, x_4);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = l_Lean_Meta_Match_mkMatcher___lambda__4___closed__4;
 x_38 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_38, 0, x_36);
 lean_ctor_set(x_38, 1, x_37);
-x_39 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+lean_inc(x_4);
+x_39 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_39, 0, x_4);
 x_40 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_40, 0, x_38);
 lean_ctor_set(x_40, 1, x_39);
+x_41 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_42 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
 lean_inc(x_9);
-x_41 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_40, x_15, x_16, x_17, x_18, x_26);
-x_42 = lean_ctor_get(x_41, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_41, 1);
-lean_inc(x_43);
-lean_dec(x_41);
-x_44 = l_Lean_Meta_Match_mkMatcher___lambda__3(x_23, x_4, x_5, x_6, x_7, x_8, x_9, x_24, x_10, x_11, x_12, x_13, x_42, x_15, x_16, x_17, x_18, x_43);
-lean_dec(x_42);
-return x_44;
+x_43 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_42, x_17, x_18, x_19, x_20, x_28);
+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 = l_Lean_Meta_Match_mkMatcher___lambda__3(x_25, x_4, x_5, x_6, x_7, x_8, x_9, x_26, x_10, x_11, x_12, x_13, x_14, x_15, x_44, x_17, x_18, x_19, x_20, x_45);
+lean_dec(x_44);
+return x_46;
 }
 }
 }
 else
 {
-uint8_t x_57; 
+uint8_t x_59; 
+lean_dec(x_20);
+lean_dec(x_19);
 lean_dec(x_18);
 lean_dec(x_17);
-lean_dec(x_16);
 lean_dec(x_15);
+lean_dec(x_14);
 lean_dec(x_13);
-lean_dec(x_12);
+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);
-x_57 = !lean_is_exclusive(x_20);
-if (x_57 == 0)
+x_59 = !lean_is_exclusive(x_22);
+if (x_59 == 0)
 {
-return x_20;
+return x_22;
 }
 else
 {
-lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = lean_ctor_get(x_20, 0);
-x_59 = lean_ctor_get(x_20, 1);
-lean_inc(x_59);
-lean_inc(x_58);
-lean_dec(x_20);
-x_60 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_60, 0, x_58);
-lean_ctor_set(x_60, 1, x_59);
-return x_60;
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_22, 0);
+x_61 = lean_ctor_get(x_22, 1);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_dec(x_22);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_60);
+lean_ctor_set(x_62, 1, x_61);
+return x_62;
 }
 }
 }
@@ -25456,25 +26423,125 @@ return x_60;
 static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__1() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string("minors num params: ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, size_t x_11, size_t x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21) {
+_start:
+{
+uint8_t x_22; lean_object* x_23; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; 
+lean_dec(x_16);
+x_39 = lean_st_ref_get(x_20, x_21);
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_40, 3);
+lean_inc(x_41);
+lean_dec(x_40);
+x_42 = lean_ctor_get_uint8(x_41, sizeof(void*)*1);
+lean_dec(x_41);
+if (x_42 == 0)
+{
+lean_object* x_43; uint8_t x_44; 
+x_43 = lean_ctor_get(x_39, 1);
+lean_inc(x_43);
+lean_dec(x_39);
+x_44 = 0;
+x_22 = x_44;
+x_23 = x_43;
+goto block_38;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
+x_45 = lean_ctor_get(x_39, 1);
+lean_inc(x_45);
+lean_dec(x_39);
+lean_inc(x_9);
+x_46 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_17, x_18, x_19, x_20, x_45);
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec(x_46);
+x_49 = lean_unbox(x_47);
+lean_dec(x_47);
+x_22 = x_49;
+x_23 = x_48;
+goto block_38;
+}
+block_38:
+{
+if (x_22 == 0)
+{
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_box(0);
+x_25 = l_Lean_Meta_Match_mkMatcher___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_24, x_17, x_18, x_19, x_20, x_23);
+return x_25;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 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_inc(x_13);
+x_26 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7(x_11, x_12, x_13);
+x_27 = lean_array_to_list(lean_box(0), x_26);
+lean_inc(x_8);
+x_28 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__8___at_Lean_Meta_Match_mkMatcher___spec__9___at_Lean_Meta_Match_mkMatcher___spec__10(x_27, x_8);
+x_29 = l_Lean_MessageData_ofList(x_28);
+lean_dec(x_28);
+x_30 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2;
+x_31 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_29);
+x_32 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_33 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+lean_inc(x_9);
+x_34 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_33, x_17, x_18, x_19, x_20, x_23);
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
+lean_dec(x_34);
+x_37 = l_Lean_Meta_Match_mkMatcher___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_35, x_17, x_18, x_19, x_20, x_36);
+return x_37;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__1() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
 x_1 = lean_unsigned_to_nat(8u);
 x_2 = l_Std_mkHashSetImp___rarg(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2() {
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__1;
+x_2 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__1;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__3() {
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -25482,16 +26549,16 @@ x_1 = lean_mk_string("matcher value: ");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__4() {
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__3;
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__3;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__5() {
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -25499,572 +26566,279 @@ x_1 = lean_mk_string("\ntype: ");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__6() {
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__5;
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__5;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18) {
 _start:
 {
-lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
 lean_inc(x_1);
-x_17 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_17, 0, x_1);
-x_18 = 0;
-x_19 = lean_box(0);
-lean_inc(x_12);
-x_20 = l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(x_17, x_18, x_19, x_12, x_13, x_14, x_15, x_16);
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
-lean_inc(x_22);
-lean_dec(x_20);
-lean_inc(x_2);
-x_23 = lean_array_to_list(lean_box(0), x_2);
-x_24 = lean_box(0);
+x_19 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_19, 0, x_1);
+x_20 = 0;
+x_21 = lean_box(0);
+lean_inc(x_14);
+x_22 = l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(x_19, x_20, x_21, x_14, x_15, x_16, x_17, x_18);
+x_23 = lean_ctor_get(x_22, 0);
 lean_inc(x_23);
-x_25 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__1(x_23, x_24);
-x_26 = l_Lean_Expr_mvarId_x21(x_21);
-x_27 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_27, 1, x_23);
-lean_ctor_set(x_27, 2, x_10);
-lean_ctor_set(x_27, 3, x_25);
-x_28 = lean_st_ref_get(x_15, x_22);
-x_29 = lean_ctor_get(x_28, 1);
-lean_inc(x_29);
-lean_dec(x_28);
-x_30 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2;
-x_31 = lean_st_mk_ref(x_30, x_29);
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
-lean_inc(x_33);
-lean_dec(x_31);
-x_34 = lean_unsigned_to_nat(0u);
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+lean_inc(x_2);
+x_25 = lean_array_to_list(lean_box(0), x_2);
+x_26 = lean_box(0);
+lean_inc(x_25);
+x_27 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__1(x_25, x_26);
+x_28 = l_Lean_Expr_mvarId_x21(x_23);
+x_29 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_25);
+lean_ctor_set(x_29, 2, x_12);
+lean_ctor_set(x_29, 3, x_27);
+x_30 = lean_st_ref_get(x_17, x_24);
+x_31 = lean_ctor_get(x_30, 1);
+lean_inc(x_31);
+lean_dec(x_30);
+x_32 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2;
+x_33 = lean_st_mk_ref(x_32, x_31);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
+lean_dec(x_33);
+x_36 = lean_unsigned_to_nat(0u);
+lean_inc(x_17);
+lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_32);
-x_35 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search(x_27, x_34, x_32, x_12, x_13, x_14, x_15, x_33);
-if (lean_obj_tag(x_35) == 0)
+lean_inc(x_34);
+x_37 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search(x_29, x_36, x_34, x_14, x_15, x_16, x_17, x_35);
+if (lean_obj_tag(x_37) == 0)
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; size_t x_46; size_t x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; uint8_t x_51; uint8_t x_52; lean_object* x_53; 
-x_36 = lean_ctor_get(x_35, 1);
-lean_inc(x_36);
-lean_dec(x_35);
-x_37 = lean_st_ref_get(x_15, x_36);
+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; size_t x_48; size_t x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; uint8_t x_53; uint8_t x_54; lean_object* x_55; 
 x_38 = lean_ctor_get(x_37, 1);
 lean_inc(x_38);
 lean_dec(x_37);
-x_39 = lean_st_ref_get(x_32, x_38);
-lean_dec(x_32);
-x_40 = lean_ctor_get(x_39, 0);
+x_39 = lean_st_ref_get(x_17, x_38);
+x_40 = lean_ctor_get(x_39, 1);
 lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
-lean_inc(x_41);
 lean_dec(x_39);
-x_42 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__2___closed__2;
-x_43 = lean_array_push(x_42, x_3);
-x_44 = l_Array_append___rarg(x_43, x_2);
-x_45 = lean_array_get_size(x_11);
-x_46 = lean_usize_of_nat(x_45);
-lean_dec(x_45);
-x_47 = 0;
-lean_inc(x_11);
-x_48 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__2(x_46, x_47, x_11);
-x_49 = l_Array_append___rarg(x_44, x_48);
-x_50 = 0;
-x_51 = 1;
-x_52 = 1;
-lean_inc(x_49);
-x_53 = l_Lean_Meta_mkForallFVars(x_49, x_1, x_50, x_51, x_52, x_12, x_13, x_14, x_15, x_41);
-if (lean_obj_tag(x_53) == 0)
+x_41 = lean_st_ref_get(x_34, x_40);
+lean_dec(x_34);
+x_42 = lean_ctor_get(x_41, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__2___closed__2;
+x_45 = lean_array_push(x_44, x_3);
+x_46 = l_Array_append___rarg(x_45, x_2);
+x_47 = lean_array_get_size(x_13);
+x_48 = lean_usize_of_nat(x_47);
+lean_dec(x_47);
+x_49 = 0;
+lean_inc(x_13);
+x_50 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__2(x_48, x_49, x_13);
+x_51 = l_Array_append___rarg(x_46, x_50);
+x_52 = 0;
+x_53 = 1;
+x_54 = 1;
+lean_inc(x_51);
+x_55 = l_Lean_Meta_mkForallFVars(x_51, x_1, x_52, x_53, x_54, x_14, x_15, x_16, x_17, x_43);
+if (lean_obj_tag(x_55) == 0)
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_54 = lean_ctor_get(x_53, 0);
-lean_inc(x_54);
-x_55 = lean_ctor_get(x_53, 1);
-lean_inc(x_55);
-lean_dec(x_53);
-x_56 = l_Lean_Meta_mkLambdaFVars(x_49, x_21, x_50, x_51, x_52, x_12, x_13, x_14, x_15, x_55);
-if (lean_obj_tag(x_56) == 0)
-{
-lean_object* x_57; lean_object* x_58; uint8_t x_59; lean_object* x_60; lean_object* x_77; lean_object* x_78; lean_object* x_79; uint8_t x_80; 
-x_57 = lean_ctor_get(x_56, 0);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_55, 0);
+lean_inc(x_56);
+x_57 = lean_ctor_get(x_55, 1);
 lean_inc(x_57);
-x_58 = lean_ctor_get(x_56, 1);
-lean_inc(x_58);
-lean_dec(x_56);
-x_77 = lean_st_ref_get(x_15, x_58);
-x_78 = lean_ctor_get(x_77, 0);
-lean_inc(x_78);
-x_79 = lean_ctor_get(x_78, 3);
-lean_inc(x_79);
-lean_dec(x_78);
-x_80 = lean_ctor_get_uint8(x_79, sizeof(void*)*1);
-lean_dec(x_79);
-if (x_80 == 0)
+lean_dec(x_55);
+x_58 = l_Lean_Meta_mkLambdaFVars(x_51, x_23, x_52, x_53, x_54, x_14, x_15, x_16, x_17, x_57);
+if (lean_obj_tag(x_58) == 0)
 {
-lean_object* x_81; 
-x_81 = lean_ctor_get(x_77, 1);
+lean_object* x_59; lean_object* x_60; uint8_t x_61; lean_object* x_62; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 
+x_59 = lean_ctor_get(x_58, 0);
+lean_inc(x_59);
+x_60 = lean_ctor_get(x_58, 1);
+lean_inc(x_60);
+lean_dec(x_58);
+x_79 = lean_st_ref_get(x_17, x_60);
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_80, 3);
 lean_inc(x_81);
-lean_dec(x_77);
-x_59 = x_50;
-x_60 = x_81;
-goto block_76;
+lean_dec(x_80);
+x_82 = lean_ctor_get_uint8(x_81, sizeof(void*)*1);
+lean_dec(x_81);
+if (x_82 == 0)
+{
+lean_object* x_83; 
+x_83 = lean_ctor_get(x_79, 1);
+lean_inc(x_83);
+lean_dec(x_79);
+x_61 = x_52;
+x_62 = x_83;
+goto block_78;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; uint8_t x_86; 
-x_82 = lean_ctor_get(x_77, 1);
-lean_inc(x_82);
-lean_dec(x_77);
-lean_inc(x_8);
-x_83 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_8, x_12, x_13, x_14, x_15, x_82);
-x_84 = lean_ctor_get(x_83, 0);
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; uint8_t x_88; 
+x_84 = lean_ctor_get(x_79, 1);
 lean_inc(x_84);
-x_85 = lean_ctor_get(x_83, 1);
-lean_inc(x_85);
-lean_dec(x_83);
-x_86 = lean_unbox(x_84);
-lean_dec(x_84);
-x_59 = x_86;
-x_60 = x_85;
-goto block_76;
+lean_dec(x_79);
+lean_inc(x_8);
+x_85 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_8, x_14, x_15, x_16, x_17, x_84);
+x_86 = lean_ctor_get(x_85, 0);
+lean_inc(x_86);
+x_87 = lean_ctor_get(x_85, 1);
+lean_inc(x_87);
+lean_dec(x_85);
+x_88 = lean_unbox(x_86);
+lean_dec(x_86);
+x_61 = x_88;
+x_62 = x_87;
+goto block_78;
 }
-block_76:
+block_78:
 {
-if (x_59 == 0)
+if (x_61 == 0)
 {
-lean_object* x_61; lean_object* x_62; 
-x_61 = lean_box(0);
-x_62 = l_Lean_Meta_Match_mkMatcher___lambda__4(x_4, x_54, x_57, x_5, x_6, x_7, x_40, x_24, x_8, x_46, x_47, x_11, x_9, x_61, x_12, x_13, x_14, x_15, x_60);
-return x_62;
+lean_object* x_63; lean_object* x_64; 
+x_63 = lean_box(0);
+x_64 = l_Lean_Meta_Match_mkMatcher___lambda__5(x_4, x_56, x_59, x_5, x_6, x_7, x_42, x_26, x_8, x_9, x_48, x_49, x_13, x_10, x_11, x_63, x_14, x_15, x_16, x_17, x_62);
+return x_64;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-lean_inc(x_57);
-x_63 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_63, 0, x_57);
-x_64 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__4;
-x_65 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_65, 0, x_64);
-lean_ctor_set(x_65, 1, x_63);
-x_66 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__6;
+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_inc(x_59);
+x_65 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_65, 0, x_59);
+x_66 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4;
 x_67 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_66);
-lean_inc(x_54);
-x_68 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_68, 0, x_54);
+lean_ctor_set(x_67, 0, x_66);
+lean_ctor_set(x_67, 1, x_65);
+x_68 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6;
 x_69 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_69, 0, x_67);
 lean_ctor_set(x_69, 1, x_68);
-x_70 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+lean_inc(x_56);
+x_70 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_70, 0, x_56);
 x_71 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_71, 0, x_69);
 lean_ctor_set(x_71, 1, x_70);
+x_72 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_73 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_73, 0, x_71);
+lean_ctor_set(x_73, 1, x_72);
 lean_inc(x_8);
-x_72 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_8, x_71, x_12, x_13, x_14, x_15, x_60);
-x_73 = lean_ctor_get(x_72, 0);
-lean_inc(x_73);
-x_74 = lean_ctor_get(x_72, 1);
-lean_inc(x_74);
-lean_dec(x_72);
-x_75 = l_Lean_Meta_Match_mkMatcher___lambda__4(x_4, x_54, x_57, x_5, x_6, x_7, x_40, x_24, x_8, x_46, x_47, x_11, x_9, x_73, x_12, x_13, x_14, x_15, x_74);
-return x_75;
+x_74 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_8, x_73, x_14, x_15, x_16, x_17, x_62);
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+lean_dec(x_74);
+x_77 = l_Lean_Meta_Match_mkMatcher___lambda__5(x_4, x_56, x_59, x_5, x_6, x_7, x_42, x_26, x_8, x_9, x_48, x_49, x_13, x_10, x_11, x_75, x_14, x_15, x_16, x_17, x_76);
+return x_77;
 }
 }
 }
 else
 {
-uint8_t x_87; 
-lean_dec(x_54);
-lean_dec(x_40);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-x_87 = !lean_is_exclusive(x_56);
-if (x_87 == 0)
-{
-return x_56;
-}
-else
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_88 = lean_ctor_get(x_56, 0);
-x_89 = lean_ctor_get(x_56, 1);
-lean_inc(x_89);
-lean_inc(x_88);
+uint8_t x_89; 
 lean_dec(x_56);
-x_90 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_90, 0, x_88);
-lean_ctor_set(x_90, 1, x_89);
-return x_90;
-}
-}
-}
-else
-{
-uint8_t x_91; 
-lean_dec(x_49);
-lean_dec(x_40);
-lean_dec(x_21);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-x_91 = !lean_is_exclusive(x_53);
-if (x_91 == 0)
-{
-return x_53;
-}
-else
-{
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_53, 0);
-x_93 = lean_ctor_get(x_53, 1);
-lean_inc(x_93);
-lean_inc(x_92);
-lean_dec(x_53);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_92);
-lean_ctor_set(x_94, 1, x_93);
-return x_94;
-}
-}
-}
-else
-{
-uint8_t x_95; 
-lean_dec(x_32);
-lean_dec(x_21);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-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_95 = !lean_is_exclusive(x_35);
-if (x_95 == 0)
-{
-return x_35;
-}
-else
-{
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_35, 0);
-x_97 = lean_ctor_get(x_35, 1);
-lean_inc(x_97);
-lean_inc(x_96);
-lean_dec(x_35);
-x_98 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_98, 0, x_96);
-lean_ctor_set(x_98, 1, x_97);
-return x_98;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
-_start:
-{
-lean_object* x_16; lean_object* x_17; 
-lean_inc(x_7);
-lean_inc(x_3);
-x_16 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__5), 16, 9);
-lean_closure_set(x_16, 0, x_1);
-lean_closure_set(x_16, 1, x_2);
-lean_closure_set(x_16, 2, x_3);
-lean_closure_set(x_16, 3, x_4);
-lean_closure_set(x_16, 4, x_5);
-lean_closure_set(x_16, 5, x_6);
-lean_closure_set(x_16, 6, x_7);
-lean_closure_set(x_16, 7, x_8);
-lean_closure_set(x_16, 8, x_9);
-x_17 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg(x_3, x_7, x_16, x_11, x_12, x_13, x_14, x_15);
-return x_17;
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__7___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("target: ");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__7___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_mkMatcher___lambda__7___closed__1;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
-_start:
-{
-lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-lean_dec(x_9);
-lean_inc(x_2);
-lean_inc(x_1);
-x_15 = l_Lean_mkAppN(x_1, x_2);
-x_30 = lean_st_ref_get(x_13, x_14);
-x_31 = lean_ctor_get(x_30, 0);
-lean_inc(x_31);
-x_32 = lean_ctor_get(x_31, 3);
-lean_inc(x_32);
-lean_dec(x_31);
-x_33 = lean_ctor_get_uint8(x_32, sizeof(void*)*1);
-lean_dec(x_32);
-if (x_33 == 0)
-{
-lean_object* x_34; uint8_t x_35; 
-x_34 = lean_ctor_get(x_30, 1);
-lean_inc(x_34);
-lean_dec(x_30);
-x_35 = 0;
-x_16 = x_35;
-x_17 = x_34;
-goto block_29;
-}
-else
-{
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_36 = lean_ctor_get(x_30, 1);
-lean_inc(x_36);
-lean_dec(x_30);
-lean_inc(x_7);
-x_37 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_10, x_11, x_12, x_13, x_36);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-x_40 = lean_unbox(x_38);
-lean_dec(x_38);
-x_16 = x_40;
-x_17 = x_39;
-goto block_29;
-}
-block_29:
-{
-if (x_16 == 0)
-{
-lean_object* x_18; lean_object* x_19; 
-x_18 = lean_box(0);
-x_19 = l_Lean_Meta_Match_mkMatcher___lambda__6(x_15, x_2, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_18, x_10, x_11, x_12, x_13, x_17);
-return x_19;
-}
-else
-{
-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_inc(x_15);
-x_20 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_20, 0, x_15);
-x_21 = l_Lean_Meta_Match_mkMatcher___lambda__7___closed__2;
-x_22 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_20);
-x_23 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
-x_24 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-lean_inc(x_7);
-x_25 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_24, x_10, x_11, x_12, x_13, x_17);
-x_26 = lean_ctor_get(x_25, 0);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = l_Lean_Meta_Match_mkMatcher___lambda__6(x_15, x_2, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_26, x_10, x_11, x_12, x_13, x_27);
-lean_dec(x_26);
-return x_28;
-}
-}
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__8___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("motiveType: ");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__8___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_mkMatcher___lambda__8___closed__1;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
-_start:
-{
-lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
-x_14 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__8;
-x_29 = lean_st_ref_get(x_12, x_13);
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_30, 3);
-lean_inc(x_31);
-lean_dec(x_30);
-x_32 = lean_ctor_get_uint8(x_31, sizeof(void*)*1);
-lean_dec(x_31);
-if (x_32 == 0)
-{
-lean_object* x_33; uint8_t x_34; 
-x_33 = lean_ctor_get(x_29, 1);
-lean_inc(x_33);
-lean_dec(x_29);
-x_34 = 0;
-x_15 = x_34;
-x_16 = x_33;
-goto block_28;
-}
-else
-{
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
-x_35 = lean_ctor_get(x_29, 1);
-lean_inc(x_35);
-lean_dec(x_29);
-x_36 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_14, x_9, x_10, x_11, x_12, x_35);
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
-lean_inc(x_38);
-lean_dec(x_36);
-x_39 = lean_unbox(x_37);
-lean_dec(x_37);
-x_15 = x_39;
-x_16 = x_38;
-goto block_28;
-}
-block_28:
-{
-if (x_15 == 0)
-{
-lean_object* x_17; lean_object* x_18; 
-lean_dec(x_7);
-x_17 = lean_box(0);
-x_18 = l_Lean_Meta_Match_mkMatcher___lambda__7(x_8, x_1, x_2, x_3, x_4, x_5, x_14, x_6, x_17, x_9, x_10, x_11, x_12, x_16);
-return x_18;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_19 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_19, 0, x_7);
-x_20 = l_Lean_Meta_Match_mkMatcher___lambda__8___closed__2;
-x_21 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_21, 0, x_20);
-lean_ctor_set(x_21, 1, x_19);
-x_22 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
-x_23 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-x_24 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_14, x_23, x_9, x_10, x_11, x_12, x_16);
-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 = l_Lean_Meta_Match_mkMatcher___lambda__7(x_8, x_1, x_2, x_3, x_4, x_5, x_14, x_6, x_25, x_9, x_10, x_11, x_12, x_26);
-return x_27;
-}
-}
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__9___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("motive");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__9___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Meta_Match_mkMatcher___lambda__9___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
-_start:
-{
-lean_object* x_12; uint8_t x_13; uint8_t x_14; uint8_t x_15; lean_object* x_16; 
-lean_inc(x_6);
-x_12 = l_Lean_mkSort(x_6);
-x_13 = 0;
-x_14 = 1;
-x_15 = 1;
-lean_inc(x_1);
-x_16 = l_Lean_Meta_mkForallFVars(x_1, x_12, x_13, x_14, x_15, x_7, x_8, x_9, x_10, x_11);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; 
-x_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_42);
+lean_dec(x_17);
 lean_dec(x_16);
-lean_inc(x_17);
-x_19 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__8), 13, 7);
-lean_closure_set(x_19, 0, x_1);
-lean_closure_set(x_19, 1, x_2);
-lean_closure_set(x_19, 2, x_6);
-lean_closure_set(x_19, 3, x_3);
-lean_closure_set(x_19, 4, x_4);
-lean_closure_set(x_19, 5, x_5);
-lean_closure_set(x_19, 6, x_17);
-x_20 = l_Lean_Meta_Match_mkMatcher___lambda__9___closed__2;
-x_21 = 0;
-x_22 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_20, x_21, x_17, x_19, x_7, x_8, x_9, x_10, x_18);
-return x_22;
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_89 = !lean_is_exclusive(x_58);
+if (x_89 == 0)
+{
+return x_58;
 }
 else
 {
-uint8_t x_23; 
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_58, 0);
+x_91 = lean_ctor_get(x_58, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_58);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
+}
+}
+}
+else
+{
+uint8_t x_93; 
+lean_dec(x_51);
+lean_dec(x_42);
+lean_dec(x_23);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_93 = !lean_is_exclusive(x_55);
+if (x_93 == 0)
+{
+return x_55;
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_55, 0);
+x_95 = lean_ctor_get(x_55, 1);
+lean_inc(x_95);
+lean_inc(x_94);
+lean_dec(x_55);
+x_96 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_96, 0, x_94);
+lean_ctor_set(x_96, 1, x_95);
+return x_96;
+}
+}
+}
+else
+{
+uint8_t x_97; 
+lean_dec(x_34);
+lean_dec(x_23);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -26075,106 +26849,287 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_23 = !lean_is_exclusive(x_16);
-if (x_23 == 0)
+x_97 = !lean_is_exclusive(x_37);
+if (x_97 == 0)
 {
-return x_16;
+return x_37;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_24 = lean_ctor_get(x_16, 0);
-x_25 = lean_ctor_get(x_16, 1);
-lean_inc(x_25);
-lean_inc(x_24);
-lean_dec(x_16);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_24);
-lean_ctor_set(x_26, 1, x_25);
-return x_26;
+lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_98 = lean_ctor_get(x_37, 0);
+x_99 = lean_ctor_get(x_37, 1);
+lean_inc(x_99);
+lean_inc(x_98);
+lean_dec(x_37);
+x_100 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_100, 0, x_98);
+lean_ctor_set(x_100, 1, x_99);
+return x_100;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17) {
 _start:
 {
-lean_object* x_11; 
-x_11 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns(x_4, x_1, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = lean_ctor_get(x_11, 1);
-lean_inc(x_12);
-lean_dec(x_11);
-lean_inc(x_9);
-lean_inc(x_8);
+lean_object* x_18; lean_object* x_19; 
+lean_inc(x_11);
 lean_inc(x_7);
-lean_inc(x_6);
-x_13 = l_Lean_Meta_getLevel(x_5, x_6, x_7, x_8, x_9, x_12);
-if (lean_obj_tag(x_13) == 0)
+lean_inc(x_3);
+lean_inc(x_2);
+x_18 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__6___boxed), 18, 11);
+lean_closure_set(x_18, 0, x_1);
+lean_closure_set(x_18, 1, x_2);
+lean_closure_set(x_18, 2, x_3);
+lean_closure_set(x_18, 3, x_4);
+lean_closure_set(x_18, 4, x_5);
+lean_closure_set(x_18, 5, x_6);
+lean_closure_set(x_18, 6, x_7);
+lean_closure_set(x_18, 7, x_8);
+lean_closure_set(x_18, 8, x_9);
+lean_closure_set(x_18, 9, x_10);
+lean_closure_set(x_18, 10, x_11);
+x_19 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg(x_3, x_2, x_11, x_7, x_18, x_13, x_14, x_15, x_16, x_17);
+return x_19;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
-lean_inc(x_15);
+lean_object* x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; lean_object* x_13; 
+x_9 = l_Lean_mkAppN(x_1, x_2);
+x_10 = 0;
+x_11 = 1;
+x_12 = 1;
+x_13 = l_Lean_Meta_mkForallFVars(x_3, x_9, x_10, x_11, x_12, x_4, x_5, x_6, x_7, x_8);
+return x_13;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_12 = lean_unsigned_to_nat(0u);
+x_13 = l_List_lengthTRAux___rarg(x_1, x_12);
+lean_inc(x_13);
+x_14 = l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__13(x_2, x_13, x_13, x_3);
 lean_dec(x_13);
-x_16 = l_Lean_levelZero;
-x_17 = lean_level_eq(x_14, x_16);
-if (x_17 == 0)
+x_15 = lean_ctor_get(x_2, 1);
+x_16 = l_List_reverse___rarg(x_14);
+lean_inc(x_15);
+x_17 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_17, 0, x_4);
+lean_ctor_set(x_17, 1, x_15);
+lean_ctor_set(x_17, 2, x_16);
+lean_ctor_set(x_17, 3, x_5);
+x_18 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_11);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, size_t x_10, size_t x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
+_start:
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_18 = l_Lean_Meta_mkFreshLevelMVar(x_6, x_7, x_8, x_9, x_15);
-x_19 = lean_ctor_get(x_18, 0);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = l_Lean_Expr_getAppFn(x_1);
+x_22 = l_Lean_Expr_constLevels_x21(x_21);
 lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
-lean_inc(x_20);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_inc(x_16);
+lean_inc(x_2);
+x_23 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f(x_22, x_2, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_23) == 0)
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_inc(x_16);
+x_26 = l_Lean_Meta_isLevelDefEq(x_2, x_3, x_16, x_17, x_18, x_19, x_25);
+if (lean_obj_tag(x_26) == 0)
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_26, 1);
+lean_inc(x_27);
+lean_dec(x_26);
+x_28 = lean_st_ref_get(x_19, x_27);
+if (lean_obj_tag(x_8) == 0)
+{
+lean_object* x_55; 
+lean_dec(x_24);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_9);
+x_55 = l_Lean_Meta_Match_mkMatcher___lambda__3___closed__3;
+x_29 = x_55;
+goto block_54;
+}
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_56 = lean_ctor_get(x_8, 0);
+lean_inc(x_56);
+lean_dec(x_8);
+x_57 = lean_unsigned_to_nat(0u);
+x_58 = l_Lean_Expr_getAppNumArgsAux(x_1, x_57);
+x_59 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__14(x_9, x_10, x_11, x_12);
+lean_dec(x_9);
+x_60 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_13);
+lean_ctor_set(x_60, 2, x_59);
+lean_ctor_set(x_60, 3, x_24);
+lean_ctor_set(x_60, 4, x_14);
+x_61 = lean_apply_1(x_56, x_60);
+x_29 = x_61;
+goto block_54;
+}
+block_54:
+{
+uint8_t x_30; lean_object* x_31; lean_object* x_44; lean_object* x_45; uint8_t x_46; 
+x_44 = lean_ctor_get(x_28, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_44, 3);
+lean_inc(x_45);
+lean_dec(x_44);
+x_46 = lean_ctor_get_uint8(x_45, sizeof(void*)*1);
+lean_dec(x_45);
+if (x_46 == 0)
+{
+lean_object* x_47; uint8_t x_48; 
+x_47 = lean_ctor_get(x_28, 1);
+lean_inc(x_47);
+lean_dec(x_28);
+x_48 = 0;
+x_30 = x_48;
+x_31 = x_47;
+goto block_43;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+x_49 = lean_ctor_get(x_28, 1);
+lean_inc(x_49);
+lean_dec(x_28);
+lean_inc(x_7);
+x_50 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_16, x_17, x_18, x_19, 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_unbox(x_51);
+lean_dec(x_51);
+x_30 = x_53;
+x_31 = x_52;
+goto block_43;
+}
+block_43:
+{
+if (x_30 == 0)
+{
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_7);
+x_32 = lean_box(0);
+x_33 = l_Lean_Meta_Match_mkMatcher___lambda__9(x_4, x_5, x_6, x_1, x_29, x_32, x_16, x_17, x_18, x_19, x_31);
+lean_dec(x_19);
 lean_dec(x_18);
-x_21 = l_Lean_Meta_Match_mkMatcher___lambda__9(x_4, x_2, x_14, x_1, x_3, x_19, x_6, x_7, x_8, x_9, x_20);
-return x_21;
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_33;
 }
 else
 {
-lean_object* x_22; 
-x_22 = l_Lean_Meta_Match_mkMatcher___lambda__9(x_4, x_2, x_14, x_1, x_3, x_16, x_6, x_7, x_8, x_9, x_15);
-return x_22;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_inc(x_1);
+x_34 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_34, 0, x_1);
+x_35 = l_Lean_Meta_Match_mkMatcher___lambda__3___closed__2;
+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___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_38 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_38, 0, x_36);
+lean_ctor_set(x_38, 1, x_37);
+x_39 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_38, x_16, x_17, x_18, x_19, x_31);
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_39, 1);
+lean_inc(x_41);
+lean_dec(x_39);
+x_42 = l_Lean_Meta_Match_mkMatcher___lambda__9(x_4, x_5, x_6, x_1, x_29, x_40, x_16, x_17, x_18, x_19, x_41);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_40);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_42;
+}
+}
 }
 }
 else
 {
-uint8_t x_23; 
+uint8_t x_62; 
+lean_dec(x_24);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
 lean_dec(x_1);
-x_23 = !lean_is_exclusive(x_13);
-if (x_23 == 0)
+x_62 = !lean_is_exclusive(x_26);
+if (x_62 == 0)
 {
-return x_13;
-}
-else
-{
-lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_24 = lean_ctor_get(x_13, 0);
-x_25 = lean_ctor_get(x_13, 1);
-lean_inc(x_25);
-lean_inc(x_24);
-lean_dec(x_13);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_24);
-lean_ctor_set(x_26, 1, x_25);
 return x_26;
 }
+else
+{
+lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_63 = lean_ctor_get(x_26, 0);
+x_64 = lean_ctor_get(x_26, 1);
+lean_inc(x_64);
+lean_inc(x_63);
+lean_dec(x_26);
+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_27; 
+uint8_t x_66; 
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -26184,24 +27139,1520 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_27 = !lean_is_exclusive(x_11);
-if (x_27 == 0)
+x_66 = !lean_is_exclusive(x_23);
+if (x_66 == 0)
 {
-return x_11;
+return x_23;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_28 = lean_ctor_get(x_11, 0);
-x_29 = lean_ctor_get(x_11, 1);
-lean_inc(x_29);
-lean_inc(x_28);
-lean_dec(x_11);
-x_30 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_30, 0, x_28);
-lean_ctor_set(x_30, 1, x_29);
+lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_67 = lean_ctor_get(x_23, 0);
+x_68 = lean_ctor_get(x_23, 1);
+lean_inc(x_68);
+lean_inc(x_67);
+lean_dec(x_23);
+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;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__11(lean_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, size_t x_11, size_t x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21) {
+_start:
+{
+lean_object* x_22; 
+lean_dec(x_16);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_inc(x_17);
+x_22 = l_Lean_Meta_Match_mkMatcherAuxDefinition(x_1, x_2, x_3, x_17, x_18, x_19, x_20, x_21);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = lean_ctor_get(x_23, 0);
+lean_inc(x_25);
+x_26 = lean_ctor_get(x_23, 1);
+lean_inc(x_26);
+lean_dec(x_23);
+x_48 = lean_st_ref_get(x_20, x_24);
+x_49 = lean_ctor_get(x_48, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_49, 3);
+lean_inc(x_50);
+lean_dec(x_49);
+x_51 = lean_ctor_get_uint8(x_50, sizeof(void*)*1);
+lean_dec(x_50);
+if (x_51 == 0)
+{
+lean_object* x_52; uint8_t x_53; 
+x_52 = lean_ctor_get(x_48, 1);
+lean_inc(x_52);
+lean_dec(x_48);
+x_53 = 0;
+x_27 = x_53;
+x_28 = x_52;
+goto block_47;
+}
+else
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; 
+x_54 = lean_ctor_get(x_48, 1);
+lean_inc(x_54);
+lean_dec(x_48);
+lean_inc(x_9);
+x_55 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_17, x_18, x_19, x_20, x_54);
+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_unbox(x_56);
+lean_dec(x_56);
+x_27 = x_58;
+x_28 = x_57;
+goto block_47;
+}
+block_47:
+{
+if (x_27 == 0)
+{
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_box(0);
+x_30 = l_Lean_Meta_Match_mkMatcher___lambda__10(x_25, x_4, x_5, x_6, x_7, x_8, x_9, x_26, x_10, x_11, x_12, x_13, x_14, x_15, x_29, x_17, x_18, x_19, x_20, x_28);
 return x_30;
 }
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_31 = l_Lean_Expr_getAppFn(x_25);
+x_32 = l_Lean_Expr_constLevels_x21(x_31);
+lean_inc(x_8);
+x_33 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__6(x_32, x_8);
+x_34 = l_Lean_MessageData_ofList(x_33);
+lean_dec(x_33);
+x_35 = l_Lean_Meta_Match_mkMatcher___lambda__4___closed__2;
+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_Meta_Match_mkMatcher___lambda__4___closed__4;
+x_38 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_38, 0, x_36);
+lean_ctor_set(x_38, 1, x_37);
+lean_inc(x_4);
+x_39 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_39, 0, x_4);
+x_40 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+x_41 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_42 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+lean_inc(x_9);
+x_43 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_42, x_17, x_18, x_19, x_20, x_28);
+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 = l_Lean_Meta_Match_mkMatcher___lambda__10(x_25, x_4, x_5, x_6, x_7, x_8, x_9, x_26, x_10, x_11, x_12, x_13, x_14, x_15, x_44, x_17, x_18, x_19, x_20, x_45);
+lean_dec(x_44);
+return x_46;
+}
+}
+}
+else
+{
+uint8_t x_59; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+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);
+x_59 = !lean_is_exclusive(x_22);
+if (x_59 == 0)
+{
+return x_22;
+}
+else
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_22, 0);
+x_61 = lean_ctor_get(x_22, 1);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_dec(x_22);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_60);
+lean_ctor_set(x_62, 1, x_61);
+return x_62;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__12(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, 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, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21) {
+_start:
+{
+uint8_t x_22; lean_object* x_23; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; 
+lean_dec(x_16);
+x_39 = lean_st_ref_get(x_20, x_21);
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_40, 3);
+lean_inc(x_41);
+lean_dec(x_40);
+x_42 = lean_ctor_get_uint8(x_41, sizeof(void*)*1);
+lean_dec(x_41);
+if (x_42 == 0)
+{
+lean_object* x_43; uint8_t x_44; 
+x_43 = lean_ctor_get(x_39, 1);
+lean_inc(x_43);
+lean_dec(x_39);
+x_44 = 0;
+x_22 = x_44;
+x_23 = x_43;
+goto block_38;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
+x_45 = lean_ctor_get(x_39, 1);
+lean_inc(x_45);
+lean_dec(x_39);
+lean_inc(x_9);
+x_46 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_17, x_18, x_19, x_20, x_45);
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec(x_46);
+x_49 = lean_unbox(x_47);
+lean_dec(x_47);
+x_22 = x_49;
+x_23 = x_48;
+goto block_38;
+}
+block_38:
+{
+if (x_22 == 0)
+{
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_box(0);
+x_25 = l_Lean_Meta_Match_mkMatcher___lambda__11(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_24, x_17, x_18, x_19, x_20, x_23);
+return x_25;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 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_inc(x_13);
+x_26 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7(x_11, x_12, x_13);
+x_27 = lean_array_to_list(lean_box(0), x_26);
+lean_inc(x_8);
+x_28 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__15___at_Lean_Meta_Match_mkMatcher___spec__16___at_Lean_Meta_Match_mkMatcher___spec__17(x_27, x_8);
+x_29 = l_Lean_MessageData_ofList(x_28);
+lean_dec(x_28);
+x_30 = l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2;
+x_31 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_29);
+x_32 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_33 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+lean_inc(x_9);
+x_34 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_33, x_17, x_18, x_19, x_20, x_23);
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
+lean_dec(x_34);
+x_37 = l_Lean_Meta_Match_mkMatcher___lambda__11(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_35, x_17, x_18, x_19, x_20, x_36);
+return x_37;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__13(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21) {
+_start:
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+lean_dec(x_16);
+x_22 = l_Array_zip___rarg(x_1, x_2);
+x_23 = lean_array_get_size(x_22);
+x_24 = lean_unsigned_to_nat(0u);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_inc(x_17);
+x_25 = l_Array_filterMapM___at_Lean_Meta_Match_mkMatcher___spec__11(x_22, x_24, x_23, x_17, x_18, x_19, x_20, x_21);
+lean_dec(x_22);
+if (lean_obj_tag(x_25) == 0)
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; size_t x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; uint8_t x_38; uint8_t x_39; lean_object* x_40; 
+x_26 = lean_ctor_get(x_25, 0);
+lean_inc(x_26);
+x_27 = lean_ctor_get(x_25, 1);
+lean_inc(x_27);
+lean_dec(x_25);
+lean_inc(x_1);
+x_28 = l_Lean_mkAppN(x_3, x_1);
+x_29 = l_Lean_mkAppN(x_28, x_26);
+x_30 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_processConstructor___lambda__2___closed__2;
+lean_inc(x_4);
+x_31 = lean_array_push(x_30, x_4);
+lean_inc(x_1);
+x_32 = l_Array_append___rarg(x_31, x_1);
+x_33 = lean_array_get_size(x_5);
+x_34 = lean_usize_of_nat(x_33);
+lean_dec(x_33);
+lean_inc(x_5);
+x_35 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__2(x_34, x_6, x_5);
+x_36 = l_Array_append___rarg(x_32, x_35);
+x_37 = 0;
+x_38 = 1;
+x_39 = 1;
+lean_inc(x_36);
+x_40 = l_Lean_Meta_mkLambdaFVars(x_36, x_29, x_37, x_38, x_39, x_17, x_18, x_19, x_20, x_27);
+if (lean_obj_tag(x_40) == 0)
+{
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+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_Lean_mkAppN(x_4, x_1);
+x_44 = l_Lean_Meta_mkForallFVars(x_36, x_43, x_37, x_38, x_39, x_17, x_18, x_19, x_20, x_42);
+if (lean_obj_tag(x_44) == 0)
+{
+lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; 
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_65 = lean_st_ref_get(x_20, x_46);
+x_66 = lean_ctor_get(x_65, 0);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_66, 3);
+lean_inc(x_67);
+lean_dec(x_66);
+x_68 = lean_ctor_get_uint8(x_67, sizeof(void*)*1);
+lean_dec(x_67);
+if (x_68 == 0)
+{
+lean_object* x_69; 
+x_69 = lean_ctor_get(x_65, 1);
+lean_inc(x_69);
+lean_dec(x_65);
+x_47 = x_37;
+x_48 = x_69;
+goto block_64;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; 
+x_70 = lean_ctor_get(x_65, 1);
+lean_inc(x_70);
+lean_dec(x_65);
+lean_inc(x_13);
+x_71 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_13, x_17, x_18, x_19, x_20, x_70);
+x_72 = lean_ctor_get(x_71, 0);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_71, 1);
+lean_inc(x_73);
+lean_dec(x_71);
+x_74 = lean_unbox(x_72);
+lean_dec(x_72);
+x_47 = x_74;
+x_48 = x_73;
+goto block_64;
+}
+block_64:
+{
+if (x_47 == 0)
+{
+lean_object* x_49; lean_object* x_50; 
+x_49 = lean_box(0);
+x_50 = l_Lean_Meta_Match_mkMatcher___lambda__12(x_7, x_45, x_41, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_34, x_6, x_5, x_15, x_2, x_49, x_17, x_18, x_19, x_20, x_48);
+return x_50;
+}
+else
+{
+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_41);
+x_51 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_51, 0, x_41);
+x_52 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4;
+x_53 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_51);
+x_54 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6;
+x_55 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_55, 0, x_53);
+lean_ctor_set(x_55, 1, x_54);
+lean_inc(x_45);
+x_56 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_56, 0, x_45);
+x_57 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_57, 0, x_55);
+lean_ctor_set(x_57, 1, x_56);
+x_58 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_59 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+lean_inc(x_13);
+x_60 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_13, x_59, x_17, x_18, x_19, x_20, x_48);
+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_63 = l_Lean_Meta_Match_mkMatcher___lambda__12(x_7, x_45, x_41, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_34, x_6, x_5, x_15, x_2, x_61, x_17, x_18, x_19, x_20, x_62);
+return x_63;
+}
+}
+}
+else
+{
+uint8_t x_75; 
+lean_dec(x_41);
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_2);
+x_75 = !lean_is_exclusive(x_44);
+if (x_75 == 0)
+{
+return x_44;
+}
+else
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_76 = lean_ctor_get(x_44, 0);
+x_77 = lean_ctor_get(x_44, 1);
+lean_inc(x_77);
+lean_inc(x_76);
+lean_dec(x_44);
+x_78 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_78, 0, x_76);
+lean_ctor_set(x_78, 1, x_77);
+return x_78;
+}
+}
+}
+else
+{
+uint8_t x_79; 
+lean_dec(x_36);
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_79 = !lean_is_exclusive(x_40);
+if (x_79 == 0)
+{
+return x_40;
+}
+else
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_40, 0);
+x_81 = lean_ctor_get(x_40, 1);
+lean_inc(x_81);
+lean_inc(x_80);
+lean_dec(x_40);
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+return x_82;
+}
+}
+}
+else
+{
+uint8_t x_83; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_83 = !lean_is_exclusive(x_25);
+if (x_83 == 0)
+{
+return x_25;
+}
+else
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_84 = lean_ctor_get(x_25, 0);
+x_85 = lean_ctor_get(x_25, 1);
+lean_inc(x_85);
+lean_inc(x_84);
+lean_dec(x_25);
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_84);
+lean_ctor_set(x_86, 1, x_85);
+return x_86;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__14___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("matcher\nvalue: ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__14___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__14___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__14(lean_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, size_t x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21) {
+_start:
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_dec(x_16);
+lean_inc(x_1);
+x_22 = lean_array_to_list(lean_box(0), x_1);
+x_23 = lean_box(0);
+x_24 = l_List_mapTRAux___at_Lean_Meta_Match_mkMatcher___spec__1(x_22, x_23);
+x_25 = l_Lean_Expr_mvarId_x21(x_2);
+lean_inc(x_3);
+x_26 = lean_array_to_list(lean_box(0), x_3);
+x_27 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_27, 0, x_25);
+lean_ctor_set(x_27, 1, x_26);
+lean_ctor_set(x_27, 2, x_4);
+lean_ctor_set(x_27, 3, x_24);
+x_28 = lean_st_ref_get(x_20, x_21);
+x_29 = lean_ctor_get(x_28, 1);
+lean_inc(x_29);
+lean_dec(x_28);
+x_30 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2;
+x_31 = lean_st_mk_ref(x_30, x_29);
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
+lean_inc(x_33);
+lean_dec(x_31);
+x_34 = lean_unsigned_to_nat(0u);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_inc(x_32);
+x_35 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process_search(x_27, x_34, x_32, x_17, x_18, x_19, x_20, x_33);
+if (lean_obj_tag(x_35) == 0)
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; uint8_t x_43; uint8_t x_44; lean_object* x_45; 
+x_36 = lean_ctor_get(x_35, 1);
+lean_inc(x_36);
+lean_dec(x_35);
+x_37 = lean_st_ref_get(x_20, x_36);
+x_38 = lean_ctor_get(x_37, 1);
+lean_inc(x_38);
+lean_dec(x_37);
+x_39 = lean_st_ref_get(x_32, x_38);
+lean_dec(x_32);
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_39, 1);
+lean_inc(x_41);
+lean_dec(x_39);
+x_42 = 0;
+x_43 = 1;
+x_44 = 1;
+x_45 = l_Lean_Meta_mkLambdaFVars(x_3, x_2, x_42, x_43, x_44, x_17, x_18, x_19, x_20, x_41);
+if (lean_obj_tag(x_45) == 0)
+{
+lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; 
+x_46 = lean_ctor_get(x_45, 0);
+lean_inc(x_46);
+x_47 = lean_ctor_get(x_45, 1);
+lean_inc(x_47);
+lean_dec(x_45);
+x_73 = lean_st_ref_get(x_20, x_47);
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_74, 3);
+lean_inc(x_75);
+lean_dec(x_74);
+x_76 = lean_ctor_get_uint8(x_75, sizeof(void*)*1);
+lean_dec(x_75);
+if (x_76 == 0)
+{
+lean_object* x_77; 
+x_77 = lean_ctor_get(x_73, 1);
+lean_inc(x_77);
+lean_dec(x_73);
+x_48 = x_42;
+x_49 = x_77;
+goto block_72;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 
+x_78 = lean_ctor_get(x_73, 1);
+lean_inc(x_78);
+lean_dec(x_73);
+lean_inc(x_13);
+x_79 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_13, x_17, x_18, x_19, x_20, x_78);
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_79, 1);
+lean_inc(x_81);
+lean_dec(x_79);
+x_82 = lean_unbox(x_80);
+lean_dec(x_80);
+x_48 = x_82;
+x_49 = x_81;
+goto block_72;
+}
+block_72:
+{
+if (x_48 == 0)
+{
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_box(0);
+x_51 = l_Lean_Meta_Match_mkMatcher___lambda__13(x_1, x_5, x_46, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_40, x_23, x_13, x_14, x_15, x_50, x_17, x_18, x_19, x_20, x_49);
+return x_51;
+}
+else
+{
+lean_object* x_52; 
+lean_inc(x_20);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_inc(x_46);
+x_52 = lean_infer_type(x_46, x_17, x_18, x_19, x_20, x_49);
+if (lean_obj_tag(x_52) == 0)
+{
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_53 = lean_ctor_get(x_52, 0);
+lean_inc(x_53);
+x_54 = lean_ctor_get(x_52, 1);
+lean_inc(x_54);
+lean_dec(x_52);
+lean_inc(x_46);
+x_55 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_55, 0, x_46);
+x_56 = l_Lean_Meta_Match_mkMatcher___lambda__14___closed__2;
+x_57 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_55);
+x_58 = l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6;
+x_59 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+x_60 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_60, 0, x_53);
+x_61 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_61, 0, x_59);
+lean_ctor_set(x_61, 1, x_60);
+x_62 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_63 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+lean_inc(x_13);
+x_64 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_13, x_63, x_17, x_18, x_19, x_20, x_54);
+x_65 = lean_ctor_get(x_64, 0);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_64, 1);
+lean_inc(x_66);
+lean_dec(x_64);
+x_67 = l_Lean_Meta_Match_mkMatcher___lambda__13(x_1, x_5, x_46, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_40, x_23, x_13, x_14, x_15, x_65, x_17, x_18, x_19, x_20, x_66);
+return x_67;
+}
+else
+{
+uint8_t x_68; 
+lean_dec(x_46);
+lean_dec(x_40);
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_1);
+x_68 = !lean_is_exclusive(x_52);
+if (x_68 == 0)
+{
+return x_52;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_52, 0);
+x_70 = lean_ctor_get(x_52, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_52);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_83; 
+lean_dec(x_40);
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_1);
+x_83 = !lean_is_exclusive(x_45);
+if (x_83 == 0)
+{
+return x_45;
+}
+else
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_84 = lean_ctor_get(x_45, 0);
+x_85 = lean_ctor_get(x_45, 1);
+lean_inc(x_85);
+lean_inc(x_84);
+lean_dec(x_45);
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_84);
+lean_ctor_set(x_86, 1, x_85);
+return x_86;
+}
+}
+}
+else
+{
+uint8_t x_87; 
+lean_dec(x_32);
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_87 = !lean_is_exclusive(x_35);
+if (x_87 == 0)
+{
+return x_35;
+}
+else
+{
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_35, 0);
+x_89 = lean_ctor_get(x_35, 1);
+lean_inc(x_89);
+lean_inc(x_88);
+lean_dec(x_35);
+x_90 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+return x_90;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__15___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("goal\n");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__15___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__15___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__15(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
+_start:
+{
+lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; 
+x_21 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_21, 0, x_1);
+x_22 = 0;
+x_23 = lean_box(0);
+lean_inc(x_16);
+x_24 = l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(x_21, x_22, x_23, x_16, x_17, x_18, x_19, x_20);
+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_42 = lean_st_ref_get(x_19, x_26);
+x_43 = lean_ctor_get(x_42, 0);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_43, 3);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = lean_ctor_get_uint8(x_44, sizeof(void*)*1);
+lean_dec(x_44);
+if (x_45 == 0)
+{
+lean_object* x_46; uint8_t x_47; 
+x_46 = lean_ctor_get(x_42, 1);
+lean_inc(x_46);
+lean_dec(x_42);
+x_47 = 0;
+x_27 = x_47;
+x_28 = x_46;
+goto block_41;
+}
+else
+{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; 
+x_48 = lean_ctor_get(x_42, 1);
+lean_inc(x_48);
+lean_dec(x_42);
+lean_inc(x_11);
+x_49 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_11, x_16, x_17, x_18, x_19, x_48);
+x_50 = lean_ctor_get(x_49, 0);
+lean_inc(x_50);
+x_51 = lean_ctor_get(x_49, 1);
+lean_inc(x_51);
+lean_dec(x_49);
+x_52 = lean_unbox(x_50);
+lean_dec(x_50);
+x_27 = x_52;
+x_28 = x_51;
+goto block_41;
+}
+block_41:
+{
+if (x_27 == 0)
+{
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_box(0);
+x_30 = l_Lean_Meta_Match_mkMatcher___lambda__14(x_2, x_25, x_3, x_14, x_4, x_5, x_15, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_29, x_16, x_17, x_18, x_19, x_28);
+return x_30;
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_31 = l_Lean_Expr_mvarId_x21(x_25);
+x_32 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_32, 0, x_31);
+x_33 = l_Lean_Meta_Match_mkMatcher___lambda__15___closed__2;
+x_34 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_32);
+x_35 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_36 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_36, 0, x_34);
+lean_ctor_set(x_36, 1, x_35);
+lean_inc(x_11);
+x_37 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_11, x_36, x_16, x_17, x_18, x_19, x_28);
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_37, 1);
+lean_inc(x_39);
+lean_dec(x_37);
+x_40 = l_Lean_Meta_Match_mkMatcher___lambda__14(x_2, x_25, x_3, x_14, x_4, x_5, x_15, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_38, x_16, x_17, x_18, x_19, x_39);
+return x_40;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__16(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19) {
+_start:
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_box_usize(x_6);
+lean_inc(x_10);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_2);
+x_21 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__15___boxed), 20, 13);
+lean_closure_set(x_21, 0, x_1);
+lean_closure_set(x_21, 1, x_2);
+lean_closure_set(x_21, 2, x_3);
+lean_closure_set(x_21, 3, x_4);
+lean_closure_set(x_21, 4, x_5);
+lean_closure_set(x_21, 5, x_20);
+lean_closure_set(x_21, 6, x_7);
+lean_closure_set(x_21, 7, x_8);
+lean_closure_set(x_21, 8, x_9);
+lean_closure_set(x_21, 9, x_10);
+lean_closure_set(x_21, 10, x_11);
+lean_closure_set(x_21, 11, x_12);
+lean_closure_set(x_21, 12, x_13);
+x_22 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg(x_5, x_2, x_4, x_10, x_21, x_15, x_16, x_17, x_18, x_19);
+return x_22;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__17___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("target: ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__17___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__17(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18) {
+_start:
+{
+lean_object* x_19; lean_object* x_20; 
+lean_dec(x_13);
+lean_inc(x_12);
+lean_inc(x_1);
+x_19 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__8___boxed), 8, 2);
+lean_closure_set(x_19, 0, x_1);
+lean_closure_set(x_19, 1, x_12);
+lean_inc(x_17);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_3);
+lean_inc(x_12);
+lean_inc(x_2);
+x_20 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg(x_2, x_12, x_3, x_19, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; 
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_37 = lean_st_ref_get(x_17, x_22);
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_38, 3);
+lean_inc(x_39);
+lean_dec(x_38);
+x_40 = lean_ctor_get_uint8(x_39, sizeof(void*)*1);
+lean_dec(x_39);
+if (x_40 == 0)
+{
+lean_object* x_41; uint8_t x_42; 
+x_41 = lean_ctor_get(x_37, 1);
+lean_inc(x_41);
+lean_dec(x_37);
+x_42 = 0;
+x_23 = x_42;
+x_24 = x_41;
+goto block_36;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; 
+x_43 = lean_ctor_get(x_37, 1);
+lean_inc(x_43);
+lean_dec(x_37);
+lean_inc(x_9);
+x_44 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_14, x_15, x_16, x_17, x_43);
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = lean_unbox(x_45);
+lean_dec(x_45);
+x_23 = x_47;
+x_24 = x_46;
+goto block_36;
+}
+block_36:
+{
+if (x_23 == 0)
+{
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_box(0);
+x_26 = l_Lean_Meta_Match_mkMatcher___lambda__16(x_21, x_2, x_12, x_3, x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_25, x_14, x_15, x_16, x_17, x_24);
+return x_26;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_inc(x_21);
+x_27 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_27, 0, x_21);
+x_28 = l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2;
+x_29 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_27);
+x_30 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_31 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_31, 0, x_29);
+lean_ctor_set(x_31, 1, x_30);
+lean_inc(x_9);
+x_32 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_31, x_14, x_15, x_16, x_17, x_24);
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_32, 1);
+lean_inc(x_34);
+lean_dec(x_32);
+x_35 = l_Lean_Meta_Match_mkMatcher___lambda__16(x_21, x_2, x_12, x_3, x_1, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_33, x_14, x_15, x_16, x_17, x_34);
+lean_dec(x_33);
+return x_35;
+}
+}
+}
+else
+{
+uint8_t x_48; 
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_48 = !lean_is_exclusive(x_20);
+if (x_48 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_20, 0);
+x_50 = lean_ctor_get(x_20, 1);
+lean_inc(x_50);
+lean_inc(x_49);
+lean_dec(x_20);
+x_51 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_51, 0, x_49);
+lean_ctor_set(x_51, 1, x_50);
+return x_51;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__18___boxed__const__1() {
+_start:
+{
+size_t x_1; lean_object* x_2; 
+x_1 = 0;
+x_2 = lean_box_usize(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__18(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17) {
+_start:
+{
+lean_object* x_18; lean_object* x_46; uint8_t x_47; 
+x_46 = lean_unsigned_to_nat(0u);
+x_47 = lean_nat_dec_lt(x_46, x_8);
+if (x_47 == 0)
+{
+lean_object* x_48; 
+lean_dec(x_11);
+lean_dec(x_10);
+x_48 = lean_box(0);
+x_18 = x_48;
+goto block_45;
+}
+else
+{
+uint8_t x_49; 
+x_49 = lean_nat_dec_le(x_8, x_8);
+if (x_49 == 0)
+{
+lean_object* x_50; 
+lean_dec(x_11);
+lean_dec(x_10);
+x_50 = lean_box(0);
+x_18 = x_50;
+goto block_45;
+}
+else
+{
+size_t x_51; size_t x_52; uint8_t x_53; 
+x_51 = 0;
+x_52 = lean_usize_of_nat(x_8);
+x_53 = l_Array_anyMUnsafe_any___at___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___spec__1(x_9, x_51, x_52);
+if (x_53 == 0)
+{
+lean_object* x_54; 
+lean_dec(x_11);
+lean_dec(x_10);
+x_54 = lean_box(0);
+x_18 = x_54;
+goto block_45;
+}
+else
+{
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = l_Lean_Meta_Match_mkMatcher___lambda__18___boxed__const__1;
+x_56 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__17___boxed), 18, 11);
+lean_closure_set(x_56, 0, x_12);
+lean_closure_set(x_56, 1, x_1);
+lean_closure_set(x_56, 2, x_9);
+lean_closure_set(x_56, 3, x_55);
+lean_closure_set(x_56, 4, x_2);
+lean_closure_set(x_56, 5, x_3);
+lean_closure_set(x_56, 6, x_4);
+lean_closure_set(x_56, 7, x_5);
+lean_closure_set(x_56, 8, x_6);
+lean_closure_set(x_56, 9, x_7);
+lean_closure_set(x_56, 10, x_8);
+x_57 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Meta_reduceMatcher_x3f___spec__3___rarg(x_10, x_11, x_56, x_13, x_14, x_15, x_16, x_17);
+return x_57;
+}
+}
+}
+block_45:
+{
+lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; 
+lean_dec(x_18);
+lean_inc(x_1);
+lean_inc(x_12);
+x_19 = l_Lean_mkAppN(x_12, x_1);
+x_34 = lean_st_ref_get(x_16, x_17);
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_35, 3);
+lean_inc(x_36);
+lean_dec(x_35);
+x_37 = lean_ctor_get_uint8(x_36, sizeof(void*)*1);
+lean_dec(x_36);
+if (x_37 == 0)
+{
+lean_object* x_38; uint8_t x_39; 
+x_38 = lean_ctor_get(x_34, 1);
+lean_inc(x_38);
+lean_dec(x_34);
+x_39 = 0;
+x_20 = x_39;
+x_21 = x_38;
+goto block_33;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+x_40 = lean_ctor_get(x_34, 1);
+lean_inc(x_40);
+lean_dec(x_34);
+lean_inc(x_6);
+x_41 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_6, x_13, x_14, x_15, x_16, x_40);
+x_42 = lean_ctor_get(x_41, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = lean_unbox(x_42);
+lean_dec(x_42);
+x_20 = x_44;
+x_21 = x_43;
+goto block_33;
+}
+block_33:
+{
+if (x_20 == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_box(0);
+x_23 = l_Lean_Meta_Match_mkMatcher___lambda__7(x_19, x_1, x_12, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_22, x_13, x_14, x_15, x_16, x_21);
+return x_23;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+lean_inc(x_19);
+x_24 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_24, 0, x_19);
+x_25 = l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2;
+x_26 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_24);
+x_27 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_28 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_28, 0, x_26);
+lean_ctor_set(x_28, 1, x_27);
+lean_inc(x_6);
+x_29 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_6, x_28, x_13, x_14, x_15, x_16, x_21);
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_29, 1);
+lean_inc(x_31);
+lean_dec(x_29);
+x_32 = l_Lean_Meta_Match_mkMatcher___lambda__7(x_19, x_1, x_12, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_30, x_13, x_14, x_15, x_16, x_31);
+lean_dec(x_30);
+return x_32;
+}
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__19___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("motive");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__19___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Meta_Match_mkMatcher___lambda__19___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__19(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18) {
+_start:
+{
+lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; 
+x_19 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__18___boxed), 17, 11);
+lean_closure_set(x_19, 0, x_1);
+lean_closure_set(x_19, 1, x_2);
+lean_closure_set(x_19, 2, x_3);
+lean_closure_set(x_19, 3, x_4);
+lean_closure_set(x_19, 4, x_5);
+lean_closure_set(x_19, 5, x_6);
+lean_closure_set(x_19, 6, x_7);
+lean_closure_set(x_19, 7, x_8);
+lean_closure_set(x_19, 8, x_9);
+lean_closure_set(x_19, 9, x_10);
+lean_closure_set(x_19, 10, x_11);
+x_20 = l_Lean_Meta_Match_mkMatcher___lambda__19___closed__2;
+x_21 = 0;
+x_22 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_20, x_21, x_12, x_19, x_14, x_15, x_16, x_17, x_18);
+return x_22;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__20___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("motiveType: ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_mkMatcher___lambda__20___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_mkMatcher___lambda__20___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__20(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+_start:
+{
+lean_object* x_16; uint8_t x_17; uint8_t x_18; uint8_t x_19; lean_object* x_20; 
+lean_inc(x_10);
+x_16 = l_Lean_mkSort(x_10);
+x_17 = 0;
+x_18 = 1;
+x_19 = 1;
+lean_inc(x_1);
+x_20 = l_Lean_Meta_mkForallFVars(x_1, x_16, x_17, x_18, x_19, x_11, x_12, x_13, x_14, x_15);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__8;
+x_38 = lean_st_ref_get(x_14, x_22);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_39, 3);
+lean_inc(x_40);
+lean_dec(x_39);
+x_41 = lean_ctor_get_uint8(x_40, sizeof(void*)*1);
+lean_dec(x_40);
+if (x_41 == 0)
+{
+lean_object* x_42; 
+x_42 = lean_ctor_get(x_38, 1);
+lean_inc(x_42);
+lean_dec(x_38);
+x_24 = x_17;
+x_25 = x_42;
+goto block_37;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; 
+x_43 = lean_ctor_get(x_38, 1);
+lean_inc(x_43);
+lean_dec(x_38);
+x_44 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_23, x_11, x_12, x_13, x_14, x_43);
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = lean_unbox(x_45);
+lean_dec(x_45);
+x_24 = x_47;
+x_25 = x_46;
+goto block_37;
+}
+block_37:
+{
+if (x_24 == 0)
+{
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_box(0);
+x_27 = l_Lean_Meta_Match_mkMatcher___lambda__19(x_1, x_2, x_10, x_3, x_4, x_23, x_5, x_6, x_7, x_8, x_9, x_21, x_26, x_11, x_12, x_13, x_14, x_25);
+return x_27;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_inc(x_21);
+x_28 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_28, 0, x_21);
+x_29 = l_Lean_Meta_Match_mkMatcher___lambda__20___closed__2;
+x_30 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_28);
+x_31 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14;
+x_32 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+x_33 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_23, x_32, x_11, x_12, x_13, x_14, x_25);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
+lean_dec(x_33);
+x_36 = l_Lean_Meta_Match_mkMatcher___lambda__19(x_1, x_2, x_10, x_3, x_4, x_23, x_5, x_6, x_7, x_8, x_9, x_21, x_34, x_11, x_12, x_13, x_14, x_35);
+lean_dec(x_34);
+return x_36;
+}
+}
+}
+else
+{
+uint8_t x_48; 
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_48 = !lean_is_exclusive(x_20);
+if (x_48 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_20, 0);
+x_50 = lean_ctor_get(x_20, 1);
+lean_inc(x_50);
+lean_inc(x_49);
+lean_dec(x_20);
+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_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__21(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+_start:
+{
+lean_object* x_15; 
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+x_15 = l_Lean_Meta_getLevel(x_9, x_10, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = l_Lean_levelZero;
+x_19 = lean_level_eq(x_16, x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = l_Lean_Meta_mkFreshLevelMVar(x_10, x_11, x_12, x_13, x_17);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = l_Lean_Meta_Match_mkMatcher___lambda__20(x_8, x_1, x_16, x_2, x_3, x_4, x_5, x_6, x_7, x_21, x_10, x_11, x_12, x_13, x_22);
+return x_23;
+}
+else
+{
+lean_object* x_24; 
+x_24 = l_Lean_Meta_Match_mkMatcher___lambda__20(x_8, x_1, x_16, x_2, x_3, x_4, x_5, x_6, x_7, x_18, x_10, x_11, x_12, x_13, x_17);
+return x_24;
+}
+}
+else
+{
+uint8_t x_25; 
+lean_dec(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_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_25 = !lean_is_exclusive(x_15);
+if (x_25 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_15, 0);
+x_27 = lean_ctor_get(x_15, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_15);
+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;
+}
 }
 }
 }
@@ -26218,16 +28669,64 @@ lean_inc(x_9);
 x_10 = lean_ctor_get(x_1, 3);
 lean_inc(x_10);
 lean_dec(x_1);
-lean_inc(x_9);
-x_11 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_11, 0, x_9);
-x_12 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__10), 10, 3);
-lean_closure_set(x_12, 0, x_10);
-lean_closure_set(x_12, 1, x_7);
-lean_closure_set(x_12, 2, x_9);
-x_13 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Meta_reduceMatcher_x3f___spec__3___rarg(x_8, x_11, x_12, x_2, x_3, x_4, x_5, x_6);
+x_11 = lean_array_get_size(x_9);
+x_12 = l_Lean_Meta_Match_getNumEqsFromDiscrInfos(x_9);
+x_13 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns(x_11, x_10, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_13) == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_13, 1);
+lean_inc(x_14);
+lean_dec(x_13);
+lean_inc(x_11);
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_11);
+lean_inc(x_15);
+lean_inc(x_8);
+x_16 = lean_alloc_closure((void*)(l_Lean_Meta_Match_mkMatcher___lambda__21), 14, 7);
+lean_closure_set(x_16, 0, x_7);
+lean_closure_set(x_16, 1, x_10);
+lean_closure_set(x_16, 2, x_12);
+lean_closure_set(x_16, 3, x_11);
+lean_closure_set(x_16, 4, x_9);
+lean_closure_set(x_16, 5, x_8);
+lean_closure_set(x_16, 6, x_15);
+x_17 = l_Lean_Meta_forallBoundedTelescope___at_Lean_Meta_reduceMatcher_x3f___spec__3___rarg(x_8, x_15, x_16, x_2, x_3, x_4, x_5, x_14);
+return x_17;
+}
+else
+{
+uint8_t x_18; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+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;
+}
+}
+}
 }
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
@@ -26262,7 +28761,20 @@ lean_dec(x_1);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+size_t x_5; size_t x_6; lean_object* x_7; 
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_7 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(x_1, x_5, x_6, x_4);
+lean_dec(x_1);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 size_t x_4; size_t x_5; lean_object* x_6; 
@@ -26270,10 +28782,55 @@ x_4 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
-x_6 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__5(x_4, x_5, x_3);
+x_6 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__7(x_4, x_5, x_3);
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_mkMatcher___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* 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_2);
+lean_dec(x_2);
+x_11 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_12 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_mkMatcher___spec__12(x_1, x_10, x_11, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_1);
+return x_12;
+}
+}
+LEAN_EXPORT lean_object* l_Array_filterMapM___at_Lean_Meta_Match_mkMatcher___spec__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Array_filterMapM___at_Lean_Meta_Match_mkMatcher___spec__11(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_1);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__13___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_Nat_foldAux___at_Lean_Meta_Match_mkMatcher___spec__13(x_1, x_2, x_3, x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__14___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+size_t x_5; size_t x_6; lean_object* x_7; 
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_7 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_mkMatcher___spec__14(x_1, x_5, x_6, x_4);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___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) {
 _start:
 {
@@ -26320,16 +28877,18 @@ lean_object* x_15 = _args[14];
 lean_object* x_16 = _args[15];
 lean_object* x_17 = _args[16];
 lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
 _start:
 {
-size_t x_19; size_t x_20; lean_object* x_21; 
-x_19 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_20 = lean_unbox_usize(x_10);
+size_t x_21; size_t x_22; lean_object* x_23; 
+x_21 = lean_unbox_usize(x_10);
 lean_dec(x_10);
-x_21 = l_Lean_Meta_Match_mkMatcher___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_19, x_20, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-lean_dec(x_13);
-return x_21;
+x_22 = lean_unbox_usize(x_11);
+lean_dec(x_11);
+x_23 = l_Lean_Meta_Match_mkMatcher___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_21, x_22, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+lean_dec(x_15);
+return x_23;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__4___boxed(lean_object** _args) {
@@ -26352,24 +28911,430 @@ lean_object* x_16 = _args[15];
 lean_object* x_17 = _args[16];
 lean_object* x_18 = _args[17];
 lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
 _start:
 {
-size_t x_20; size_t x_21; lean_object* x_22; 
-x_20 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_21 = lean_unbox_usize(x_11);
+size_t x_22; size_t x_23; lean_object* x_24; 
+x_22 = lean_unbox_usize(x_11);
 lean_dec(x_11);
-x_22 = l_Lean_Meta_Match_mkMatcher___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_20, x_21, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+x_23 = lean_unbox_usize(x_12);
+lean_dec(x_12);
+x_24 = l_Lean_Meta_Match_mkMatcher___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_22, x_23, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
+return x_24;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__5___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+_start:
+{
+size_t x_22; size_t x_23; lean_object* x_24; 
+x_22 = lean_unbox_usize(x_11);
+lean_dec(x_11);
+x_23 = lean_unbox_usize(x_12);
+lean_dec(x_12);
+x_24 = l_Lean_Meta_Match_mkMatcher___lambda__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_22, x_23, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
+return x_24;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+_start:
+{
+lean_object* x_19; 
+x_19 = l_Lean_Meta_Match_mkMatcher___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+return x_19;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__7___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+_start:
+{
+lean_object* x_18; 
+x_18 = l_Lean_Meta_Match_mkMatcher___lambda__7(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
+lean_dec(x_12);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_Meta_Match_mkMatcher___lambda__8(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);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__9___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; 
+x_12 = l_Lean_Meta_Match_mkMatcher___lambda__9(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_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_12;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__10___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+_start:
+{
+size_t x_21; size_t x_22; lean_object* x_23; 
+x_21 = lean_unbox_usize(x_10);
+lean_dec(x_10);
+x_22 = lean_unbox_usize(x_11);
+lean_dec(x_11);
+x_23 = l_Lean_Meta_Match_mkMatcher___lambda__10(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_21, x_22, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+lean_dec(x_15);
+return x_23;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__11___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+_start:
+{
+size_t x_22; size_t x_23; lean_object* x_24; 
+x_22 = lean_unbox_usize(x_11);
+lean_dec(x_11);
+x_23 = lean_unbox_usize(x_12);
+lean_dec(x_12);
+x_24 = l_Lean_Meta_Match_mkMatcher___lambda__11(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_22, x_23, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
+return x_24;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__12___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+_start:
+{
+size_t x_22; size_t x_23; lean_object* x_24; 
+x_22 = lean_unbox_usize(x_11);
+lean_dec(x_11);
+x_23 = lean_unbox_usize(x_12);
+lean_dec(x_12);
+x_24 = l_Lean_Meta_Match_mkMatcher___lambda__12(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_22, x_23, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
+return x_24;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__13___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+_start:
+{
+size_t x_22; lean_object* x_23; 
+x_22 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_23 = l_Lean_Meta_Match_mkMatcher___lambda__13(x_1, x_2, x_3, x_4, x_5, x_22, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
+return x_23;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__14___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+_start:
+{
+size_t x_22; lean_object* x_23; 
+x_22 = lean_unbox_usize(x_8);
+lean_dec(x_8);
+x_23 = l_Lean_Meta_Match_mkMatcher___lambda__14(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_22, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
+return x_23;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__15___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+_start:
+{
+size_t x_21; lean_object* x_22; 
+x_21 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_22 = l_Lean_Meta_Match_mkMatcher___lambda__15(x_1, x_2, x_3, x_4, x_5, x_21, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
 return x_22;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__16___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
 _start:
 {
-lean_object* x_16; 
-x_16 = l_Lean_Meta_Match_mkMatcher___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
-lean_dec(x_10);
-return x_16;
+size_t x_20; lean_object* x_21; 
+x_20 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_21 = l_Lean_Meta_Match_mkMatcher___lambda__16(x_1, x_2, x_3, x_4, x_5, x_20, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+lean_dec(x_14);
+return x_21;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__17___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+_start:
+{
+size_t x_19; lean_object* x_20; 
+x_19 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_20 = l_Lean_Meta_Match_mkMatcher___lambda__17(x_1, x_2, x_3, x_19, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+return x_20;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__18___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+_start:
+{
+lean_object* x_18; 
+x_18 = l_Lean_Meta_Match_mkMatcher___lambda__18(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkMatcher___lambda__19___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+_start:
+{
+lean_object* x_19; 
+x_19 = l_Lean_Meta_Match_mkMatcher___lambda__19(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+lean_dec(x_13);
+return x_19;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
@@ -26616,7 +29581,7 @@ if (x_10 == 0)
 lean_object* x_20; 
 lean_dec(x_8);
 lean_dec(x_1);
-x_20 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_20 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 x_11 = x_20;
 x_12 = x_7;
 goto block_19;
@@ -26630,7 +29595,7 @@ if (x_21 == 0)
 lean_object* x_22; 
 lean_dec(x_8);
 lean_dec(x_1);
-x_22 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_22 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 x_11 = x_22;
 x_12 = x_7;
 goto block_19;
@@ -26641,7 +29606,7 @@ size_t x_23; size_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_2
 x_23 = 0;
 x_24 = lean_usize_of_nat(x_8);
 lean_dec(x_8);
-x_25 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1;
+x_25 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1;
 lean_inc(x_2);
 x_26 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__4(x_2, x_1, x_23, x_24, x_25, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_1);
@@ -26844,90 +29809,94 @@ uint8_t x_19;
 x_19 = !lean_is_exclusive(x_18);
 if (x_19 == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
 x_20 = lean_ctor_get(x_18, 0);
 x_21 = lean_array_to_list(lean_box(0), x_20);
 x_22 = lean_array_get_size(x_1);
-x_23 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_23, 0, x_4);
-lean_ctor_set(x_23, 1, x_5);
-lean_ctor_set(x_23, 2, x_22);
-lean_ctor_set(x_23, 3, x_21);
-lean_ctor_set(x_18, 0, x_23);
+x_23 = lean_box(0);
+x_24 = lean_mk_array(x_22, x_23);
+x_25 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_25, 0, x_4);
+lean_ctor_set(x_25, 1, x_5);
+lean_ctor_set(x_25, 2, x_24);
+lean_ctor_set(x_25, 3, x_21);
+lean_ctor_set(x_18, 0, x_25);
 return x_18;
 }
 else
 {
-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_24 = lean_ctor_get(x_18, 0);
-x_25 = lean_ctor_get(x_18, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_26 = lean_ctor_get(x_18, 0);
+x_27 = lean_ctor_get(x_18, 1);
+lean_inc(x_27);
+lean_inc(x_26);
 lean_dec(x_18);
-x_26 = lean_array_to_list(lean_box(0), x_24);
-x_27 = lean_array_get_size(x_1);
-x_28 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_28, 0, x_4);
-lean_ctor_set(x_28, 1, x_5);
-lean_ctor_set(x_28, 2, x_27);
-lean_ctor_set(x_28, 3, x_26);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_25);
-return x_29;
-}
-}
-else
-{
-uint8_t x_30; 
-lean_dec(x_5);
-lean_dec(x_4);
-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);
+x_28 = lean_array_to_list(lean_box(0), x_26);
+x_29 = lean_array_get_size(x_1);
+x_30 = lean_box(0);
+x_31 = lean_mk_array(x_29, x_30);
+x_32 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_32, 0, x_4);
+lean_ctor_set(x_32, 1, x_5);
+lean_ctor_set(x_32, 2, x_31);
+lean_ctor_set(x_32, 3, x_28);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_33, 1, x_27);
 return x_33;
 }
 }
-}
 else
 {
 uint8_t x_34; 
+lean_dec(x_5);
+lean_dec(x_4);
+x_34 = !lean_is_exclusive(x_18);
+if (x_34 == 0)
+{
+return x_18;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_18, 0);
+x_36 = lean_ctor_get(x_18, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_18);
+x_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
+{
+uint8_t x_38; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_34 = !lean_is_exclusive(x_12);
-if (x_34 == 0)
+x_38 = !lean_is_exclusive(x_12);
+if (x_38 == 0)
 {
 return x_12;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_35 = lean_ctor_get(x_12, 0);
-x_36 = lean_ctor_get(x_12, 1);
-lean_inc(x_36);
-lean_inc(x_35);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_12, 0);
+x_40 = lean_ctor_get(x_12, 1);
+lean_inc(x_40);
+lean_inc(x_39);
 lean_dec(x_12);
-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;
+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;
 }
 }
 }
@@ -29630,7 +32599,7 @@ lean_dec(x_9);
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Match_Match___hyg_12131_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Match_Match___hyg_13034_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -29758,6 +32727,8 @@ l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__1);
 l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__2 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_checkNumPatterns___closed__2);
+l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withEqs___rarg___closed__1);
 l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___boxed__const__1 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_mkMinorType___boxed__const__1);
 l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__1 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___lambda__1___closed__1();
@@ -29798,8 +32769,6 @@ l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___clos
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__13);
 l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14();
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts_loop___rarg___closed__14);
-l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1();
-lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_withAlts___rarg___closed__1);
 l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__1 = _init_l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__1);
 l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__2 = _init_l_Lean_Meta_Match_assignGoalOf___lambda__2___closed__2();
@@ -30080,42 +33049,42 @@ l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__1
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__1);
 l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__2 = _init_l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_getUElimPos_x3f___closed__2);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__1);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__2 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__2);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__3 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__3();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__3);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__4 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__4();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__4);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__5 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__5();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__5);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__6 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__6();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428____closed__6);
-if (builtin) {res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9428_(lean_io_mk_world());
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__1);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__2 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__2);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__3 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__3();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__3);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__4 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__4();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__4);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__5 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__5();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__5);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__6 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__6();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593____closed__6);
+if (builtin) {res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9593_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Meta_Match_bootstrap_genMatcherCode = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Meta_Match_bootstrap_genMatcherCode);
 lean_dec_ref(res);
-}l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__1 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__1);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__2 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__2);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__3 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__3();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__3);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__4 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__4();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__4);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__5 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__5();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__5);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__6 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__6();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__6);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__7);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__8 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__8();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__8);
-l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__9 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__9();
-lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454____closed__9);
-if (builtin) {res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9454_(lean_io_mk_world());
+}l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__1 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__1);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__2 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__2);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__3 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__3();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__3);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__4 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__4();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__4);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__5 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__5();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__5);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__6 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__6();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__6);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__7);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__8 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__8();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__8);
+l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__9 = _init_l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__9();
+lean_mark_persistent(l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619____closed__9);
+if (builtin) {res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_Match___hyg_9619_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Meta_Match_matcherExt = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Meta_Match_matcherExt);
@@ -30168,26 +33137,40 @@ l_Lean_Meta_Match_mkMatcher___lambda__5___closed__1 = _init_l_Lean_Meta_Match_mk
 lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__5___closed__1);
 l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2();
 lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__5___closed__2);
-l_Lean_Meta_Match_mkMatcher___lambda__5___closed__3 = _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__3();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__5___closed__3);
-l_Lean_Meta_Match_mkMatcher___lambda__5___closed__4 = _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__4();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__5___closed__4);
-l_Lean_Meta_Match_mkMatcher___lambda__5___closed__5 = _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__5();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__5___closed__5);
-l_Lean_Meta_Match_mkMatcher___lambda__5___closed__6 = _init_l_Lean_Meta_Match_mkMatcher___lambda__5___closed__6();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__5___closed__6);
-l_Lean_Meta_Match_mkMatcher___lambda__7___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__7___closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__7___closed__1);
-l_Lean_Meta_Match_mkMatcher___lambda__7___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__7___closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__7___closed__2);
-l_Lean_Meta_Match_mkMatcher___lambda__8___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__8___closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__8___closed__1);
-l_Lean_Meta_Match_mkMatcher___lambda__8___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__8___closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__8___closed__2);
-l_Lean_Meta_Match_mkMatcher___lambda__9___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__9___closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__9___closed__1);
-l_Lean_Meta_Match_mkMatcher___lambda__9___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__9___closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__9___closed__2);
+l_Lean_Meta_Match_mkMatcher___lambda__6___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__6___closed__1);
+l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__6___closed__2);
+l_Lean_Meta_Match_mkMatcher___lambda__6___closed__3 = _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__3();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__6___closed__3);
+l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4 = _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__6___closed__4);
+l_Lean_Meta_Match_mkMatcher___lambda__6___closed__5 = _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__5();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__6___closed__5);
+l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6 = _init_l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__6___closed__6);
+l_Lean_Meta_Match_mkMatcher___lambda__14___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__14___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__14___closed__1);
+l_Lean_Meta_Match_mkMatcher___lambda__14___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__14___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__14___closed__2);
+l_Lean_Meta_Match_mkMatcher___lambda__15___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__15___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__15___closed__1);
+l_Lean_Meta_Match_mkMatcher___lambda__15___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__15___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__15___closed__2);
+l_Lean_Meta_Match_mkMatcher___lambda__17___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__17___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__17___closed__1);
+l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__17___closed__2);
+l_Lean_Meta_Match_mkMatcher___lambda__18___boxed__const__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__18___boxed__const__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__18___boxed__const__1);
+l_Lean_Meta_Match_mkMatcher___lambda__19___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__19___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__19___closed__1);
+l_Lean_Meta_Match_mkMatcher___lambda__19___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__19___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__19___closed__2);
+l_Lean_Meta_Match_mkMatcher___lambda__20___closed__1 = _init_l_Lean_Meta_Match_mkMatcher___lambda__20___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__20___closed__1);
+l_Lean_Meta_Match_mkMatcher___lambda__20___closed__2 = _init_l_Lean_Meta_Match_mkMatcher___lambda__20___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_mkMatcher___lambda__20___closed__2);
 l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___lambda__1___closed__1 = _init_l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___lambda__1___closed__1();
 lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___lambda__1___closed__1);
 l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___closed__1 = _init_l_Array_mapMUnsafe_map___at_Lean_Meta_Match_getMkMatcherInputInContext___spec__5___closed__1();
@@ -30234,7 +33217,7 @@ l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__3 = _init_l_Lean_Meta_Matche
 lean_mark_persistent(l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__3);
 l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__4 = _init_l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__4();
 lean_mark_persistent(l_Lean_Meta_MatcherApp_addArg___lambda__4___closed__4);
-res = l_Lean_Meta_initFn____x40_Lean_Meta_Match_Match___hyg_12131_(lean_io_mk_world());
+res = l_Lean_Meta_initFn____x40_Lean_Meta_Match_Match___hyg_13034_(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/Match/MatchEqs.c b/stage0/stdlib/Lean/Meta/Match/MatchEqs.c
index 749b468326..7cafdf0534 100644
--- a/stage0/stdlib/Lean/Meta/Match/MatchEqs.c
+++ b/stage0/stdlib/Lean/Meta/Match/MatchEqs.c
@@ -16,10 +16,13 @@ extern "C" {
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_reverse___rarg(lean_object*);
 static lean_object* l_Lean_Meta_Match_proveCondEqThm___closed__6;
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___boxed(lean_object**);
+static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_set(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__7;
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___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*, lean_object*, lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts_go___rarg___closed__2;
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -27,19 +30,18 @@ lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isNatLit(lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__12;
 lean_object* l_Lean_stringToMessageData(lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof(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_addDecl___at_Lean_Meta_mkAuxLemma___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__10;
 lean_object* l_Lean_mkSort(lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(lean_object*, lean_object*, 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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_unfoldNamedPattern___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts_go___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___lambda__2___closed__1;
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_proveCondEqThm_go___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -48,7 +50,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitForall___at___private_
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitForall___at_Lean_Meta_Match_unfoldNamedPattern___spec__5___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_EXPORT lean_object* l_Lean_Meta_Match_unfoldNamedPattern___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__3;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__5(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_name_mk_string(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -65,6 +66,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Matc
 lean_object* l_Lean_Meta_trySubst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMap___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_applySubst___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___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*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -76,14 +78,14 @@ lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_SimpH_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___closed__5;
 lean_object* l_Lean_Meta_heqToEq(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLet___at_Lean_Meta_Match_unfoldNamedPattern___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___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*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___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*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_proveCondEqThm___closed__5;
+static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2;
 lean_object* l_Lean_Meta_saveState___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_withLocalDeclImp___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
@@ -91,7 +93,6 @@ size_t lean_usize_sub(size_t, size_t);
 lean_object* lean_environment_find(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_proveCondEqThm___closed__3;
 lean_object* l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__13;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__3;
@@ -107,17 +108,20 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__5;
 lean_object* l_Lean_Meta_Match_registerMatchEqns(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof___boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
+extern lean_object* l_instInhabitedNat;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__1;
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___closed__4;
 lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAnyCandidate_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__11;
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4___closed__6;
@@ -129,26 +133,27 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match
 lean_object* l_Lean_MessageData_ofList(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__5;
 lean_object* l___private_Lean_MetavarContext_0__Lean_reprMetavarKind____x40_Lean_MetavarContext___hyg_99_(uint8_t, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__6;
+static lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at_Lean_Meta_Match_unfoldNamedPattern___spec__11(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_unfoldDefinition_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_unfoldNamedPattern___spec__10(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_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__13___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___closed__1;
 size_t lean_usize_shift_right(size_t, size_t);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__1;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope(lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_forallMetaBoundedTelescope(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(size_t, size_t, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof___lambda__1(lean_object*, lean_object*);
-static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_replaceFVars(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_lt(size_t, size_t);
 static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__3;
@@ -158,18 +163,18 @@ LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS___lambda__1___boxed(lean_ob
 static lean_object* l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___closed__1;
 static lean_object* l_Lean_Meta_casesOnStuckLHS___lambda__1___closed__1;
 static lean_object* l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
-static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2;
 extern lean_object* l_Lean_levelZero;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__8;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___closed__10;
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__12___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2___closed__2;
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__4;
 lean_object* l_Lean_Meta_mkEqRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__1;
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_ins___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__2(lean_object*, lean_object*, lean_object*);
@@ -179,35 +184,39 @@ uint8_t l_Array_contains___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getM
 size_t lean_uint64_to_usize(uint64_t);
 LEAN_EXPORT uint8_t l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Match_proveCondEqThm___lambda__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_FindImpl_findUnsafe_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__17___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_unfoldNamedPattern(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___closed__1;
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__6;
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__19___boxed(lean_object*, lean_object*);
 lean_object* l_StateRefT_x27_lift___rarg___boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__9;
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__3(size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_levelParams(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapTRAux___at_Lean_MessageData_instCoeListExprMessageData___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitForall___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__10___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_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_setBlack___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_proveCondEqThm_go___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_RecursorVal_getMajorIdx(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___closed__2;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___lambda__1___closed__4;
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__16(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_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___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* l_Lean_Meta_substCore(lean_object*, lean_object*, uint8_t, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2(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*);
 static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__1;
 static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__2;
 static lean_object* l_Lean_Meta_casesOnStuckLHS___closed__2;
@@ -216,18 +225,16 @@ LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNa
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLambda___at_Lean_Meta_Match_unfoldNamedPattern___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMVarType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNamedPattern___spec__8(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__2;
 lean_object* l_panic___at___private_Lean_Meta_WHNF_0__Lean_Meta_cache___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_applyRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_forallMetaTelescopeReducingAux(lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forIn___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_contradiction(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___closed__6;
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__2;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_proveCondEqThm___closed__1;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_Match_getEquationsForImpl___spec__1(lean_object*, lean_object*);
@@ -235,15 +242,14 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___spec__1(size_t, size_t, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__2;
 static lean_object* l_Lean_Meta_casesOnStuckLHS___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___lambda__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_SimpH_trySubstVarsAndContradiction___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_replaceFVar(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_headBeta(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLambda___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__9___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_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___closed__2;
 lean_object* l_Lean_Meta_FVarSubst_apply(lean_object*, lean_object*);
 lean_object* l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -251,15 +257,17 @@ lean_object* l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mk
 LEAN_EXPORT lean_object* l_Lean_Meta_withIncRecDepth___at_Lean_Meta_Match_unfoldNamedPattern___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withIncRecDepth___at_Lean_Meta_Match_unfoldNamedPattern___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1___closed__2;
 lean_object* l_Lean_Meta_mkLambdaFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___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*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__9;
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_ST_Prim_Ref_get___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__14;
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitPost___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__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*);
+static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__2;
 lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit___at_Lean_Meta_Match_unfoldNamedPattern___spec__2___lambda__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_instInhabited___rarg(lean_object*, lean_object*);
@@ -268,44 +276,42 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNamedPattern___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_EXPORT lean_object* l_ReaderT_bind___at_Lean_Meta_Match_unfoldNamedPattern___spec__12(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forIn___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof___lambda__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__5(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* l_Lean_ConstantInfo_name(lean_object*);
 uint8_t l_Lean_Name_quickCmp(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___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*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__5;
 lean_object* l_Lean_Meta_Match_isNamedPattern_x3f(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__12___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__19___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__1;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___closed__7;
 uint64_t l_Lean_Name_hash(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___spec__1___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__2;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___closed__3;
 static lean_object* l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1___closed__1;
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__7;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__2;
+static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4;
+uint8_t l_Lean_LocalDecl_binderInfo(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___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*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_proveCondEqThm___closed__2;
 static lean_object* l_panic___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___spec__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS_findFVar_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNamedPattern___spec__7___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAnyCandidate_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__4;
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 static lean_object* l_panic___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___spec__1___closed__2;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts_go___rarg___closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts(lean_object*);
 size_t lean_usize_shift_left(size_t, size_t);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___closed__1;
 lean_object* l_Lean_Meta_intros(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts_go___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -314,39 +320,42 @@ LEAN_EXPORT lean_object* l_Std_RBNode_find___at___private_Lean_Meta_Match_MatchE
 uint8_t l_List_elem___at_Lean_Meta_getNondepPropHyps_removeDeps___spec__2(lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_Match_instInhabitedMatchEqnsExtState;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__1;
 extern lean_object* l_Lean_instInhabitedExpr;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__4(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___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* l_Lean_Meta_contradiction(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitPost___at_Lean_Meta_Match_unfoldNamedPattern___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___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_reverse___rarg(lean_object*);
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__9;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_unfoldNamedPattern___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*);
 uint8_t l_Lean_Expr_isConst(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__4___closed__3;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__1___closed__1;
 uint8_t l_Lean_Expr_isConstOf(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_introNCore(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_applySubst(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___closed__5;
 lean_object* l_Std_HashMap_insert___at_Lean_MetavarContext_instantiateExprMVars___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_contradictionCore(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__3;
 static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__1;
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1;
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__7;
 extern lean_object* l_Lean_Meta_instMonadMetaM;
+static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___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_whnf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__5;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__1;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__1___boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__4;
 lean_object* l_Lean_mkFVar(lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 extern lean_object* l_Lean_Meta_Match_matchEqnsExt;
-static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__1;
 lean_object* l_Lean_Meta_SavedState_restore(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_Match_getEquationsForImpl___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___closed__2;
@@ -368,25 +377,26 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Util_Trace_0__Lean_addTraceOptions(lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_withMVarContextImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__19___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withMVarContext___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___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*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__1;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__3;
 lean_object* l_Lean_Meta_matchEq_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNamedPattern___spec__7___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__12___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescope___at___private_Lean_Meta_InferType_0__Lean_Meta_inferForallType___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___boxed(lean_object**);
 lean_object* l_Lean_LocalDecl_type(lean_object*);
-static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__2;
+lean_object* l_Lean_Meta_Match_getNumEqsFromDiscrInfos(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__14___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__9;
 lean_object* l_Lean_Meta_substVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___boxed(lean_object**);
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__13;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_SimpH_State_eqsNew___default;
@@ -407,17 +417,21 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match
 static lean_object* l_Lean_Meta_Match_proveCondEqThm___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___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*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___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_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, 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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_expr_eqv(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withIncRecDepth___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__18(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__3;
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_8122_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_8723_(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___lambda__1___closed__3;
 lean_object* l_Lean_Meta_tryClearMany(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___closed__6;
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__14;
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___lambda__2___closed__1;
+lean_object* l_Subarray_get_x21___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts_go___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forIn___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -426,19 +440,24 @@ lean_object* l_Lean_mkPrivateName(lean_object*, lean_object*);
 uint8_t l_Std_RBNode_isRed___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_unfoldNamedPattern___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___boxed(lean_object**);
 lean_object* l_Lean_Name_append(lean_object*, lean_object*);
 lean_object* l_Lean_getProjectionFnInfo_x3f___at_Lean_Meta_unfoldProjInst_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLambda___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__9(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_Meta_Basic_0__Lean_Meta_instantiateForallAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___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_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_Match_getEquationsForImpl___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go(lean_object*);
 lean_object* l_List_erase___at_Lean_Meta_getNondepPropHyps_removeDeps___spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___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*);
 static lean_object* l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_transform___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__6___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_proveCondEqThm_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*);
+static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__2;
 static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__8;
 lean_object* l_Lean_commitWhen___at___private_Lean_Meta_Tactic_Contradiction_0__Lean_Meta_elimEmptyInductive___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_simpIfTarget(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAnyCandidate_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -446,7 +465,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match
 lean_object* l_Lean_commitWhenSome_x3f___at_Lean_Meta_splitIfTarget_x3f___spec__1___at_Lean_Meta_splitIfTarget_x3f___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__4;
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__11;
 lean_object* l_Lean_Meta_isExprMVarAssigned(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_ofSubarray___rarg(lean_object*);
@@ -468,6 +487,7 @@ LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at___private_Lean_Meta_Matc
 lean_object* l_Lean_Meta_mkArrow(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2___closed__2;
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__13___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__14___boxed(lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
@@ -476,27 +496,27 @@ lean_object* l_ST_Prim_Ref_modifyGetUnsafe___rarg___boxed(lean_object*, lean_obj
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_instantiate_rev(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__2___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_casesOnStuckLHS___spec__2(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withIncRecDepth___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__18___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_deltaExpand(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* lean_get_match_equations_for(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1;
+static lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__2;
 lean_object* l_Lean_Meta_getMVarDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
+static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3;
 lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__3;
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__2___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__10;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__7___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___boxed(lean_object**);
 lean_object* l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNamedPattern___spec__7___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -515,7 +535,7 @@ LEAN_EXPORT lean_object* l_panic___at___private_Lean_Meta_Match_MatchEqs_0__Lean
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___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_Meta_mkHEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppFn(lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_unfoldNamedPattern___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_MatcherInfo_numAlts(lean_object*);
 lean_object* l_Lean_Meta_deltaTarget(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -530,6 +550,7 @@ uint8_t l_List_isEmpty___rarg(lean_object*);
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4___closed__1;
 lean_object* l_Std_HashMapImp_find_x3f___at_Lean_MetavarContext_instantiateExprMVars___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_unfoldNamedPattern___spec__14___rarg___closed__1;
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLet___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__11___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -544,7 +565,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNa
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_unfoldNamedPattern___spec__14___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___closed__11;
 static lean_object* l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4___closed__5;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2___closed__1;
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoal___closed__9;
@@ -554,7 +574,8 @@ lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(lean_object*, le
 LEAN_EXPORT lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__2;
 lean_object* l_Lean_indentExpr(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Subarray_size___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Meta_Match_unfoldNamedPattern___spec__8___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___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_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__3___boxed(lean_object*, lean_object*, lean_object*);
@@ -563,6 +584,7 @@ lean_object* l_Lean_Expr_isConstructorApp_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_modifyTargetEqLHS(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_forIn___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_ReaderT_bind___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__17(lean_object*, lean_object*);
@@ -571,12 +593,15 @@ lean_object* l_Lean_Expr_constName_x21(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__6___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLet___at_Lean_Meta_Match_unfoldNamedPattern___spec__6___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Meta_Match_unfoldNamedPattern___spec__12___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_injectionAny___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*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_processNextEq___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__2;
 lean_object* l_List_appendTR___rarg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___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*);
+static lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__10;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___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*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__8;
 extern lean_object* l_instInhabitedPUnit;
 static lean_object* l_Lean_Meta_Match_getEquationsForImpl___closed__1;
@@ -587,10 +612,11 @@ LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_unfoldNa
 lean_object* l_Lean_Meta_matchHEq_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_transform_visit_visitLambda___at_Lean_Meta_Match_unfoldNamedPattern___spec__4___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_Meta_check(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Exception_toMessageData(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_getFVarLocalDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
@@ -4213,7 +4239,53 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___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) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_ctor_get(x_4, 3);
+x_8 = l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+x_9 = !lean_is_exclusive(x_8);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_ctor_get(x_8, 0);
+lean_inc(x_7);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_7);
+lean_ctor_set(x_11, 1, x_10);
+lean_ctor_set_tag(x_8, 1);
+lean_ctor_set(x_8, 0, x_11);
+return x_8;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_ctor_get(x_8, 0);
+x_13 = lean_ctor_get(x_8, 1);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_8);
+lean_inc(x_7);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_7);
+lean_ctor_set(x_14, 1, x_12);
+x_15 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_13);
+return x_15;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___rarg___boxed), 6, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__2(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; 
@@ -4253,30 +4325,51 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-lean_object* x_12; 
-x_12 = lean_apply_9(x_1, x_2, x_3, x_4, x_5, x_7, x_8, x_9, x_10, x_11);
-return x_12;
+lean_object* x_13; 
+x_13 = lean_apply_10(x_1, x_2, x_3, x_4, x_5, x_6, x_8, x_9, x_10, x_11, x_12);
+return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-lean_dec(x_7);
+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; 
+x_17 = lean_expr_instantiate1(x_1, x_11);
+lean_dec(x_1);
+x_18 = lean_array_push(x_2, x_11);
+x_19 = lean_array_push(x_3, x_4);
+x_20 = 0;
+x_21 = lean_box(x_20);
+x_22 = lean_array_push(x_5, x_21);
+x_23 = lean_unsigned_to_nat(1u);
+x_24 = lean_nat_add(x_6, x_23);
+lean_dec(x_6);
+x_25 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_7, x_8, x_9, x_10, x_18, x_19, x_22, x_24, x_17, x_12, x_13, x_14, x_15, x_16);
+return x_25;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_dec(x_11);
 lean_inc(x_2);
-x_13 = lean_array_push(x_1, x_2);
-x_14 = lean_array_push(x_3, x_2);
-x_15 = 1;
-x_16 = lean_box(x_15);
-x_17 = lean_array_push(x_4, x_16);
-x_18 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_5, x_13, x_14, x_17, x_6, x_8, x_9, x_10, x_11, x_12);
-return x_18;
+x_17 = lean_array_push(x_1, x_2);
+x_18 = lean_array_push(x_3, x_2);
+x_19 = 1;
+x_20 = lean_box(x_19);
+x_21 = lean_array_push(x_4, x_20);
+x_22 = lean_unsigned_to_nat(1u);
+x_23 = lean_nat_add(x_5, x_22);
+lean_dec(x_5);
+x_24 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_6, x_7, x_8, x_17, x_9, x_18, x_21, x_23, x_10, x_12, x_13, x_14, x_15, x_16);
+return x_24;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__1() {
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -4284,7 +4377,7 @@ x_1 = lean_mk_string("Lean.Meta.Match.MatchEqs");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__2() {
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -4292,7 +4385,7 @@ x_1 = lean_mk_string("Lean.Meta.Match.forallAltTelescope.go");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__3() {
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -4300,327 +4393,342 @@ x_1 = lean_mk_string("unreachable code has been reached");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__4() {
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_1 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__1;
-x_2 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__2;
-x_3 = lean_unsigned_to_nat(86u);
-x_4 = lean_unsigned_to_nat(45u);
-x_5 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__3;
+x_1 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1;
+x_2 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__2;
+x_3 = lean_unsigned_to_nat(97u);
+x_4 = lean_unsigned_to_nat(47u);
+x_5 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_expr_instantiate1(x_1, x_7);
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_expr_instantiate1(x_1, x_11);
 lean_dec(x_1);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-x_14 = l_Lean_Meta_matchEq_x3f(x_2, x_8, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_14) == 0)
-{
-lean_object* x_15; 
-x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
-if (lean_obj_tag(x_15) == 0)
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+x_18 = l_Lean_Meta_matchEq_x3f(x_2, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
+lean_object* x_19; 
+x_19 = lean_ctor_get(x_18, 0);
+lean_inc(x_19);
+if (lean_obj_tag(x_19) == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = lean_box(0);
+x_22 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(x_3, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_17, x_21, x_12, x_13, x_14, x_15, x_20);
+return x_22;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; 
+x_23 = lean_ctor_get(x_19, 0);
+lean_inc(x_23);
+lean_dec(x_19);
+x_24 = lean_ctor_get(x_23, 1);
+lean_inc(x_24);
+lean_dec(x_23);
+x_25 = lean_ctor_get(x_18, 1);
+lean_inc(x_25);
+lean_dec(x_18);
+x_26 = lean_ctor_get(x_24, 0);
+lean_inc(x_26);
+x_27 = lean_ctor_get(x_24, 1);
+lean_inc(x_27);
+lean_dec(x_24);
+x_28 = l_Lean_Expr_isFVar(x_26);
+if (x_28 == 0)
+{
+lean_object* x_29; lean_object* x_30; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_29 = lean_box(0);
+x_30 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(x_3, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_17, x_29, x_12, x_13, x_14, x_15, x_25);
+return x_30;
+}
+else
+{
+uint8_t x_31; 
+x_31 = l_Array_contains___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__3(x_3, x_26);
+if (x_31 == 0)
+{
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_32 = lean_box(0);
+x_33 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(x_3, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_17, x_32, x_12, x_13, x_14, x_15, x_25);
+return x_33;
+}
+else
+{
+uint8_t x_34; 
+x_34 = l_Array_contains___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__3(x_4, x_26);
+if (x_34 == 0)
+{
+lean_object* x_35; lean_object* x_36; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_35 = lean_box(0);
+x_36 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(x_3, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_17, x_35, x_12, x_13, x_14, x_15, x_25);
+return x_36;
+}
+else
+{
+uint8_t x_37; 
+lean_inc(x_11);
+lean_inc(x_17);
+x_37 = l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof(x_17, x_11);
+if (x_37 == 0)
+{
+lean_object* x_38; lean_object* x_39; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_38 = lean_box(0);
+x_39 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(x_3, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_17, x_38, x_12, x_13, x_14, x_15, x_25);
+return x_39;
+}
+else
+{
+lean_object* x_40; 
+lean_inc(x_26);
+x_40 = l_Array_getIdx_x3f___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__1(x_3, x_26);
+if (lean_obj_tag(x_40) == 0)
+{
+lean_object* x_41; lean_object* x_42; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_41 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__4;
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+x_42 = l_panic___at___private_Lean_Meta_WHNF_0__Lean_Meta_cache___spec__5(x_41, x_12, x_13, x_14, x_15, x_25);
+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, 0);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_42, 1);
+lean_inc(x_44);
+lean_dec(x_42);
+x_45 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3(x_3, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_17, x_43, x_12, x_13, x_14, x_15, x_44);
+return x_45;
+}
+else
+{
+uint8_t x_46; 
+lean_dec(x_17);
+lean_dec(x_15);
 lean_dec(x_14);
-x_17 = lean_box(0);
-x_18 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(x_3, x_7, x_4, x_5, x_6, x_13, x_17, x_8, x_9, x_10, x_11, x_16);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_46 = !lean_is_exclusive(x_42);
+if (x_46 == 0)
+{
+return x_42;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_42, 0);
+x_48 = lean_ctor_get(x_42, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_42);
+x_49 = 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
+{
+lean_object* x_50; lean_object* x_51; uint8_t x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; size_t x_56; size_t x_57; lean_object* x_58; lean_object* x_59; 
+lean_dec(x_11);
+lean_dec(x_6);
+x_50 = lean_ctor_get(x_40, 0);
+lean_inc(x_50);
+lean_dec(x_40);
+x_51 = l_Array_eraseIdx___rarg(x_3, x_50);
+x_52 = 0;
+x_53 = lean_box(x_52);
+x_54 = lean_array_set(x_5, x_50, x_53);
+x_55 = lean_array_get_size(x_4);
+x_56 = lean_usize_of_nat(x_55);
+lean_dec(x_55);
+x_57 = 0;
+lean_inc(x_27);
+x_58 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__2(x_26, x_27, x_56, x_57, x_4);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_27);
+x_59 = l_Lean_Meta_mkEqRefl(x_27, x_12, x_13, x_14, x_15, x_25);
+if (lean_obj_tag(x_59) == 0)
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_60 = lean_ctor_get(x_59, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_59, 1);
+lean_inc(x_61);
+lean_dec(x_59);
+x_62 = lean_array_push(x_58, x_60);
+x_63 = l_Lean_Expr_replaceFVar(x_17, x_26, x_27);
+lean_dec(x_27);
+lean_dec(x_17);
+x_64 = lean_box(x_52);
+x_65 = lean_array_push(x_54, x_64);
+x_66 = lean_unsigned_to_nat(1u);
+x_67 = lean_nat_add(x_50, x_66);
+lean_dec(x_50);
+x_68 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_7, x_8, x_9, x_51, x_10, x_62, x_65, x_67, x_63, x_12, x_13, x_14, x_15, x_61);
+if (lean_obj_tag(x_68) == 0)
+{
+uint8_t x_69; 
+x_69 = !lean_is_exclusive(x_68);
+if (x_69 == 0)
+{
+return x_68;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_68, 0);
+x_71 = lean_ctor_get(x_68, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_68);
+x_72 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
+}
+}
+else
+{
+uint8_t x_73; 
+x_73 = !lean_is_exclusive(x_68);
+if (x_73 == 0)
+{
+return x_68;
+}
+else
+{
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_68, 0);
+x_75 = lean_ctor_get(x_68, 1);
+lean_inc(x_75);
+lean_inc(x_74);
+lean_dec(x_68);
+x_76 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_76, 0, x_74);
+lean_ctor_set(x_76, 1, x_75);
+return x_76;
+}
+}
+}
+else
+{
+uint8_t x_77; 
+lean_dec(x_58);
+lean_dec(x_54);
+lean_dec(x_51);
+lean_dec(x_50);
+lean_dec(x_27);
+lean_dec(x_26);
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_77 = !lean_is_exclusive(x_59);
+if (x_77 == 0)
+{
+return x_59;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_78 = lean_ctor_get(x_59, 0);
+x_79 = lean_ctor_get(x_59, 1);
+lean_inc(x_79);
+lean_inc(x_78);
+lean_dec(x_59);
+x_80 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_80, 0, x_78);
+lean_ctor_set(x_80, 1, x_79);
+return x_80;
+}
+}
+}
+}
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_81; 
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_81 = !lean_is_exclusive(x_18);
+if (x_81 == 0)
+{
 return x_18;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_19 = lean_ctor_get(x_15, 0);
-lean_inc(x_19);
-lean_dec(x_15);
-x_20 = lean_ctor_get(x_19, 1);
-lean_inc(x_20);
-lean_dec(x_19);
-x_21 = lean_ctor_get(x_14, 1);
-lean_inc(x_21);
-lean_dec(x_14);
-x_22 = lean_ctor_get(x_20, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_20, 1);
-lean_inc(x_23);
-lean_dec(x_20);
-x_24 = l_Lean_Expr_isFVar(x_22);
-if (x_24 == 0)
-{
-lean_object* x_25; lean_object* x_26; 
-lean_dec(x_23);
-lean_dec(x_22);
-x_25 = lean_box(0);
-x_26 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(x_3, x_7, x_4, x_5, x_6, x_13, x_25, x_8, x_9, x_10, x_11, x_21);
-return x_26;
-}
-else
-{
-uint8_t x_27; 
-x_27 = l_Array_contains___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__3(x_3, x_22);
-if (x_27 == 0)
-{
-lean_object* x_28; lean_object* x_29; 
-lean_dec(x_23);
-lean_dec(x_22);
-x_28 = lean_box(0);
-x_29 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(x_3, x_7, x_4, x_5, x_6, x_13, x_28, x_8, x_9, x_10, x_11, x_21);
-return x_29;
-}
-else
-{
-uint8_t x_30; 
-x_30 = l_Array_contains___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__3(x_4, x_22);
-if (x_30 == 0)
-{
-lean_object* x_31; lean_object* x_32; 
-lean_dec(x_23);
-lean_dec(x_22);
-x_31 = lean_box(0);
-x_32 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(x_3, x_7, x_4, x_5, x_6, x_13, x_31, x_8, x_9, x_10, x_11, x_21);
-return x_32;
-}
-else
-{
-uint8_t x_33; 
-lean_inc(x_7);
-lean_inc(x_13);
-x_33 = l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof(x_13, x_7);
-if (x_33 == 0)
-{
-lean_object* x_34; lean_object* x_35; 
-lean_dec(x_23);
-lean_dec(x_22);
-x_34 = lean_box(0);
-x_35 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(x_3, x_7, x_4, x_5, x_6, x_13, x_34, x_8, x_9, x_10, x_11, x_21);
-return x_35;
-}
-else
-{
-lean_object* x_36; 
-lean_inc(x_22);
-x_36 = l_Array_getIdx_x3f___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__1(x_3, x_22);
-if (lean_obj_tag(x_36) == 0)
-{
-lean_object* x_37; lean_object* x_38; 
-lean_dec(x_23);
-lean_dec(x_22);
-x_37 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__4;
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-x_38 = l_panic___at___private_Lean_Meta_WHNF_0__Lean_Meta_cache___spec__5(x_37, x_8, x_9, x_10, x_11, x_21);
-if (lean_obj_tag(x_38) == 0)
-{
-lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_39 = lean_ctor_get(x_38, 0);
-lean_inc(x_39);
-x_40 = lean_ctor_get(x_38, 1);
-lean_inc(x_40);
-lean_dec(x_38);
-x_41 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2(x_3, x_7, x_4, x_5, x_6, x_13, x_39, x_8, x_9, x_10, x_11, x_40);
-return x_41;
-}
-else
-{
-uint8_t x_42; 
-lean_dec(x_13);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-x_42 = !lean_is_exclusive(x_38);
-if (x_42 == 0)
-{
-return x_38;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_38, 0);
-x_44 = lean_ctor_get(x_38, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_38);
-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;
-}
-}
-}
-else
-{
-lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; size_t x_52; size_t x_53; lean_object* x_54; lean_object* x_55; 
-lean_dec(x_7);
-x_46 = lean_ctor_get(x_36, 0);
-lean_inc(x_46);
-lean_dec(x_36);
-x_47 = l_Array_eraseIdx___rarg(x_3, x_46);
-x_48 = 0;
-x_49 = lean_box(x_48);
-x_50 = lean_array_set(x_5, x_46, x_49);
-lean_dec(x_46);
-x_51 = lean_array_get_size(x_4);
-x_52 = lean_usize_of_nat(x_51);
-lean_dec(x_51);
-x_53 = 0;
-lean_inc(x_23);
-x_54 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(x_22, x_23, x_52, x_53, x_4);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_23);
-x_55 = l_Lean_Meta_mkEqRefl(x_23, x_8, x_9, x_10, x_11, x_21);
-if (lean_obj_tag(x_55) == 0)
-{
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-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_array_push(x_54, x_56);
-x_59 = l_Lean_Expr_replaceFVar(x_13, x_22, x_23);
-lean_dec(x_23);
-lean_dec(x_13);
-x_60 = lean_box(x_48);
-x_61 = lean_array_push(x_50, x_60);
-x_62 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_6, x_47, x_58, x_61, x_59, x_8, x_9, x_10, x_11, x_57);
-if (lean_obj_tag(x_62) == 0)
-{
-uint8_t x_63; 
-x_63 = !lean_is_exclusive(x_62);
-if (x_63 == 0)
-{
-return x_62;
-}
-else
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_62, 0);
-x_65 = lean_ctor_get(x_62, 1);
-lean_inc(x_65);
-lean_inc(x_64);
-lean_dec(x_62);
-x_66 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_65);
-return x_66;
-}
-}
-else
-{
-uint8_t x_67; 
-x_67 = !lean_is_exclusive(x_62);
-if (x_67 == 0)
-{
-return x_62;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_68 = lean_ctor_get(x_62, 0);
-x_69 = lean_ctor_get(x_62, 1);
-lean_inc(x_69);
-lean_inc(x_68);
-lean_dec(x_62);
-x_70 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_70, 0, x_68);
-lean_ctor_set(x_70, 1, x_69);
-return x_70;
-}
-}
-}
-else
-{
-uint8_t x_71; 
-lean_dec(x_54);
-lean_dec(x_50);
-lean_dec(x_47);
-lean_dec(x_23);
-lean_dec(x_22);
-lean_dec(x_13);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-x_71 = !lean_is_exclusive(x_55);
-if (x_71 == 0)
-{
-return x_55;
-}
-else
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_55, 0);
-x_73 = lean_ctor_get(x_55, 1);
-lean_inc(x_73);
-lean_inc(x_72);
-lean_dec(x_55);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-return x_74;
-}
-}
-}
-}
-}
-}
-}
-}
-}
-else
-{
-uint8_t x_75; 
-lean_dec(x_13);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-x_75 = !lean_is_exclusive(x_14);
-if (x_75 == 0)
-{
-return x_14;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_14, 0);
-x_77 = lean_ctor_get(x_14, 1);
-lean_inc(x_77);
-lean_inc(x_76);
-lean_dec(x_14);
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_76);
-lean_ctor_set(x_78, 1, x_77);
-return x_78;
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_82 = lean_ctor_get(x_18, 0);
+x_83 = lean_ctor_get(x_18, 1);
+lean_inc(x_83);
+lean_inc(x_82);
+lean_dec(x_18);
+x_84 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_84, 0, x_82);
+lean_ctor_set(x_84, 1, x_83);
+return x_84;
 }
 }
 }
@@ -4701,325 +4809,548 @@ x_4 = lean_array_push(x_1, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___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, lean_object* x_10) {
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__9() {
 _start:
 {
-lean_object* x_11; 
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_11 = l_Lean_Meta_whnfForall(x_5, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-if (lean_obj_tag(x_12) == 7)
-{
-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_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_ctor_get(x_12, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_12, 1);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_12, 2);
-lean_inc(x_16);
-lean_dec(x_12);
-x_17 = l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
-x_18 = l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_19 = l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(x_15, x_17, x_18, x_6, x_7, x_8, x_9, x_13);
-if (lean_obj_tag(x_19) == 0)
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; 
-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);
-lean_inc(x_20);
-x_22 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3), 12, 6);
-lean_closure_set(x_22, 0, x_16);
-lean_closure_set(x_22, 1, x_20);
-lean_closure_set(x_22, 2, x_2);
-lean_closure_set(x_22, 3, x_3);
-lean_closure_set(x_22, 4, x_4);
-lean_closure_set(x_22, 5, x_1);
-x_23 = 0;
-x_24 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_14, x_23, x_20, x_22, x_6, x_7, x_8, x_9, x_21);
-return x_24;
+lean_object* x_1; 
+x_1 = lean_mk_string("unexpected match alternative type");
+return x_1;
 }
-else
+}
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__10() {
+_start:
 {
-uint8_t x_25; 
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__9;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__11() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__11;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___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, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+_start:
+{
+lean_object* x_15; 
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+x_15 = l_Lean_Meta_whnfForall(x_9, x_10, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; 
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+if (lean_obj_tag(x_16) == 7)
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = lean_ctor_get(x_16, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_16, 1);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_16, 2);
+lean_inc(x_20);
 lean_dec(x_16);
-lean_dec(x_14);
-lean_dec(x_9);
+x_21 = lean_nat_dec_lt(x_8, x_2);
+if (x_21 == 0)
+{
+lean_object* x_22; 
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_19);
+x_22 = l_Lean_Meta_matchEq_x3f(x_19, x_10, x_11, x_12, x_13, x_17);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+if (lean_obj_tag(x_23) == 0)
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
 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_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = l_Lean_indentExpr(x_1);
+x_26 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__10;
+x_27 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_25);
+x_28 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_29 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+x_30 = l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___rarg(x_29, x_10, x_11, x_12, x_13, x_24);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+return x_30;
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_31 = lean_ctor_get(x_23, 0);
+lean_inc(x_31);
+lean_dec(x_23);
+x_32 = lean_ctor_get(x_31, 1);
+lean_inc(x_32);
+lean_dec(x_31);
+x_33 = lean_ctor_get(x_22, 1);
+lean_inc(x_33);
+lean_dec(x_22);
+x_34 = lean_ctor_get(x_32, 1);
+lean_inc(x_34);
+lean_dec(x_32);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+x_35 = l_Lean_Meta_mkEqRefl(x_34, x_10, x_11, x_12, x_13, x_33);
+if (lean_obj_tag(x_35) == 0)
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; 
+x_36 = lean_ctor_get(x_35, 0);
+lean_inc(x_36);
+x_37 = lean_ctor_get(x_35, 1);
+lean_inc(x_37);
+lean_dec(x_35);
+x_38 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__2), 16, 10);
+lean_closure_set(x_38, 0, x_20);
+lean_closure_set(x_38, 1, x_5);
+lean_closure_set(x_38, 2, x_6);
+lean_closure_set(x_38, 3, x_36);
+lean_closure_set(x_38, 4, x_7);
+lean_closure_set(x_38, 5, x_8);
+lean_closure_set(x_38, 6, x_1);
+lean_closure_set(x_38, 7, x_2);
+lean_closure_set(x_38, 8, x_3);
+lean_closure_set(x_38, 9, x_4);
+x_39 = 0;
+x_40 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_18, x_39, x_19, x_38, x_10, x_11, x_12, x_13, x_37);
+return x_40;
+}
+else
+{
+uint8_t x_41; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(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_6);
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = !lean_is_exclusive(x_19);
-if (x_25 == 0)
+x_41 = !lean_is_exclusive(x_35);
+if (x_41 == 0)
 {
-return x_19;
+return x_35;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_19, 0);
-x_27 = lean_ctor_get(x_19, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_19);
-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; 
-x_29 = lean_ctor_get(x_11, 1);
-lean_inc(x_29);
-lean_dec(x_11);
-x_30 = l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
-x_31 = l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_32 = l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(x_12, x_30, x_31, x_6, x_7, x_8, x_9, x_29);
-if (lean_obj_tag(x_32) == 0)
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; 
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-lean_dec(x_32);
-x_35 = lean_array_get_size(x_2);
-x_36 = lean_unsigned_to_nat(1u);
-x_37 = lean_nat_dec_eq(x_35, x_36);
-lean_dec(x_35);
-if (x_37 == 0)
-{
-lean_object* x_38; 
-x_38 = lean_apply_9(x_1, x_2, x_3, x_4, x_33, x_6, x_7, x_8, x_9, x_34);
-return x_38;
-}
-else
-{
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_39 = l_Lean_instInhabitedExpr;
-x_40 = lean_unsigned_to_nat(0u);
-x_41 = lean_array_get(x_39, x_2, x_40);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_41);
-x_42 = lean_infer_type(x_41, x_6, x_7, x_8, x_9, x_34);
-if (lean_obj_tag(x_42) == 0)
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
-x_43 = lean_ctor_get(x_42, 0);
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_35, 0);
+x_43 = lean_ctor_get(x_35, 1);
 lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-lean_dec(x_42);
-x_45 = l_Lean_Expr_fvarId_x21(x_41);
-lean_inc(x_33);
-x_46 = l_Lean_Meta_dependsOn(x_33, x_45, x_6, x_7, x_8, x_9, x_44);
-lean_dec(x_45);
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_46, 1);
-lean_inc(x_48);
-lean_dec(x_46);
-x_49 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__2;
-x_50 = l_Lean_Expr_isConstOf(x_43, x_49);
-lean_dec(x_43);
-if (x_50 == 0)
-{
-lean_object* x_51; 
-lean_dec(x_47);
-x_51 = lean_apply_9(x_1, x_2, x_3, x_4, x_33, x_6, x_7, x_8, x_9, x_48);
-return x_51;
+lean_inc(x_42);
+lean_dec(x_35);
+x_44 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_44, 0, x_42);
+lean_ctor_set(x_44, 1, x_43);
+return x_44;
+}
+}
+}
 }
 else
 {
-uint8_t x_52; 
-x_52 = lean_unbox(x_47);
-lean_dec(x_47);
-if (x_52 == 0)
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+uint8_t x_45; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(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_6);
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_53 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_54 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__7;
-x_55 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__8;
-x_56 = lean_apply_9(x_1, x_53, x_54, x_55, x_33, x_6, x_7, x_8, x_9, x_48);
-if (lean_obj_tag(x_56) == 0)
+lean_dec(x_1);
+x_45 = !lean_is_exclusive(x_22);
+if (x_45 == 0)
 {
-uint8_t x_57; 
-x_57 = !lean_is_exclusive(x_56);
-if (x_57 == 0)
+return x_22;
+}
+else
 {
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_22, 0);
+x_47 = lean_ctor_get(x_22, 1);
+lean_inc(x_47);
+lean_inc(x_46);
+lean_dec(x_22);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
+}
+}
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
+x_50 = l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+x_51 = l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(x_19, x_49, x_50, x_10, x_11, x_12, x_13, x_17);
+if (lean_obj_tag(x_51) == 0)
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; lean_object* x_56; 
+x_52 = lean_ctor_get(x_51, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_51, 1);
+lean_inc(x_53);
+lean_dec(x_51);
+lean_inc(x_52);
+x_54 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4), 16, 10);
+lean_closure_set(x_54, 0, x_20);
+lean_closure_set(x_54, 1, x_52);
+lean_closure_set(x_54, 2, x_4);
+lean_closure_set(x_54, 3, x_6);
+lean_closure_set(x_54, 4, x_7);
+lean_closure_set(x_54, 5, x_8);
+lean_closure_set(x_54, 6, x_1);
+lean_closure_set(x_54, 7, x_2);
+lean_closure_set(x_54, 8, x_3);
+lean_closure_set(x_54, 9, x_5);
+x_55 = 0;
+x_56 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_18, x_55, x_52, x_54, x_10, x_11, x_12, x_13, x_53);
 return x_56;
 }
 else
 {
+uint8_t x_57; 
+lean_dec(x_20);
+lean_dec(x_18);
+lean_dec(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_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_57 = !lean_is_exclusive(x_51);
+if (x_57 == 0)
+{
+return x_51;
+}
+else
+{
 lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = lean_ctor_get(x_56, 0);
-x_59 = lean_ctor_get(x_56, 1);
+x_58 = lean_ctor_get(x_51, 0);
+x_59 = lean_ctor_get(x_51, 1);
 lean_inc(x_59);
 lean_inc(x_58);
-lean_dec(x_56);
-x_60 = lean_alloc_ctor(0, 2, 0);
+lean_dec(x_51);
+x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_58);
 lean_ctor_set(x_60, 1, x_59);
 return x_60;
 }
 }
-else
-{
-uint8_t x_61; 
-x_61 = !lean_is_exclusive(x_56);
-if (x_61 == 0)
-{
-return x_56;
+}
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_56, 0);
-x_63 = lean_ctor_get(x_56, 1);
-lean_inc(x_63);
-lean_inc(x_62);
-lean_dec(x_56);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
+lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+lean_dec(x_8);
+lean_dec(x_2);
+lean_dec(x_1);
+x_61 = lean_ctor_get(x_15, 1);
+lean_inc(x_61);
+lean_dec(x_15);
+x_62 = l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
+x_63 = l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+x_64 = l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(x_16, x_62, x_63, x_10, x_11, x_12, x_13, x_61);
+if (lean_obj_tag(x_64) == 0)
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; uint8_t x_69; 
+x_65 = lean_ctor_get(x_64, 0);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_64, 1);
+lean_inc(x_66);
+lean_dec(x_64);
+x_67 = lean_array_get_size(x_4);
+x_68 = lean_unsigned_to_nat(1u);
+x_69 = lean_nat_dec_eq(x_67, x_68);
+lean_dec(x_67);
+if (x_69 == 0)
+{
+lean_object* x_70; 
+x_70 = lean_apply_10(x_3, x_4, x_5, x_6, x_7, x_65, x_10, x_11, x_12, x_13, x_66);
+return x_70;
+}
+else
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_71 = l_Lean_instInhabitedExpr;
+x_72 = lean_unsigned_to_nat(0u);
+x_73 = lean_array_get(x_71, x_4, x_72);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_73);
+x_74 = lean_infer_type(x_73, x_10, x_11, x_12, x_13, x_66);
+if (lean_obj_tag(x_74) == 0)
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+lean_dec(x_74);
+x_77 = l_Lean_Expr_fvarId_x21(x_73);
+lean_inc(x_65);
+x_78 = l_Lean_Meta_dependsOn(x_65, x_77, x_10, x_11, x_12, x_13, x_76);
+lean_dec(x_77);
+x_79 = lean_ctor_get(x_78, 0);
+lean_inc(x_79);
+x_80 = lean_ctor_get(x_78, 1);
+lean_inc(x_80);
+lean_dec(x_78);
+x_81 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__2;
+x_82 = l_Lean_Expr_isConstOf(x_75, x_81);
+lean_dec(x_75);
+if (x_82 == 0)
+{
+lean_object* x_83; 
+lean_dec(x_79);
+x_83 = lean_apply_10(x_3, x_4, x_5, x_6, x_7, x_65, x_10, x_11, x_12, x_13, x_80);
+return x_83;
+}
+else
+{
+uint8_t x_84; 
+x_84 = lean_unbox(x_79);
+lean_dec(x_79);
+if (x_84 == 0)
+{
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_85 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_86 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__7;
+x_87 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__8;
+x_88 = lean_apply_10(x_3, x_85, x_85, x_86, x_87, x_65, x_10, x_11, x_12, x_13, x_80);
+if (lean_obj_tag(x_88) == 0)
+{
+uint8_t x_89; 
+x_89 = !lean_is_exclusive(x_88);
+if (x_89 == 0)
+{
+return x_88;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_88, 0);
+x_91 = lean_ctor_get(x_88, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_88);
+x_92 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
+}
+}
+else
+{
+uint8_t x_93; 
+x_93 = !lean_is_exclusive(x_88);
+if (x_93 == 0)
+{
+return x_88;
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_88, 0);
+x_95 = lean_ctor_get(x_88, 1);
+lean_inc(x_95);
+lean_inc(x_94);
+lean_dec(x_88);
+x_96 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_96, 0, x_94);
+lean_ctor_set(x_96, 1, x_95);
+return x_96;
+}
+}
+}
+else
+{
+lean_object* x_97; 
+x_97 = lean_apply_10(x_3, x_4, x_5, x_6, x_7, x_65, x_10, x_11, x_12, x_13, x_80);
+return x_97;
+}
+}
+}
+else
+{
+uint8_t x_98; 
+lean_dec(x_73);
+lean_dec(x_65);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_98 = !lean_is_exclusive(x_74);
+if (x_98 == 0)
+{
+return x_74;
+}
+else
+{
+lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+x_99 = lean_ctor_get(x_74, 0);
+x_100 = lean_ctor_get(x_74, 1);
+lean_inc(x_100);
+lean_inc(x_99);
+lean_dec(x_74);
+x_101 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_101, 0, x_99);
+lean_ctor_set(x_101, 1, x_100);
+return x_101;
+}
+}
+}
+}
+else
+{
+uint8_t x_102; 
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_102 = !lean_is_exclusive(x_64);
+if (x_102 == 0)
+{
 return x_64;
 }
-}
-}
 else
 {
-lean_object* x_65; 
-x_65 = lean_apply_9(x_1, x_2, x_3, x_4, x_33, x_6, x_7, x_8, x_9, x_48);
-return x_65;
-}
-}
-}
-else
-{
-uint8_t x_66; 
-lean_dec(x_41);
-lean_dec(x_33);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_66 = !lean_is_exclusive(x_42);
-if (x_66 == 0)
-{
-return x_42;
-}
-else
-{
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_67 = lean_ctor_get(x_42, 0);
-x_68 = lean_ctor_get(x_42, 1);
-lean_inc(x_68);
-lean_inc(x_67);
-lean_dec(x_42);
-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;
+lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+x_103 = lean_ctor_get(x_64, 0);
+x_104 = lean_ctor_get(x_64, 1);
+lean_inc(x_104);
+lean_inc(x_103);
+lean_dec(x_64);
+x_105 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_105, 0, x_103);
+lean_ctor_set(x_105, 1, x_104);
+return x_105;
 }
 }
 }
 }
 else
 {
-uint8_t x_70; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_70 = !lean_is_exclusive(x_32);
-if (x_70 == 0)
-{
-return x_32;
-}
-else
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_71 = lean_ctor_get(x_32, 0);
-x_72 = lean_ctor_get(x_32, 1);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_dec(x_32);
-x_73 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-return x_73;
-}
-}
-}
-}
-else
-{
-uint8_t x_74; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_74 = !lean_is_exclusive(x_11);
-if (x_74 == 0)
-{
-return x_11;
-}
-else
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_75 = lean_ctor_get(x_11, 0);
-x_76 = lean_ctor_get(x_11, 1);
-lean_inc(x_76);
-lean_inc(x_75);
+uint8_t x_106; 
+lean_dec(x_13);
+lean_dec(x_12);
 lean_dec(x_11);
-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_dec(x_10);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_106 = !lean_is_exclusive(x_15);
+if (x_106 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_107 = lean_ctor_get(x_15, 0);
+x_108 = lean_ctor_get(x_15, 1);
+lean_inc(x_108);
+lean_inc(x_107);
+lean_dec(x_15);
+x_109 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_109, 0, x_107);
+lean_ctor_set(x_109, 1, x_108);
+return x_109;
 }
 }
 }
@@ -5028,11 +5359,23 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go(lean_object* x_
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope_go___rarg), 10, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope_go___rarg), 14, 0);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_throwError___at_Lean_Meta_Match_forallAltTelescope_go___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 size_t x_6; size_t x_7; lean_object* x_8; 
@@ -5040,34 +5383,36 @@ 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_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(x_1, x_2, x_6, x_7, x_5);
+x_8 = l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__2(x_1, x_2, x_6, x_7, x_5);
 lean_dec(x_1);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___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_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope_go___rarg___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_12; 
-x_12 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__1(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_6);
-return x_12;
+lean_object* x_13; 
+x_13 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___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_7);
+return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope___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_8; lean_object* x_9; 
-x_8 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_9 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_2, x_8, x_8, x_8, x_1, x_3, x_4, x_5, x_6, x_7);
-return x_9;
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_10 = lean_unsigned_to_nat(0u);
+lean_inc(x_1);
+x_11 = l_Lean_Meta_Match_forallAltTelescope_go___rarg(x_1, x_2, x_3, x_9, x_9, x_9, x_9, x_10, x_1, x_4, x_5, x_6, x_7, x_8);
+return x_11;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope___rarg), 7, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_Match_forallAltTelescope___rarg), 8, 0);
 return x_2;
 }
 }
@@ -5228,9 +5573,9 @@ static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Matc
 _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_Match_forallAltTelescope_go___rarg___lambda__3___closed__1;
+x_1 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1;
 x_2 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___closed__4;
-x_3 = lean_unsigned_to_nat(144u);
+x_3 = lean_unsigned_to_nat(161u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -7744,23 +8089,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__9() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("");
-return x_1;
-}
-}
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__9;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
@@ -7832,7 +8160,7 @@ x_20 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambd
 x_21 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_21, 0, x_20);
 lean_ctor_set(x_21, 1, x_19);
-x_22 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_22 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_23 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_23, 0, x_21);
 lean_ctor_set(x_23, 1, x_22);
@@ -10634,7 +10962,7 @@ lean_ctor_set(x_10, 1, x_7);
 return x_10;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__1() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -10642,7 +10970,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Meta_whnfCore), 6, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__2() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -10650,27 +10978,27 @@ x_1 = lean_mk_string("refl failed");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__3() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__2;
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__2;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__4() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__3;
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__3;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__5() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__5() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; 
@@ -10684,7 +11012,7 @@ lean_ctor_set_uint8(x_3, sizeof(void*)*1 + 2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__6() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -10692,16 +11020,16 @@ x_1 = lean_mk_string("failed to generate equality theorems for `match` expressio
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__7() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__6;
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__6;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__8() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__8() {
 _start:
 {
 lean_object* x_1; 
@@ -10709,16 +11037,16 @@ x_1 = lean_mk_string("`\n");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__9() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__8;
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__8;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__10() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -10726,16 +11054,16 @@ x_1 = lean_mk_string("spliIf failed");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__11() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__10;
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__10;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__12() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -10744,7 +11072,7 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__13() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__13() {
 _start:
 {
 lean_object* x_1; 
@@ -10752,11 +11080,550 @@ x_1 = lean_mk_string("simpIf failed");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__14() {
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__13;
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__13;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm_go___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; lean_object* x_11; 
+lean_dec(x_4);
+x_10 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__1;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_11 = l_Lean_Meta_modifyTargetEqLHS(x_1, x_10, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_11) == 0)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_30; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get(x_11, 1);
+lean_inc(x_13);
+if (lean_is_exclusive(x_11)) {
+ lean_ctor_release(x_11, 0);
+ lean_ctor_release(x_11, 1);
+ x_14 = x_11;
+} else {
+ lean_dec_ref(x_11);
+ x_14 = lean_box(0);
+}
+x_38 = l_Lean_Meta_saveState___rarg(x_6, x_7, x_8, x_13);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_38, 1);
+lean_inc(x_40);
+lean_dec(x_38);
+x_41 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__4;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_12);
+x_42 = l_Lean_Meta_applyRefl(x_12, x_41, x_5, x_6, x_7, x_8, x_40);
+if (lean_obj_tag(x_42) == 0)
+{
+lean_object* x_43; lean_object* x_44; 
+lean_dec(x_39);
+lean_dec(x_12);
+x_43 = lean_ctor_get(x_42, 1);
+lean_inc(x_43);
+lean_dec(x_42);
+x_44 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_15 = x_44;
+x_16 = x_43;
+goto block_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; 
+x_45 = lean_ctor_get(x_42, 1);
+lean_inc(x_45);
+lean_dec(x_42);
+x_46 = l_Lean_Meta_SavedState_restore(x_39, x_5, x_6, x_7, x_8, x_45);
+lean_dec(x_39);
+x_47 = lean_ctor_get(x_46, 1);
+lean_inc(x_47);
+lean_dec(x_46);
+x_48 = l_Lean_Meta_saveState___rarg(x_6, x_7, x_8, x_47);
+x_49 = lean_ctor_get(x_48, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_48, 1);
+lean_inc(x_50);
+lean_dec(x_48);
+x_51 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__5;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_12);
+x_52 = l_Lean_Meta_contradiction(x_12, x_51, x_5, x_6, x_7, x_8, x_50);
+if (lean_obj_tag(x_52) == 0)
+{
+uint8_t x_53; 
+lean_dec(x_49);
+lean_dec(x_12);
+x_53 = !lean_is_exclusive(x_52);
+if (x_53 == 0)
+{
+lean_object* x_54; lean_object* x_55; 
+x_54 = lean_ctor_get(x_52, 0);
+lean_dec(x_54);
+x_55 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+lean_ctor_set(x_52, 0, x_55);
+x_30 = x_52;
+goto block_37;
+}
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_52, 1);
+lean_inc(x_56);
+lean_dec(x_52);
+x_57 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_58 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_58, 0, x_57);
+lean_ctor_set(x_58, 1, x_56);
+x_30 = x_58;
+goto block_37;
+}
+}
+else
+{
+lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_59 = lean_ctor_get(x_52, 1);
+lean_inc(x_59);
+lean_dec(x_52);
+x_60 = l_Lean_Meta_SavedState_restore(x_49, x_5, x_6, x_7, x_8, x_59);
+lean_dec(x_49);
+x_61 = lean_ctor_get(x_60, 1);
+lean_inc(x_61);
+lean_dec(x_60);
+x_62 = l_Lean_Meta_saveState___rarg(x_6, x_7, x_8, x_61);
+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);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_12);
+x_65 = l_Lean_Meta_casesOnStuckLHS(x_12, x_5, x_6, x_7, x_8, x_64);
+if (lean_obj_tag(x_65) == 0)
+{
+lean_dec(x_63);
+lean_dec(x_12);
+x_30 = x_65;
+goto block_37;
+}
+else
+{
+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; uint8_t x_128; lean_object* x_129; 
+x_66 = lean_ctor_get(x_65, 1);
+lean_inc(x_66);
+lean_dec(x_65);
+x_67 = l_Lean_Meta_SavedState_restore(x_63, x_5, x_6, x_7, x_8, x_66);
+lean_dec(x_63);
+x_68 = lean_ctor_get(x_67, 1);
+lean_inc(x_68);
+lean_dec(x_67);
+x_69 = l_Lean_Meta_saveState___rarg(x_6, x_7, x_8, x_68);
+x_70 = lean_ctor_get(x_69, 0);
+lean_inc(x_70);
+x_71 = lean_ctor_get(x_69, 1);
+lean_inc(x_71);
+lean_dec(x_69);
+x_128 = 1;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_12);
+x_129 = l_Lean_Meta_simpIfTarget(x_12, x_128, x_5, x_6, x_7, x_8, x_71);
+if (lean_obj_tag(x_129) == 0)
+{
+lean_object* x_130; lean_object* x_131; uint8_t x_132; 
+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 = lean_name_eq(x_130, x_12);
+if (x_132 == 0)
+{
+lean_object* x_133; lean_object* x_134; 
+lean_dec(x_70);
+lean_dec(x_12);
+x_133 = lean_box(0);
+x_134 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__1(x_130, x_133, x_5, x_6, x_7, x_8, x_131);
+x_30 = x_134;
+goto block_37;
+}
+else
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+lean_dec(x_130);
+x_135 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__14;
+x_136 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_135, x_5, x_6, x_7, x_8, x_131);
+x_137 = lean_ctor_get(x_136, 1);
+lean_inc(x_137);
+lean_dec(x_136);
+x_72 = x_137;
+goto block_127;
+}
+}
+else
+{
+lean_object* x_138; 
+x_138 = lean_ctor_get(x_129, 1);
+lean_inc(x_138);
+lean_dec(x_129);
+x_72 = x_138;
+goto block_127;
+}
+block_127:
+{
+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_100; 
+x_73 = l_Lean_Meta_SavedState_restore(x_70, x_5, x_6, x_7, x_8, x_72);
+lean_dec(x_70);
+x_74 = lean_ctor_get(x_73, 1);
+lean_inc(x_74);
+lean_dec(x_73);
+x_75 = lean_box(0);
+x_76 = l_Lean_Meta_saveState___rarg(x_6, x_7, x_8, x_74);
+x_77 = lean_ctor_get(x_76, 0);
+lean_inc(x_77);
+x_78 = lean_ctor_get(x_76, 1);
+lean_inc(x_78);
+lean_dec(x_76);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_12);
+x_100 = l_Lean_commitWhenSome_x3f___at_Lean_Meta_splitIfTarget_x3f___spec__1___at_Lean_Meta_splitIfTarget_x3f___spec__2(x_12, x_75, x_5, x_6, x_7, x_8, x_78);
+if (lean_obj_tag(x_100) == 0)
+{
+lean_object* x_101; 
+x_101 = lean_ctor_get(x_100, 0);
+lean_inc(x_101);
+if (lean_obj_tag(x_101) == 0)
+{
+lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+x_102 = lean_ctor_get(x_100, 1);
+lean_inc(x_102);
+lean_dec(x_100);
+x_103 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__11;
+x_104 = l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(x_103, x_5, x_6, x_7, x_8, x_102);
+x_105 = lean_ctor_get(x_104, 1);
+lean_inc(x_105);
+lean_dec(x_104);
+x_79 = x_105;
+goto block_99;
+}
+else
+{
+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; uint8_t x_113; 
+lean_dec(x_77);
+lean_dec(x_12);
+x_106 = lean_ctor_get(x_101, 0);
+lean_inc(x_106);
+lean_dec(x_101);
+x_107 = lean_ctor_get(x_100, 1);
+lean_inc(x_107);
+lean_dec(x_100);
+x_108 = lean_ctor_get(x_106, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_106, 1);
+lean_inc(x_109);
+lean_dec(x_106);
+x_110 = lean_ctor_get(x_108, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_108, 1);
+lean_inc(x_111);
+lean_dec(x_108);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_112 = l_Lean_Meta_trySubst(x_110, x_111, x_5, x_6, x_7, x_8, x_107);
+x_113 = !lean_is_exclusive(x_112);
+if (x_113 == 0)
+{
+lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
+x_114 = lean_ctor_get(x_112, 0);
+x_115 = lean_ctor_get(x_109, 0);
+lean_inc(x_115);
+lean_dec(x_109);
+x_116 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12;
+x_117 = lean_array_push(x_116, x_114);
+x_118 = lean_array_push(x_117, x_115);
+lean_ctor_set(x_112, 0, x_118);
+x_30 = x_112;
+goto block_37;
+}
+else
+{
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_119 = lean_ctor_get(x_112, 0);
+x_120 = lean_ctor_get(x_112, 1);
+lean_inc(x_120);
+lean_inc(x_119);
+lean_dec(x_112);
+x_121 = lean_ctor_get(x_109, 0);
+lean_inc(x_121);
+lean_dec(x_109);
+x_122 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12;
+x_123 = lean_array_push(x_122, x_119);
+x_124 = lean_array_push(x_123, x_121);
+x_125 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_125, 0, x_124);
+lean_ctor_set(x_125, 1, x_120);
+x_30 = x_125;
+goto block_37;
+}
+}
+}
+else
+{
+lean_object* x_126; 
+x_126 = lean_ctor_get(x_100, 1);
+lean_inc(x_126);
+lean_dec(x_100);
+x_79 = x_126;
+goto block_99;
+}
+block_99:
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_80 = l_Lean_Meta_SavedState_restore(x_77, x_5, x_6, x_7, x_8, x_79);
+lean_dec(x_77);
+x_81 = lean_ctor_get(x_80, 1);
+lean_inc(x_81);
+lean_dec(x_80);
+x_82 = l_Lean_Meta_saveState___rarg(x_6, x_7, x_8, x_81);
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
+lean_inc(x_84);
+lean_dec(x_82);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_12);
+x_85 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar(x_12, x_5, x_6, x_7, x_8, x_84);
+if (lean_obj_tag(x_85) == 0)
+{
+lean_dec(x_83);
+lean_dec(x_12);
+x_30 = x_85;
+goto block_37;
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_86 = lean_ctor_get(x_85, 1);
+lean_inc(x_86);
+lean_dec(x_85);
+x_87 = l_Lean_Meta_SavedState_restore(x_83, x_5, x_6, x_7, x_8, x_86);
+lean_dec(x_83);
+x_88 = lean_ctor_get(x_87, 1);
+lean_inc(x_88);
+lean_dec(x_87);
+lean_inc(x_2);
+x_89 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_89, 0, x_2);
+x_90 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__7;
+x_91 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_91, 0, x_90);
+lean_ctor_set(x_91, 1, x_89);
+x_92 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__9;
+x_93 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+x_94 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_94, 0, x_12);
+x_95 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_95, 0, x_93);
+lean_ctor_set(x_95, 1, x_94);
+x_96 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_97 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+x_98 = l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(x_97, x_5, x_6, x_7, x_8, x_88);
+x_30 = x_98;
+goto block_37;
+}
+}
+}
+}
+}
+}
+block_29:
+{
+lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_17 = lean_array_get_size(x_15);
+x_18 = lean_unsigned_to_nat(0u);
+x_19 = lean_nat_dec_lt(x_18, x_17);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; 
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_20 = lean_box(0);
+if (lean_is_scalar(x_14)) {
+ x_21 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_21 = x_14;
+}
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_16);
+return x_21;
+}
+else
+{
+uint8_t x_22; 
+x_22 = lean_nat_dec_le(x_17, x_17);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; 
+lean_dec(x_17);
+lean_dec(x_15);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_23 = lean_box(0);
+if (lean_is_scalar(x_14)) {
+ x_24 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_24 = x_14;
+}
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_16);
+return x_24;
+}
+else
+{
+size_t x_25; size_t x_26; lean_object* x_27; lean_object* x_28; 
+lean_dec(x_14);
+x_25 = 0;
+x_26 = lean_usize_of_nat(x_17);
+lean_dec(x_17);
+x_27 = lean_box(0);
+x_28 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_proveCondEqThm_go___spec__1(x_2, x_3, x_15, x_25, x_26, x_27, x_5, x_6, x_7, x_8, x_16);
+lean_dec(x_15);
+lean_dec(x_3);
+return x_28;
+}
+}
+}
+block_37:
+{
+if (lean_obj_tag(x_30) == 0)
+{
+lean_object* x_31; lean_object* x_32; 
+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_15 = x_31;
+x_16 = x_32;
+goto block_29;
+}
+else
+{
+uint8_t x_33; 
+lean_dec(x_14);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_33 = !lean_is_exclusive(x_30);
+if (x_33 == 0)
+{
+return x_30;
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = lean_ctor_get(x_30, 0);
+x_35 = lean_ctor_get(x_30, 1);
+lean_inc(x_35);
+lean_inc(x_34);
+lean_dec(x_30);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_34);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
+}
+}
+}
+}
+else
+{
+uint8_t x_139; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_139 = !lean_is_exclusive(x_11);
+if (x_139 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_140 = lean_ctor_get(x_11, 0);
+x_141 = lean_ctor_get(x_11, 1);
+lean_inc(x_141);
+lean_inc(x_140);
+lean_dec(x_11);
+x_142 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_142, 0, x_140);
+lean_ctor_set(x_142, 1, x_141);
+return x_142;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("proveCondEqThm.go ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_proveCondEqThm_go___closed__1;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
@@ -10764,1117 +11631,236 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
-x_9 = lean_ctor_get(x_6, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_6, 1);
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_9 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
+x_10 = lean_ctor_get(x_6, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_6, 2);
+x_11 = lean_ctor_get(x_6, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_6, 3);
+x_12 = lean_ctor_get(x_6, 2);
 lean_inc(x_12);
-x_13 = lean_ctor_get(x_6, 4);
+x_13 = lean_ctor_get(x_6, 3);
 lean_inc(x_13);
-x_14 = lean_ctor_get(x_6, 5);
+x_14 = lean_ctor_get(x_6, 4);
 lean_inc(x_14);
-x_15 = lean_ctor_get(x_6, 6);
+x_15 = lean_ctor_get(x_6, 5);
 lean_inc(x_15);
-x_16 = lean_ctor_get(x_6, 7);
+x_16 = lean_ctor_get(x_6, 6);
 lean_inc(x_16);
-x_17 = lean_ctor_get(x_6, 8);
+x_17 = lean_ctor_get(x_6, 7);
 lean_inc(x_17);
-x_18 = lean_nat_dec_eq(x_10, x_11);
-if (x_18 == 0)
-{
-uint8_t x_19; 
-x_19 = !lean_is_exclusive(x_6);
+x_18 = lean_ctor_get(x_6, 8);
+lean_inc(x_18);
+x_19 = lean_nat_dec_eq(x_11, x_12);
 if (x_19 == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_20 = lean_ctor_get(x_6, 8);
-lean_dec(x_20);
-x_21 = lean_ctor_get(x_6, 7);
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_6);
+if (x_20 == 0)
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
+x_21 = lean_ctor_get(x_6, 8);
 lean_dec(x_21);
-x_22 = lean_ctor_get(x_6, 6);
+x_22 = lean_ctor_get(x_6, 7);
 lean_dec(x_22);
-x_23 = lean_ctor_get(x_6, 5);
+x_23 = lean_ctor_get(x_6, 6);
 lean_dec(x_23);
-x_24 = lean_ctor_get(x_6, 4);
+x_24 = lean_ctor_get(x_6, 5);
 lean_dec(x_24);
-x_25 = lean_ctor_get(x_6, 3);
+x_25 = lean_ctor_get(x_6, 4);
 lean_dec(x_25);
-x_26 = lean_ctor_get(x_6, 2);
+x_26 = lean_ctor_get(x_6, 3);
 lean_dec(x_26);
-x_27 = lean_ctor_get(x_6, 1);
+x_27 = lean_ctor_get(x_6, 2);
 lean_dec(x_27);
-x_28 = lean_ctor_get(x_6, 0);
+x_28 = lean_ctor_get(x_6, 1);
 lean_dec(x_28);
-x_29 = lean_unsigned_to_nat(1u);
-x_30 = lean_nat_add(x_10, x_29);
-lean_dec(x_10);
-lean_ctor_set(x_6, 1, x_30);
-x_31 = l_Lean_Meta_Match_proveCondEqThm_go___closed__1;
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_32 = l_Lean_Meta_modifyTargetEqLHS(x_2, x_31, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_32) == 0)
+x_29 = lean_ctor_get(x_6, 0);
+lean_dec(x_29);
+x_30 = lean_unsigned_to_nat(1u);
+x_31 = lean_nat_add(x_11, x_30);
+lean_dec(x_11);
+lean_ctor_set(x_6, 1, x_31);
+x_46 = lean_st_ref_get(x_7, x_8);
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_47, 3);
+lean_inc(x_48);
+lean_dec(x_47);
+x_49 = lean_ctor_get_uint8(x_48, sizeof(void*)*1);
+lean_dec(x_48);
+if (x_49 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_51; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-if (lean_is_exclusive(x_32)) {
- lean_ctor_release(x_32, 0);
- lean_ctor_release(x_32, 1);
- x_35 = x_32;
-} else {
- lean_dec_ref(x_32);
- x_35 = lean_box(0);
-}
-x_59 = l_Lean_Meta_saveState___rarg(x_5, x_6, x_7, x_34);
-x_60 = lean_ctor_get(x_59, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_59, 1);
-lean_inc(x_61);
-lean_dec(x_59);
-x_62 = l_Lean_Meta_Match_proveCondEqThm_go___closed__4;
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_33);
-x_63 = l_Lean_Meta_applyRefl(x_33, x_62, x_4, x_5, x_6, x_7, x_61);
-if (lean_obj_tag(x_63) == 0)
-{
-lean_object* x_64; lean_object* x_65; 
-lean_dec(x_60);
-lean_dec(x_33);
-x_64 = lean_ctor_get(x_63, 1);
-lean_inc(x_64);
-lean_dec(x_63);
-x_65 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_36 = x_65;
-x_37 = x_64;
-goto block_50;
+lean_object* x_50; uint8_t x_51; 
+x_50 = lean_ctor_get(x_46, 1);
+lean_inc(x_50);
+lean_dec(x_46);
+x_51 = 0;
+x_32 = x_51;
+x_33 = x_50;
+goto block_45;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_66 = lean_ctor_get(x_63, 1);
-lean_inc(x_66);
-lean_dec(x_63);
-x_67 = l_Lean_Meta_SavedState_restore(x_60, x_4, x_5, x_6, x_7, x_66);
-lean_dec(x_60);
-x_68 = lean_ctor_get(x_67, 1);
-lean_inc(x_68);
-lean_dec(x_67);
-x_69 = l_Lean_Meta_saveState___rarg(x_5, x_6, x_7, x_68);
+lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
+x_52 = lean_ctor_get(x_46, 1);
+lean_inc(x_52);
+lean_dec(x_46);
+x_53 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_4, x_5, x_6, x_7, x_52);
+x_54 = lean_ctor_get(x_53, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_53, 1);
+lean_inc(x_55);
+lean_dec(x_53);
+x_56 = lean_unbox(x_54);
+lean_dec(x_54);
+x_32 = x_56;
+x_33 = x_55;
+goto block_45;
+}
+block_45:
+{
+if (x_32 == 0)
+{
+lean_object* x_34; lean_object* x_35; 
+x_34 = lean_box(0);
+x_35 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2(x_2, x_1, x_3, x_34, x_4, x_5, x_6, x_7, x_33);
+return x_35;
+}
+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; lean_object* x_43; lean_object* x_44; 
+lean_inc(x_2);
+x_36 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_36, 0, x_2);
+x_37 = l_Lean_Meta_Match_proveCondEqThm_go___closed__2;
+x_38 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+x_39 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_40 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+x_41 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_40, x_4, x_5, x_6, x_7, x_33);
+x_42 = lean_ctor_get(x_41, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2(x_2, x_1, x_3, x_42, x_4, x_5, x_6, x_7, x_43);
+return x_44;
+}
+}
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; lean_object* x_61; lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_77; 
+lean_dec(x_6);
+x_57 = lean_unsigned_to_nat(1u);
+x_58 = lean_nat_add(x_11, x_57);
+lean_dec(x_11);
+x_59 = lean_alloc_ctor(0, 9, 0);
+lean_ctor_set(x_59, 0, x_10);
+lean_ctor_set(x_59, 1, x_58);
+lean_ctor_set(x_59, 2, x_12);
+lean_ctor_set(x_59, 3, x_13);
+lean_ctor_set(x_59, 4, x_14);
+lean_ctor_set(x_59, 5, x_15);
+lean_ctor_set(x_59, 6, x_16);
+lean_ctor_set(x_59, 7, x_17);
+lean_ctor_set(x_59, 8, x_18);
+x_74 = lean_st_ref_get(x_7, x_8);
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_75, 3);
+lean_inc(x_76);
+lean_dec(x_75);
+x_77 = lean_ctor_get_uint8(x_76, sizeof(void*)*1);
+lean_dec(x_76);
+if (x_77 == 0)
+{
+lean_object* x_78; uint8_t x_79; 
+x_78 = lean_ctor_get(x_74, 1);
+lean_inc(x_78);
+lean_dec(x_74);
+x_79 = 0;
+x_60 = x_79;
+x_61 = x_78;
+goto block_73;
+}
+else
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; 
+x_80 = lean_ctor_get(x_74, 1);
+lean_inc(x_80);
+lean_dec(x_74);
+x_81 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_9, x_4, x_5, x_59, x_7, x_80);
+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 = lean_unbox(x_82);
+lean_dec(x_82);
+x_60 = x_84;
+x_61 = x_83;
+goto block_73;
+}
+block_73:
+{
+if (x_60 == 0)
+{
+lean_object* x_62; lean_object* x_63; 
+x_62 = lean_box(0);
+x_63 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2(x_2, x_1, x_3, x_62, x_4, x_5, x_59, x_7, x_61);
+return x_63;
+}
+else
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+lean_inc(x_2);
+x_64 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_64, 0, x_2);
+x_65 = l_Lean_Meta_Match_proveCondEqThm_go___closed__2;
+x_66 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_66, 0, x_65);
+lean_ctor_set(x_66, 1, x_64);
+x_67 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_68 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_68, 0, x_66);
+lean_ctor_set(x_68, 1, x_67);
+x_69 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_9, x_68, x_4, x_5, x_59, x_7, x_61);
 x_70 = lean_ctor_get(x_69, 0);
 lean_inc(x_70);
 x_71 = lean_ctor_get(x_69, 1);
 lean_inc(x_71);
 lean_dec(x_69);
-x_72 = l_Lean_Meta_Match_proveCondEqThm_go___closed__5;
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_33);
-x_73 = l_Lean_Meta_contradiction(x_33, x_72, x_4, x_5, x_6, x_7, x_71);
-if (lean_obj_tag(x_73) == 0)
-{
-uint8_t x_74; 
-lean_dec(x_70);
-lean_dec(x_33);
-x_74 = !lean_is_exclusive(x_73);
-if (x_74 == 0)
-{
-lean_object* x_75; lean_object* x_76; 
-x_75 = lean_ctor_get(x_73, 0);
-lean_dec(x_75);
-x_76 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-lean_ctor_set(x_73, 0, x_76);
-x_51 = x_73;
-goto block_58;
-}
-else
-{
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_73, 1);
-lean_inc(x_77);
-lean_dec(x_73);
-x_78 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_78);
-lean_ctor_set(x_79, 1, x_77);
-x_51 = x_79;
-goto block_58;
-}
-}
-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_73, 1);
-lean_inc(x_80);
-lean_dec(x_73);
-x_81 = l_Lean_Meta_SavedState_restore(x_70, x_4, x_5, x_6, x_7, x_80);
-lean_dec(x_70);
-x_82 = lean_ctor_get(x_81, 1);
-lean_inc(x_82);
-lean_dec(x_81);
-x_83 = l_Lean_Meta_saveState___rarg(x_5, x_6, x_7, x_82);
-x_84 = lean_ctor_get(x_83, 0);
-lean_inc(x_84);
-x_85 = lean_ctor_get(x_83, 1);
-lean_inc(x_85);
-lean_dec(x_83);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_33);
-x_86 = l_Lean_Meta_casesOnStuckLHS(x_33, x_4, x_5, x_6, x_7, x_85);
-if (lean_obj_tag(x_86) == 0)
-{
-lean_dec(x_84);
-lean_dec(x_33);
-x_51 = x_86;
-goto block_58;
-}
-else
-{
-lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; uint8_t x_149; lean_object* x_150; 
-x_87 = lean_ctor_get(x_86, 1);
-lean_inc(x_87);
-lean_dec(x_86);
-x_88 = l_Lean_Meta_SavedState_restore(x_84, x_4, x_5, x_6, x_7, x_87);
-lean_dec(x_84);
-x_89 = lean_ctor_get(x_88, 1);
-lean_inc(x_89);
-lean_dec(x_88);
-x_90 = l_Lean_Meta_saveState___rarg(x_5, x_6, x_7, x_89);
-x_91 = lean_ctor_get(x_90, 0);
-lean_inc(x_91);
-x_92 = lean_ctor_get(x_90, 1);
-lean_inc(x_92);
-lean_dec(x_90);
-x_149 = 1;
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_33);
-x_150 = l_Lean_Meta_simpIfTarget(x_33, x_149, x_4, x_5, x_6, x_7, x_92);
-if (lean_obj_tag(x_150) == 0)
-{
-lean_object* x_151; lean_object* x_152; uint8_t x_153; 
-x_151 = lean_ctor_get(x_150, 0);
-lean_inc(x_151);
-x_152 = lean_ctor_get(x_150, 1);
-lean_inc(x_152);
-lean_dec(x_150);
-x_153 = lean_name_eq(x_151, x_33);
-if (x_153 == 0)
-{
-lean_object* x_154; lean_object* x_155; 
-lean_dec(x_91);
-lean_dec(x_33);
-x_154 = lean_box(0);
-x_155 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__1(x_151, x_154, x_4, x_5, x_6, x_7, x_152);
-x_51 = x_155;
-goto block_58;
-}
-else
-{
-lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-lean_dec(x_151);
-x_156 = l_Lean_Meta_Match_proveCondEqThm_go___closed__14;
-x_157 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_156, x_4, x_5, x_6, x_7, x_152);
-x_158 = lean_ctor_get(x_157, 1);
-lean_inc(x_158);
-lean_dec(x_157);
-x_93 = x_158;
-goto block_148;
-}
-}
-else
-{
-lean_object* x_159; 
-x_159 = lean_ctor_get(x_150, 1);
-lean_inc(x_159);
-lean_dec(x_150);
-x_93 = x_159;
-goto block_148;
-}
-block_148:
-{
-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_121; 
-x_94 = l_Lean_Meta_SavedState_restore(x_91, x_4, x_5, x_6, x_7, x_93);
-lean_dec(x_91);
-x_95 = lean_ctor_get(x_94, 1);
-lean_inc(x_95);
-lean_dec(x_94);
-x_96 = lean_box(0);
-x_97 = l_Lean_Meta_saveState___rarg(x_5, x_6, x_7, x_95);
-x_98 = lean_ctor_get(x_97, 0);
-lean_inc(x_98);
-x_99 = lean_ctor_get(x_97, 1);
-lean_inc(x_99);
-lean_dec(x_97);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_33);
-x_121 = l_Lean_commitWhenSome_x3f___at_Lean_Meta_splitIfTarget_x3f___spec__1___at_Lean_Meta_splitIfTarget_x3f___spec__2(x_33, x_96, x_4, x_5, x_6, x_7, x_99);
-if (lean_obj_tag(x_121) == 0)
-{
-lean_object* x_122; 
-x_122 = lean_ctor_get(x_121, 0);
-lean_inc(x_122);
-if (lean_obj_tag(x_122) == 0)
-{
-lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
-x_123 = lean_ctor_get(x_121, 1);
-lean_inc(x_123);
-lean_dec(x_121);
-x_124 = l_Lean_Meta_Match_proveCondEqThm_go___closed__11;
-x_125 = l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(x_124, x_4, x_5, x_6, x_7, x_123);
-x_126 = lean_ctor_get(x_125, 1);
-lean_inc(x_126);
-lean_dec(x_125);
-x_100 = x_126;
-goto block_120;
-}
-else
-{
-lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; uint8_t x_134; 
-lean_dec(x_98);
-lean_dec(x_33);
-x_127 = lean_ctor_get(x_122, 0);
-lean_inc(x_127);
-lean_dec(x_122);
-x_128 = lean_ctor_get(x_121, 1);
-lean_inc(x_128);
-lean_dec(x_121);
-x_129 = lean_ctor_get(x_127, 0);
-lean_inc(x_129);
-x_130 = lean_ctor_get(x_127, 1);
-lean_inc(x_130);
-lean_dec(x_127);
-x_131 = lean_ctor_get(x_129, 0);
-lean_inc(x_131);
-x_132 = lean_ctor_get(x_129, 1);
-lean_inc(x_132);
-lean_dec(x_129);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_133 = l_Lean_Meta_trySubst(x_131, x_132, x_4, x_5, x_6, x_7, x_128);
-x_134 = !lean_is_exclusive(x_133);
-if (x_134 == 0)
-{
-lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
-x_135 = lean_ctor_get(x_133, 0);
-x_136 = lean_ctor_get(x_130, 0);
-lean_inc(x_136);
-lean_dec(x_130);
-x_137 = l_Lean_Meta_Match_proveCondEqThm_go___closed__12;
-x_138 = lean_array_push(x_137, x_135);
-x_139 = lean_array_push(x_138, x_136);
-lean_ctor_set(x_133, 0, x_139);
-x_51 = x_133;
-goto block_58;
-}
-else
-{
-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; 
-x_140 = lean_ctor_get(x_133, 0);
-x_141 = lean_ctor_get(x_133, 1);
-lean_inc(x_141);
-lean_inc(x_140);
-lean_dec(x_133);
-x_142 = lean_ctor_get(x_130, 0);
-lean_inc(x_142);
-lean_dec(x_130);
-x_143 = l_Lean_Meta_Match_proveCondEqThm_go___closed__12;
-x_144 = lean_array_push(x_143, x_140);
-x_145 = lean_array_push(x_144, x_142);
-x_146 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_146, 0, x_145);
-lean_ctor_set(x_146, 1, x_141);
-x_51 = x_146;
-goto block_58;
-}
-}
-}
-else
-{
-lean_object* x_147; 
-x_147 = lean_ctor_get(x_121, 1);
-lean_inc(x_147);
-lean_dec(x_121);
-x_100 = x_147;
-goto block_120;
-}
-block_120:
-{
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
-x_101 = l_Lean_Meta_SavedState_restore(x_98, x_4, x_5, x_6, x_7, x_100);
-lean_dec(x_98);
-x_102 = lean_ctor_get(x_101, 1);
-lean_inc(x_102);
-lean_dec(x_101);
-x_103 = l_Lean_Meta_saveState___rarg(x_5, x_6, x_7, x_102);
-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);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_33);
-x_106 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar(x_33, x_4, x_5, x_6, x_7, x_105);
-if (lean_obj_tag(x_106) == 0)
-{
-lean_dec(x_104);
-lean_dec(x_33);
-x_51 = x_106;
-goto block_58;
-}
-else
-{
-lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
-x_107 = lean_ctor_get(x_106, 1);
-lean_inc(x_107);
-lean_dec(x_106);
-x_108 = l_Lean_Meta_SavedState_restore(x_104, x_4, x_5, x_6, x_7, x_107);
-lean_dec(x_104);
-x_109 = lean_ctor_get(x_108, 1);
-lean_inc(x_109);
-lean_dec(x_108);
-lean_inc(x_1);
-x_110 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_110, 0, x_1);
-x_111 = l_Lean_Meta_Match_proveCondEqThm_go___closed__7;
-x_112 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_112, 0, x_111);
-lean_ctor_set(x_112, 1, x_110);
-x_113 = l_Lean_Meta_Match_proveCondEqThm_go___closed__9;
-x_114 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_114, 0, x_112);
-lean_ctor_set(x_114, 1, x_113);
-x_115 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_115, 0, x_33);
-x_116 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_116, 0, x_114);
-lean_ctor_set(x_116, 1, x_115);
-x_117 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
-x_118 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_118, 0, x_116);
-lean_ctor_set(x_118, 1, x_117);
-x_119 = l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(x_118, x_4, x_5, x_6, x_7, x_109);
-x_51 = x_119;
-goto block_58;
-}
-}
-}
-}
-}
-}
-block_50:
-{
-lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_38 = lean_array_get_size(x_36);
-x_39 = lean_unsigned_to_nat(0u);
-x_40 = lean_nat_dec_lt(x_39, x_38);
-if (x_40 == 0)
-{
-lean_object* x_41; lean_object* x_42; 
-lean_dec(x_38);
-lean_dec(x_36);
-lean_dec(x_6);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_41 = lean_box(0);
-if (lean_is_scalar(x_35)) {
- x_42 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_42 = x_35;
-}
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_37);
-return x_42;
-}
-else
-{
-uint8_t x_43; 
-x_43 = lean_nat_dec_le(x_38, x_38);
-if (x_43 == 0)
-{
-lean_object* x_44; lean_object* x_45; 
-lean_dec(x_38);
-lean_dec(x_36);
-lean_dec(x_6);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_44 = lean_box(0);
-if (lean_is_scalar(x_35)) {
- x_45 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_45 = x_35;
-}
-lean_ctor_set(x_45, 0, x_44);
-lean_ctor_set(x_45, 1, x_37);
-return x_45;
-}
-else
-{
-size_t x_46; size_t x_47; lean_object* x_48; lean_object* x_49; 
-lean_dec(x_35);
-x_46 = 0;
-x_47 = lean_usize_of_nat(x_38);
-lean_dec(x_38);
-x_48 = lean_box(0);
-x_49 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_proveCondEqThm_go___spec__1(x_1, x_3, x_36, x_46, x_47, x_48, x_4, x_5, x_6, x_7, x_37);
-lean_dec(x_36);
-lean_dec(x_3);
-return x_49;
-}
-}
-}
-block_58:
-{
-if (lean_obj_tag(x_51) == 0)
-{
-lean_object* x_52; lean_object* x_53; 
-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_36 = x_52;
-x_37 = x_53;
-goto block_50;
-}
-else
-{
-uint8_t x_54; 
-lean_dec(x_35);
-lean_dec(x_6);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_54 = !lean_is_exclusive(x_51);
-if (x_54 == 0)
-{
-return x_51;
-}
-else
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_55 = lean_ctor_get(x_51, 0);
-x_56 = lean_ctor_get(x_51, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_51);
-x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_56);
-return x_57;
+x_72 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__2(x_2, x_1, x_3, x_70, x_4, x_5, x_59, x_7, x_71);
+return x_72;
 }
 }
 }
 }
 else
 {
-uint8_t x_160; 
-lean_dec(x_6);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_160 = !lean_is_exclusive(x_32);
-if (x_160 == 0)
-{
-return x_32;
-}
-else
-{
-lean_object* x_161; lean_object* x_162; lean_object* x_163; 
-x_161 = lean_ctor_get(x_32, 0);
-x_162 = lean_ctor_get(x_32, 1);
-lean_inc(x_162);
-lean_inc(x_161);
-lean_dec(x_32);
-x_163 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_163, 0, x_161);
-lean_ctor_set(x_163, 1, x_162);
-return x_163;
-}
-}
-}
-else
-{
-lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
-lean_dec(x_6);
-x_164 = lean_unsigned_to_nat(1u);
-x_165 = lean_nat_add(x_10, x_164);
-lean_dec(x_10);
-x_166 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_166, 0, x_9);
-lean_ctor_set(x_166, 1, x_165);
-lean_ctor_set(x_166, 2, x_11);
-lean_ctor_set(x_166, 3, x_12);
-lean_ctor_set(x_166, 4, x_13);
-lean_ctor_set(x_166, 5, x_14);
-lean_ctor_set(x_166, 6, x_15);
-lean_ctor_set(x_166, 7, x_16);
-lean_ctor_set(x_166, 8, x_17);
-x_167 = l_Lean_Meta_Match_proveCondEqThm_go___closed__1;
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-x_168 = l_Lean_Meta_modifyTargetEqLHS(x_2, x_167, x_4, x_5, x_166, x_7, x_8);
-if (lean_obj_tag(x_168) == 0)
-{
-lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_187; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
-x_169 = lean_ctor_get(x_168, 0);
-lean_inc(x_169);
-x_170 = lean_ctor_get(x_168, 1);
-lean_inc(x_170);
-if (lean_is_exclusive(x_168)) {
- lean_ctor_release(x_168, 0);
- lean_ctor_release(x_168, 1);
- x_171 = x_168;
-} else {
- lean_dec_ref(x_168);
- x_171 = lean_box(0);
-}
-x_195 = l_Lean_Meta_saveState___rarg(x_5, x_166, x_7, x_170);
-x_196 = lean_ctor_get(x_195, 0);
-lean_inc(x_196);
-x_197 = lean_ctor_get(x_195, 1);
-lean_inc(x_197);
-lean_dec(x_195);
-x_198 = l_Lean_Meta_Match_proveCondEqThm_go___closed__4;
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_169);
-x_199 = l_Lean_Meta_applyRefl(x_169, x_198, x_4, x_5, x_166, x_7, x_197);
-if (lean_obj_tag(x_199) == 0)
-{
-lean_object* x_200; lean_object* x_201; 
-lean_dec(x_196);
-lean_dec(x_169);
-x_200 = lean_ctor_get(x_199, 1);
-lean_inc(x_200);
-lean_dec(x_199);
-x_201 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_172 = x_201;
-x_173 = x_200;
-goto block_186;
-}
-else
-{
-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; 
-x_202 = lean_ctor_get(x_199, 1);
-lean_inc(x_202);
-lean_dec(x_199);
-x_203 = l_Lean_Meta_SavedState_restore(x_196, x_4, x_5, x_166, x_7, x_202);
-lean_dec(x_196);
-x_204 = lean_ctor_get(x_203, 1);
-lean_inc(x_204);
-lean_dec(x_203);
-x_205 = l_Lean_Meta_saveState___rarg(x_5, x_166, x_7, x_204);
-x_206 = lean_ctor_get(x_205, 0);
-lean_inc(x_206);
-x_207 = lean_ctor_get(x_205, 1);
-lean_inc(x_207);
-lean_dec(x_205);
-x_208 = l_Lean_Meta_Match_proveCondEqThm_go___closed__5;
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_169);
-x_209 = l_Lean_Meta_contradiction(x_169, x_208, x_4, x_5, x_166, x_7, x_207);
-if (lean_obj_tag(x_209) == 0)
-{
-lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; 
-lean_dec(x_206);
-lean_dec(x_169);
-x_210 = lean_ctor_get(x_209, 1);
-lean_inc(x_210);
-if (lean_is_exclusive(x_209)) {
- lean_ctor_release(x_209, 0);
- lean_ctor_release(x_209, 1);
- x_211 = x_209;
-} else {
- lean_dec_ref(x_209);
- x_211 = lean_box(0);
-}
-x_212 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-if (lean_is_scalar(x_211)) {
- x_213 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_213 = x_211;
-}
-lean_ctor_set(x_213, 0, x_212);
-lean_ctor_set(x_213, 1, x_210);
-x_187 = x_213;
-goto block_194;
-}
-else
-{
-lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; 
-x_214 = lean_ctor_get(x_209, 1);
-lean_inc(x_214);
-lean_dec(x_209);
-x_215 = l_Lean_Meta_SavedState_restore(x_206, x_4, x_5, x_166, x_7, x_214);
-lean_dec(x_206);
-x_216 = lean_ctor_get(x_215, 1);
-lean_inc(x_216);
-lean_dec(x_215);
-x_217 = l_Lean_Meta_saveState___rarg(x_5, x_166, x_7, x_216);
-x_218 = lean_ctor_get(x_217, 0);
-lean_inc(x_218);
-x_219 = lean_ctor_get(x_217, 1);
-lean_inc(x_219);
-lean_dec(x_217);
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_169);
-x_220 = l_Lean_Meta_casesOnStuckLHS(x_169, x_4, x_5, x_166, x_7, x_219);
-if (lean_obj_tag(x_220) == 0)
-{
-lean_dec(x_218);
-lean_dec(x_169);
-x_187 = x_220;
-goto block_194;
-}
-else
-{
-lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; uint8_t x_278; lean_object* x_279; 
-x_221 = lean_ctor_get(x_220, 1);
-lean_inc(x_221);
-lean_dec(x_220);
-x_222 = l_Lean_Meta_SavedState_restore(x_218, x_4, x_5, x_166, x_7, x_221);
-lean_dec(x_218);
-x_223 = lean_ctor_get(x_222, 1);
-lean_inc(x_223);
-lean_dec(x_222);
-x_224 = l_Lean_Meta_saveState___rarg(x_5, x_166, x_7, x_223);
-x_225 = lean_ctor_get(x_224, 0);
-lean_inc(x_225);
-x_226 = lean_ctor_get(x_224, 1);
-lean_inc(x_226);
-lean_dec(x_224);
-x_278 = 1;
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_169);
-x_279 = l_Lean_Meta_simpIfTarget(x_169, x_278, x_4, x_5, x_166, x_7, x_226);
-if (lean_obj_tag(x_279) == 0)
-{
-lean_object* x_280; lean_object* x_281; uint8_t x_282; 
-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_name_eq(x_280, x_169);
-if (x_282 == 0)
-{
-lean_object* x_283; lean_object* x_284; 
-lean_dec(x_225);
-lean_dec(x_169);
-x_283 = lean_box(0);
-x_284 = l_Lean_Meta_Match_proveCondEqThm_go___lambda__1(x_280, x_283, x_4, x_5, x_166, x_7, x_281);
-x_187 = x_284;
-goto block_194;
-}
-else
-{
-lean_object* x_285; lean_object* x_286; lean_object* x_287; 
-lean_dec(x_280);
-x_285 = l_Lean_Meta_Match_proveCondEqThm_go___closed__14;
-x_286 = l_Lean_throwError___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__1(x_285, x_4, x_5, x_166, x_7, x_281);
-x_287 = lean_ctor_get(x_286, 1);
-lean_inc(x_287);
-lean_dec(x_286);
-x_227 = x_287;
-goto block_277;
-}
-}
-else
-{
-lean_object* x_288; 
-x_288 = lean_ctor_get(x_279, 1);
-lean_inc(x_288);
-lean_dec(x_279);
-x_227 = x_288;
-goto block_277;
-}
-block_277:
-{
-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_255; 
-x_228 = l_Lean_Meta_SavedState_restore(x_225, x_4, x_5, x_166, x_7, x_227);
-lean_dec(x_225);
-x_229 = lean_ctor_get(x_228, 1);
-lean_inc(x_229);
-lean_dec(x_228);
-x_230 = lean_box(0);
-x_231 = l_Lean_Meta_saveState___rarg(x_5, x_166, x_7, x_229);
-x_232 = lean_ctor_get(x_231, 0);
-lean_inc(x_232);
-x_233 = lean_ctor_get(x_231, 1);
-lean_inc(x_233);
-lean_dec(x_231);
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_169);
-x_255 = l_Lean_commitWhenSome_x3f___at_Lean_Meta_splitIfTarget_x3f___spec__1___at_Lean_Meta_splitIfTarget_x3f___spec__2(x_169, x_230, x_4, x_5, x_166, x_7, x_233);
-if (lean_obj_tag(x_255) == 0)
-{
-lean_object* x_256; 
-x_256 = lean_ctor_get(x_255, 0);
-lean_inc(x_256);
-if (lean_obj_tag(x_256) == 0)
-{
-lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; 
-x_257 = lean_ctor_get(x_255, 1);
-lean_inc(x_257);
-lean_dec(x_255);
-x_258 = l_Lean_Meta_Match_proveCondEqThm_go___closed__11;
-x_259 = l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(x_258, x_4, x_5, x_166, x_7, x_257);
-x_260 = lean_ctor_get(x_259, 1);
-lean_inc(x_260);
-lean_dec(x_259);
-x_234 = x_260;
-goto block_254;
-}
-else
-{
-lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; 
-lean_dec(x_232);
-lean_dec(x_169);
-x_261 = lean_ctor_get(x_256, 0);
-lean_inc(x_261);
-lean_dec(x_256);
-x_262 = lean_ctor_get(x_255, 1);
-lean_inc(x_262);
-lean_dec(x_255);
-x_263 = lean_ctor_get(x_261, 0);
-lean_inc(x_263);
-x_264 = lean_ctor_get(x_261, 1);
-lean_inc(x_264);
-lean_dec(x_261);
-x_265 = lean_ctor_get(x_263, 0);
-lean_inc(x_265);
-x_266 = lean_ctor_get(x_263, 1);
-lean_inc(x_266);
-lean_dec(x_263);
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-x_267 = l_Lean_Meta_trySubst(x_265, x_266, x_4, x_5, x_166, x_7, x_262);
-x_268 = lean_ctor_get(x_267, 0);
-lean_inc(x_268);
-x_269 = lean_ctor_get(x_267, 1);
-lean_inc(x_269);
-if (lean_is_exclusive(x_267)) {
- lean_ctor_release(x_267, 0);
- lean_ctor_release(x_267, 1);
- x_270 = x_267;
-} else {
- lean_dec_ref(x_267);
- x_270 = lean_box(0);
-}
-x_271 = lean_ctor_get(x_264, 0);
-lean_inc(x_271);
-lean_dec(x_264);
-x_272 = l_Lean_Meta_Match_proveCondEqThm_go___closed__12;
-x_273 = lean_array_push(x_272, x_268);
-x_274 = lean_array_push(x_273, x_271);
-if (lean_is_scalar(x_270)) {
- x_275 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_275 = x_270;
-}
-lean_ctor_set(x_275, 0, x_274);
-lean_ctor_set(x_275, 1, x_269);
-x_187 = x_275;
-goto block_194;
-}
-}
-else
-{
-lean_object* x_276; 
-x_276 = lean_ctor_get(x_255, 1);
-lean_inc(x_276);
-lean_dec(x_255);
-x_234 = x_276;
-goto block_254;
-}
-block_254:
-{
-lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; 
-x_235 = l_Lean_Meta_SavedState_restore(x_232, x_4, x_5, x_166, x_7, x_234);
-lean_dec(x_232);
-x_236 = lean_ctor_get(x_235, 1);
-lean_inc(x_236);
-lean_dec(x_235);
-x_237 = l_Lean_Meta_saveState___rarg(x_5, x_166, x_7, x_236);
-x_238 = lean_ctor_get(x_237, 0);
-lean_inc(x_238);
-x_239 = lean_ctor_get(x_237, 1);
-lean_inc(x_239);
-lean_dec(x_237);
-lean_inc(x_7);
-lean_inc(x_166);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_169);
-x_240 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar(x_169, x_4, x_5, x_166, x_7, x_239);
-if (lean_obj_tag(x_240) == 0)
-{
-lean_dec(x_238);
-lean_dec(x_169);
-x_187 = x_240;
-goto block_194;
-}
-else
-{
-lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; 
-x_241 = lean_ctor_get(x_240, 1);
-lean_inc(x_241);
-lean_dec(x_240);
-x_242 = l_Lean_Meta_SavedState_restore(x_238, x_4, x_5, x_166, x_7, x_241);
-lean_dec(x_238);
-x_243 = lean_ctor_get(x_242, 1);
-lean_inc(x_243);
-lean_dec(x_242);
-lean_inc(x_1);
-x_244 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_244, 0, x_1);
-x_245 = l_Lean_Meta_Match_proveCondEqThm_go___closed__7;
-x_246 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_246, 0, x_245);
-lean_ctor_set(x_246, 1, x_244);
-x_247 = l_Lean_Meta_Match_proveCondEqThm_go___closed__9;
-x_248 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_248, 0, x_246);
-lean_ctor_set(x_248, 1, x_247);
-x_249 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_249, 0, x_169);
-x_250 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_250, 0, x_248);
-lean_ctor_set(x_250, 1, x_249);
-x_251 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
-x_252 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_252, 0, x_250);
-lean_ctor_set(x_252, 1, x_251);
-x_253 = l_Lean_throwError___at_Lean_Meta_casesOnStuckLHS___spec__1(x_252, x_4, x_5, x_166, x_7, x_243);
-x_187 = x_253;
-goto block_194;
-}
-}
-}
-}
-}
-}
-block_186:
-{
-lean_object* x_174; lean_object* x_175; uint8_t x_176; 
-x_174 = lean_array_get_size(x_172);
-x_175 = lean_unsigned_to_nat(0u);
-x_176 = lean_nat_dec_lt(x_175, x_174);
-if (x_176 == 0)
-{
-lean_object* x_177; lean_object* x_178; 
-lean_dec(x_174);
-lean_dec(x_172);
-lean_dec(x_166);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_177 = lean_box(0);
-if (lean_is_scalar(x_171)) {
- x_178 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_178 = x_171;
-}
-lean_ctor_set(x_178, 0, x_177);
-lean_ctor_set(x_178, 1, x_173);
-return x_178;
-}
-else
-{
-uint8_t x_179; 
-x_179 = lean_nat_dec_le(x_174, x_174);
-if (x_179 == 0)
-{
-lean_object* x_180; lean_object* x_181; 
-lean_dec(x_174);
-lean_dec(x_172);
-lean_dec(x_166);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_180 = lean_box(0);
-if (lean_is_scalar(x_171)) {
- x_181 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_181 = x_171;
-}
-lean_ctor_set(x_181, 0, x_180);
-lean_ctor_set(x_181, 1, x_173);
-return x_181;
-}
-else
-{
-size_t x_182; size_t x_183; lean_object* x_184; lean_object* x_185; 
-lean_dec(x_171);
-x_182 = 0;
-x_183 = lean_usize_of_nat(x_174);
-lean_dec(x_174);
-x_184 = lean_box(0);
-x_185 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_proveCondEqThm_go___spec__1(x_1, x_3, x_172, x_182, x_183, x_184, x_4, x_5, x_166, x_7, x_173);
-lean_dec(x_172);
-lean_dec(x_3);
-return x_185;
-}
-}
-}
-block_194:
-{
-if (lean_obj_tag(x_187) == 0)
-{
-lean_object* x_188; lean_object* x_189; 
-x_188 = lean_ctor_get(x_187, 0);
-lean_inc(x_188);
-x_189 = lean_ctor_get(x_187, 1);
-lean_inc(x_189);
-lean_dec(x_187);
-x_172 = x_188;
-x_173 = x_189;
-goto block_186;
-}
-else
-{
-lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; 
-lean_dec(x_171);
-lean_dec(x_166);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_190 = lean_ctor_get(x_187, 0);
-lean_inc(x_190);
-x_191 = lean_ctor_get(x_187, 1);
-lean_inc(x_191);
-if (lean_is_exclusive(x_187)) {
- lean_ctor_release(x_187, 0);
- lean_ctor_release(x_187, 1);
- x_192 = x_187;
-} else {
- lean_dec_ref(x_187);
- x_192 = lean_box(0);
-}
-if (lean_is_scalar(x_192)) {
- x_193 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_193 = x_192;
-}
-lean_ctor_set(x_193, 0, x_190);
-lean_ctor_set(x_193, 1, x_191);
-return x_193;
-}
-}
-}
-else
-{
-lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; 
-lean_dec(x_166);
-lean_dec(x_7);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_289 = lean_ctor_get(x_168, 0);
-lean_inc(x_289);
-x_290 = lean_ctor_get(x_168, 1);
-lean_inc(x_290);
-if (lean_is_exclusive(x_168)) {
- lean_ctor_release(x_168, 0);
- lean_ctor_release(x_168, 1);
- x_291 = x_168;
-} else {
- lean_dec_ref(x_168);
- x_291 = lean_box(0);
-}
-if (lean_is_scalar(x_291)) {
- x_292 = lean_alloc_ctor(1, 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_85; 
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
-lean_dec(x_13);
+lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_293 = l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_proveCondEqThm_go___spec__2(x_12, x_4, x_5, x_6, x_7, x_8);
+x_85 = l_Lean_throwMaxRecDepthAt___at_Lean_Meta_Match_proveCondEqThm_go___spec__2(x_13, 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);
-return x_293;
+return x_85;
 }
 }
 }
@@ -11925,197 +11911,261 @@ x_3 = lean_name_eq(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
-x_11 = lean_ctor_get(x_6, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_6, 1);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_6, 2);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_6, 3);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_6, 4);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_6, 5);
-lean_inc(x_16);
-x_17 = !lean_is_exclusive(x_11);
-if (x_17 == 0)
-{
-uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_18 = 1;
-lean_ctor_set_uint8(x_11, 5, x_18);
-x_19 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_19, 0, x_11);
-lean_ctor_set(x_19, 1, x_12);
-lean_ctor_set(x_19, 2, x_13);
-lean_ctor_set(x_19, 3, x_14);
-lean_ctor_set(x_19, 4, x_15);
-lean_ctor_set(x_19, 5, x_16);
-x_20 = lean_unsigned_to_nat(0u);
-lean_inc(x_9);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_10 = l_Lean_Expr_mvarId_x21(x_1);
+lean_inc(x_2);
+x_11 = lean_alloc_closure((void*)(l_Lean_Meta_Match_proveCondEqThm___lambda__1___boxed), 2, 1);
+lean_closure_set(x_11, 0, x_2);
 lean_inc(x_8);
 lean_inc(x_7);
-x_21 = l_Lean_Meta_Match_proveCondEqThm_go(x_1, x_2, x_20, x_19, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_21) == 0)
+lean_inc(x_6);
+lean_inc(x_5);
+x_12 = l_Lean_Meta_deltaTarget(x_10, x_11, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_12) == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; uint8_t x_27; uint8_t x_28; lean_object* x_29; 
-x_22 = lean_ctor_get(x_21, 1);
-lean_inc(x_22);
-lean_dec(x_21);
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_13 = lean_ctor_get(x_5, 0);
+lean_inc(x_13);
+x_14 = lean_ctor_get(x_12, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_12, 1);
+lean_inc(x_15);
+lean_dec(x_12);
+x_16 = lean_ctor_get(x_5, 1);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_5, 2);
+lean_inc(x_17);
+x_18 = lean_ctor_get(x_5, 3);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_5, 4);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_5, 5);
+lean_inc(x_20);
+x_21 = !lean_is_exclusive(x_13);
+if (x_21 == 0)
+{
+uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_22 = 1;
+lean_ctor_set_uint8(x_13, 5, x_22);
+x_23 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_23, 0, x_13);
+lean_ctor_set(x_23, 1, x_16);
+lean_ctor_set(x_23, 2, x_17);
+lean_ctor_set(x_23, 3, x_18);
+lean_ctor_set(x_23, 4, x_19);
+lean_ctor_set(x_23, 5, x_20);
+x_24 = lean_unsigned_to_nat(0u);
+lean_inc(x_8);
 lean_inc(x_7);
-x_23 = l_Lean_Meta_instantiateMVars(x_3, x_6, x_7, x_8, x_9, x_22);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
-lean_inc(x_25);
-lean_dec(x_23);
-x_26 = 0;
-x_27 = 1;
-x_28 = 1;
-x_29 = l_Lean_Meta_mkLambdaFVars(x_4, x_24, x_26, x_27, x_28, x_6, x_7, x_8, x_9, x_25);
-lean_dec(x_9);
+lean_inc(x_6);
+x_25 = l_Lean_Meta_Match_proveCondEqThm_go(x_2, x_14, x_24, x_23, x_6, x_7, x_8, x_15);
+if (lean_obj_tag(x_25) == 0)
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; uint8_t x_31; uint8_t x_32; lean_object* x_33; 
+x_26 = lean_ctor_get(x_25, 1);
+lean_inc(x_26);
+lean_dec(x_25);
+lean_inc(x_6);
+x_27 = l_Lean_Meta_instantiateMVars(x_1, x_5, x_6, x_7, x_8, x_26);
+x_28 = lean_ctor_get(x_27, 0);
+lean_inc(x_28);
+x_29 = lean_ctor_get(x_27, 1);
+lean_inc(x_29);
+lean_dec(x_27);
+x_30 = 0;
+x_31 = 1;
+x_32 = 1;
+x_33 = l_Lean_Meta_mkLambdaFVars(x_3, x_28, x_30, x_31, x_32, x_5, x_6, x_7, x_8, x_29);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-return x_29;
-}
-else
-{
-uint8_t x_30; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-x_30 = !lean_is_exclusive(x_21);
-if (x_30 == 0)
-{
-return x_21;
-}
-else
-{
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = lean_ctor_get(x_21, 0);
-x_32 = lean_ctor_get(x_21, 1);
-lean_inc(x_32);
-lean_inc(x_31);
-lean_dec(x_21);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
+lean_dec(x_5);
 return x_33;
 }
+else
+{
+uint8_t x_34; 
+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_34 = !lean_is_exclusive(x_25);
+if (x_34 == 0)
+{
+return x_25;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_25, 0);
+x_36 = lean_ctor_get(x_25, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_25);
+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
 {
-uint8_t x_34; uint8_t x_35; uint8_t x_36; uint8_t x_37; uint8_t x_38; uint8_t x_39; uint8_t x_40; uint8_t x_41; uint8_t x_42; uint8_t x_43; uint8_t x_44; uint8_t x_45; uint8_t x_46; uint8_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_34 = lean_ctor_get_uint8(x_11, 0);
-x_35 = lean_ctor_get_uint8(x_11, 1);
-x_36 = lean_ctor_get_uint8(x_11, 2);
-x_37 = lean_ctor_get_uint8(x_11, 3);
-x_38 = lean_ctor_get_uint8(x_11, 4);
-x_39 = lean_ctor_get_uint8(x_11, 6);
-x_40 = lean_ctor_get_uint8(x_11, 7);
-x_41 = lean_ctor_get_uint8(x_11, 8);
-x_42 = lean_ctor_get_uint8(x_11, 9);
-x_43 = lean_ctor_get_uint8(x_11, 10);
-x_44 = lean_ctor_get_uint8(x_11, 11);
-x_45 = lean_ctor_get_uint8(x_11, 12);
-x_46 = lean_ctor_get_uint8(x_11, 13);
-lean_dec(x_11);
-x_47 = 1;
-x_48 = lean_alloc_ctor(0, 0, 14);
-lean_ctor_set_uint8(x_48, 0, x_34);
-lean_ctor_set_uint8(x_48, 1, x_35);
-lean_ctor_set_uint8(x_48, 2, x_36);
-lean_ctor_set_uint8(x_48, 3, x_37);
-lean_ctor_set_uint8(x_48, 4, x_38);
-lean_ctor_set_uint8(x_48, 5, x_47);
-lean_ctor_set_uint8(x_48, 6, x_39);
-lean_ctor_set_uint8(x_48, 7, x_40);
-lean_ctor_set_uint8(x_48, 8, x_41);
-lean_ctor_set_uint8(x_48, 9, x_42);
-lean_ctor_set_uint8(x_48, 10, x_43);
-lean_ctor_set_uint8(x_48, 11, x_44);
-lean_ctor_set_uint8(x_48, 12, x_45);
-lean_ctor_set_uint8(x_48, 13, x_46);
-x_49 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_49, 0, x_48);
-lean_ctor_set(x_49, 1, x_12);
-lean_ctor_set(x_49, 2, x_13);
-lean_ctor_set(x_49, 3, x_14);
-lean_ctor_set(x_49, 4, x_15);
-lean_ctor_set(x_49, 5, x_16);
-x_50 = lean_unsigned_to_nat(0u);
-lean_inc(x_9);
+uint8_t x_38; uint8_t x_39; uint8_t x_40; uint8_t x_41; uint8_t x_42; uint8_t x_43; uint8_t x_44; uint8_t x_45; uint8_t x_46; uint8_t x_47; uint8_t x_48; uint8_t x_49; uint8_t x_50; uint8_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_38 = lean_ctor_get_uint8(x_13, 0);
+x_39 = lean_ctor_get_uint8(x_13, 1);
+x_40 = lean_ctor_get_uint8(x_13, 2);
+x_41 = lean_ctor_get_uint8(x_13, 3);
+x_42 = lean_ctor_get_uint8(x_13, 4);
+x_43 = lean_ctor_get_uint8(x_13, 6);
+x_44 = lean_ctor_get_uint8(x_13, 7);
+x_45 = lean_ctor_get_uint8(x_13, 8);
+x_46 = lean_ctor_get_uint8(x_13, 9);
+x_47 = lean_ctor_get_uint8(x_13, 10);
+x_48 = lean_ctor_get_uint8(x_13, 11);
+x_49 = lean_ctor_get_uint8(x_13, 12);
+x_50 = lean_ctor_get_uint8(x_13, 13);
+lean_dec(x_13);
+x_51 = 1;
+x_52 = lean_alloc_ctor(0, 0, 14);
+lean_ctor_set_uint8(x_52, 0, x_38);
+lean_ctor_set_uint8(x_52, 1, x_39);
+lean_ctor_set_uint8(x_52, 2, x_40);
+lean_ctor_set_uint8(x_52, 3, x_41);
+lean_ctor_set_uint8(x_52, 4, x_42);
+lean_ctor_set_uint8(x_52, 5, x_51);
+lean_ctor_set_uint8(x_52, 6, x_43);
+lean_ctor_set_uint8(x_52, 7, x_44);
+lean_ctor_set_uint8(x_52, 8, x_45);
+lean_ctor_set_uint8(x_52, 9, x_46);
+lean_ctor_set_uint8(x_52, 10, x_47);
+lean_ctor_set_uint8(x_52, 11, x_48);
+lean_ctor_set_uint8(x_52, 12, x_49);
+lean_ctor_set_uint8(x_52, 13, x_50);
+x_53 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_16);
+lean_ctor_set(x_53, 2, x_17);
+lean_ctor_set(x_53, 3, x_18);
+lean_ctor_set(x_53, 4, x_19);
+lean_ctor_set(x_53, 5, x_20);
+x_54 = lean_unsigned_to_nat(0u);
 lean_inc(x_8);
 lean_inc(x_7);
-x_51 = l_Lean_Meta_Match_proveCondEqThm_go(x_1, x_2, x_50, x_49, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_51) == 0)
+lean_inc(x_6);
+x_55 = l_Lean_Meta_Match_proveCondEqThm_go(x_2, x_14, x_54, x_53, x_6, x_7, x_8, x_15);
+if (lean_obj_tag(x_55) == 0)
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; uint8_t x_57; uint8_t x_58; lean_object* x_59; 
-x_52 = lean_ctor_get(x_51, 1);
-lean_inc(x_52);
-lean_dec(x_51);
-lean_inc(x_7);
-x_53 = l_Lean_Meta_instantiateMVars(x_3, x_6, x_7, x_8, x_9, x_52);
-x_54 = lean_ctor_get(x_53, 0);
-lean_inc(x_54);
-x_55 = lean_ctor_get(x_53, 1);
-lean_inc(x_55);
-lean_dec(x_53);
-x_56 = 0;
-x_57 = 1;
-x_58 = 1;
-x_59 = l_Lean_Meta_mkLambdaFVars(x_4, x_54, x_56, x_57, x_58, x_6, x_7, x_8, x_9, x_55);
-lean_dec(x_9);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; uint8_t x_61; uint8_t x_62; lean_object* x_63; 
+x_56 = lean_ctor_get(x_55, 1);
+lean_inc(x_56);
+lean_dec(x_55);
+lean_inc(x_6);
+x_57 = l_Lean_Meta_instantiateMVars(x_1, x_5, x_6, x_7, x_8, x_56);
+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 = 0;
+x_61 = 1;
+x_62 = 1;
+x_63 = l_Lean_Meta_mkLambdaFVars(x_3, x_58, x_60, x_61, x_62, x_5, x_6, x_7, x_8, x_59);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-return x_59;
+lean_dec(x_5);
+return x_63;
 }
 else
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-lean_dec(x_9);
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_4);
+lean_dec(x_5);
 lean_dec(x_3);
-x_60 = lean_ctor_get(x_51, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_51, 1);
-lean_inc(x_61);
-if (lean_is_exclusive(x_51)) {
- lean_ctor_release(x_51, 0);
- lean_ctor_release(x_51, 1);
- x_62 = x_51;
+lean_dec(x_1);
+x_64 = lean_ctor_get(x_55, 0);
+lean_inc(x_64);
+x_65 = lean_ctor_get(x_55, 1);
+lean_inc(x_65);
+if (lean_is_exclusive(x_55)) {
+ lean_ctor_release(x_55, 0);
+ lean_ctor_release(x_55, 1);
+ x_66 = x_55;
 } else {
- lean_dec_ref(x_51);
- x_62 = lean_box(0);
+ lean_dec_ref(x_55);
+ x_66 = lean_box(0);
 }
-if (lean_is_scalar(x_62)) {
- x_63 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_66)) {
+ x_67 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_63 = x_62;
+ x_67 = x_66;
 }
-lean_ctor_set(x_63, 0, x_60);
-lean_ctor_set(x_63, 1, x_61);
-return x_63;
+lean_ctor_set(x_67, 0, x_64);
+lean_ctor_set(x_67, 1, x_65);
+return x_67;
 }
 }
 }
+else
+{
+uint8_t x_68; 
+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_68 = !lean_is_exclusive(x_12);
+if (x_68 == 0)
+{
+return x_12;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_12, 0);
+x_70 = lean_ctor_get(x_12, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_12);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("proveCondEqThm ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
 }
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
 x_9 = lean_box(0);
 lean_inc(x_4);
 x_10 = l_Lean_Meta_mkFreshExprSyntheticOpaqueMVar(x_3, x_9, x_4, x_5, x_6, x_7, x_8);
@@ -12124,124 +12174,95 @@ lean_inc(x_11);
 x_12 = lean_ctor_get(x_10, 1);
 lean_inc(x_12);
 lean_dec(x_10);
-x_13 = l_Lean_Expr_mvarId_x21(x_11);
-lean_inc(x_1);
-x_14 = lean_alloc_closure((void*)(l_Lean_Meta_Match_proveCondEqThm___lambda__1___boxed), 2, 1);
-lean_closure_set(x_14, 0, x_1);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_15 = l_Lean_Meta_deltaTarget(x_13, x_14, x_4, x_5, x_6, x_7, x_12);
-if (lean_obj_tag(x_15) == 0)
+x_13 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
+x_29 = lean_st_ref_get(x_7, x_12);
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_30, 3);
+lean_inc(x_31);
+lean_dec(x_30);
+x_32 = lean_ctor_get_uint8(x_31, sizeof(void*)*1);
+lean_dec(x_31);
+if (x_32 == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-x_16 = lean_ctor_get(x_15, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_15, 1);
-lean_inc(x_17);
-lean_dec(x_15);
-x_18 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
-x_32 = lean_st_ref_get(x_7, x_17);
-x_33 = lean_ctor_get(x_32, 0);
+lean_object* x_33; uint8_t x_34; 
+x_33 = lean_ctor_get(x_29, 1);
 lean_inc(x_33);
-x_34 = lean_ctor_get(x_33, 3);
-lean_inc(x_34);
-lean_dec(x_33);
-x_35 = lean_ctor_get_uint8(x_34, sizeof(void*)*1);
-lean_dec(x_34);
-if (x_35 == 0)
-{
-lean_object* x_36; uint8_t x_37; 
-x_36 = lean_ctor_get(x_32, 1);
-lean_inc(x_36);
-lean_dec(x_32);
-x_37 = 0;
-x_19 = x_37;
-x_20 = x_36;
-goto block_31;
+lean_dec(x_29);
+x_34 = 0;
+x_14 = x_34;
+x_15 = x_33;
+goto block_28;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; 
-x_38 = lean_ctor_get(x_32, 1);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+x_35 = lean_ctor_get(x_29, 1);
+lean_inc(x_35);
+lean_dec(x_29);
+x_36 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_13, x_4, x_5, x_6, x_7, x_35);
+x_37 = lean_ctor_get(x_36, 0);
+lean_inc(x_37);
+x_38 = lean_ctor_get(x_36, 1);
 lean_inc(x_38);
-lean_dec(x_32);
-x_39 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_18, x_4, x_5, x_6, x_7, x_38);
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
-lean_inc(x_41);
-lean_dec(x_39);
-x_42 = lean_unbox(x_40);
-lean_dec(x_40);
-x_19 = x_42;
-x_20 = x_41;
-goto block_31;
+lean_dec(x_36);
+x_39 = lean_unbox(x_37);
+lean_dec(x_37);
+x_14 = x_39;
+x_15 = x_38;
+goto block_28;
 }
-block_31:
+block_28:
 {
-if (x_19 == 0)
+if (x_14 == 0)
 {
-lean_object* x_21; lean_object* x_22; 
-x_21 = lean_box(0);
-x_22 = l_Lean_Meta_Match_proveCondEqThm___lambda__2(x_1, x_16, x_11, x_2, x_21, x_4, x_5, x_6, x_7, x_20);
-return x_22;
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_box(0);
+x_17 = l_Lean_Meta_Match_proveCondEqThm___lambda__2(x_11, x_1, x_2, x_16, x_4, x_5, x_6, x_7, x_15);
+return x_17;
 }
 else
 {
-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_inc(x_16);
-x_23 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_23, 0, x_16);
-x_24 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
-x_25 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_23);
-x_26 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_24);
-x_27 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_18, x_26, x_4, x_5, x_6, x_7, x_20);
-x_28 = lean_ctor_get(x_27, 0);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_27, 1);
-lean_inc(x_29);
-lean_dec(x_27);
-x_30 = l_Lean_Meta_Match_proveCondEqThm___lambda__2(x_1, x_16, x_11, x_2, x_28, x_4, x_5, x_6, x_7, x_29);
-lean_dec(x_28);
-return x_30;
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_18 = l_Lean_Expr_mvarId_x21(x_11);
+x_19 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_19, 0, x_18);
+x_20 = l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__2;
+x_21 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_19);
+x_22 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_23 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+x_24 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_13, x_23, x_4, x_5, x_6, x_7, x_15);
+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 = l_Lean_Meta_Match_proveCondEqThm___lambda__2(x_11, x_1, x_2, x_25, x_4, x_5, x_6, x_7, x_26);
+lean_dec(x_25);
+return x_27;
 }
 }
 }
-else
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
 {
-uint8_t x_43; 
-lean_dec(x_11);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_43 = !lean_is_exclusive(x_15);
-if (x_43 == 0)
-{
-return x_15;
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_15, 0);
-x_45 = lean_ctor_get(x_15, 1);
-lean_inc(x_45);
-lean_inc(x_44);
-lean_dec(x_15);
-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* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_inc(x_4);
+x_8 = l_Lean_Meta_instantiateMVars(x_1, x_3, x_4, x_5, x_6, x_7);
+x_9 = lean_ctor_get(x_8, 0);
+lean_inc(x_9);
+x_10 = lean_ctor_get(x_8, 1);
+lean_inc(x_10);
+lean_dec(x_8);
+x_11 = lean_alloc_closure((void*)(l_Lean_Meta_Match_proveCondEqThm___lambda__3), 8, 1);
+lean_closure_set(x_11, 0, x_2);
+x_12 = l_Lean_Meta_forallTelescope___at___private_Lean_Meta_InferType_0__Lean_Meta_inferForallType___spec__2___rarg(x_9, x_11, x_3, x_4, x_5, x_6, x_10);
+return x_12;
 }
 }
 static lean_object* _init_l_Lean_Meta_Match_proveCondEqThm___closed__1() {
@@ -12325,23 +12346,14 @@ return x_3;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-lean_inc(x_4);
-x_8 = l_Lean_Meta_instantiateMVars(x_2, x_3, x_4, x_5, x_6, x_7);
-x_9 = lean_ctor_get(x_8, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_8, 1);
-lean_inc(x_10);
-lean_dec(x_8);
-x_11 = lean_alloc_closure((void*)(l_Lean_Meta_Match_proveCondEqThm___lambda__3), 8, 1);
-lean_closure_set(x_11, 0, x_1);
-x_12 = lean_alloc_closure((void*)(l_Lean_Meta_forallTelescope___at___private_Lean_Meta_InferType_0__Lean_Meta_inferForallType___spec__2___rarg), 7, 2);
-lean_closure_set(x_12, 0, x_9);
-lean_closure_set(x_12, 1, x_11);
-x_13 = l_Lean_Meta_Match_proveCondEqThm___closed__7;
-x_14 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_15 = l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(x_13, x_14, x_12, x_3, x_4, x_5, x_6, x_10);
-return x_15;
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_8 = lean_alloc_closure((void*)(l_Lean_Meta_Match_proveCondEqThm___lambda__4), 7, 2);
+lean_closure_set(x_8, 0, x_2);
+lean_closure_set(x_8, 1, x_1);
+x_9 = l_Lean_Meta_Match_proveCondEqThm___closed__7;
+x_10 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_11 = l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(x_9, x_10, x_8, x_3, x_4, x_5, x_6, x_7);
+return x_11;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__1___boxed(lean_object* x_1, lean_object* x_2) {
@@ -12355,13 +12367,13 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_proveCondEqThm___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_11; 
-x_11 = l_Lean_Meta_Match_proveCondEqThm___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_5);
-return x_11;
+lean_object* x_10; 
+x_10 = l_Lean_Meta_Match_proveCondEqThm___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_4);
+return x_10;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts_go___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
@@ -13710,7 +13722,7 @@ x_101 = l_Lean_Exception_toMessageData(x_81);
 x_102 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_102, 0, x_100);
 lean_ctor_set(x_102, 1, x_101);
-x_103 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_103 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_104 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_104, 0, x_102);
 lean_ctor_set(x_104, 1, x_103);
@@ -14615,7 +14627,7 @@ x_106 = l_Lean_Exception_toMessageData(x_86);
 x_107 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_107, 0, x_105);
 lean_ctor_set(x_107, 1, x_106);
-x_108 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_108 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_109 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_109, 0, x_107);
 lean_ctor_set(x_109, 1, x_108);
@@ -17882,303 +17894,243 @@ return x_5;
 }
 else
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+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_2, x_4);
 x_8 = lean_ctor_get(x_5, 1);
 lean_inc(x_8);
 x_9 = lean_ctor_get(x_8, 1);
 lean_inc(x_9);
-x_10 = !lean_is_exclusive(x_5);
-if (x_10 == 0)
+x_10 = lean_ctor_get(x_9, 1);
+lean_inc(x_10);
+x_11 = !lean_is_exclusive(x_5);
+if (x_11 == 0)
 {
-lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_11 = lean_ctor_get(x_5, 0);
-x_12 = lean_ctor_get(x_5, 1);
-lean_dec(x_12);
-x_13 = !lean_is_exclusive(x_8);
-if (x_13 == 0)
+lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_12 = lean_ctor_get(x_5, 0);
+x_13 = lean_ctor_get(x_5, 1);
+lean_dec(x_13);
+x_14 = !lean_is_exclusive(x_8);
+if (x_14 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_ctor_get(x_8, 0);
-x_15 = lean_ctor_get(x_8, 1);
-lean_dec(x_15);
-x_16 = lean_ctor_get(x_9, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_9, 1);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_9, 2);
-lean_inc(x_18);
-x_19 = lean_nat_dec_lt(x_17, x_18);
-if (x_19 == 0)
-{
-lean_dec(x_18);
-lean_dec(x_17);
+lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_15 = lean_ctor_get(x_8, 0);
+x_16 = lean_ctor_get(x_8, 1);
 lean_dec(x_16);
-lean_dec(x_7);
-return x_5;
-}
-else
+x_17 = !lean_is_exclusive(x_9);
+if (x_17 == 0)
 {
-uint8_t x_20; 
-x_20 = !lean_is_exclusive(x_9);
-if (x_20 == 0)
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+x_18 = lean_ctor_get(x_9, 0);
+x_19 = lean_ctor_get(x_9, 1);
+lean_dec(x_19);
+x_20 = lean_ctor_get(x_10, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_10, 1);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_10, 2);
+lean_inc(x_22);
+x_23 = lean_nat_dec_lt(x_21, x_22);
+if (x_23 == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
-x_21 = lean_ctor_get(x_9, 2);
-lean_dec(x_21);
-x_22 = lean_ctor_get(x_9, 1);
 lean_dec(x_22);
-x_23 = lean_ctor_get(x_9, 0);
-lean_dec(x_23);
-x_24 = lean_array_fget(x_16, x_17);
-x_25 = lean_unsigned_to_nat(1u);
-x_26 = lean_nat_add(x_17, x_25);
-lean_dec(x_17);
-lean_ctor_set(x_9, 1, x_26);
-x_27 = lean_ctor_get(x_14, 0);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_14, 1);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_14, 2);
-lean_inc(x_29);
-x_30 = lean_nat_dec_lt(x_28, x_29);
-if (x_30 == 0)
+lean_dec(x_21);
+lean_dec(x_20);
+lean_dec(x_7);
+return x_5;
+}
+else
 {
-lean_dec(x_29);
-lean_dec(x_28);
+uint8_t x_24; 
+x_24 = !lean_is_exclusive(x_10);
+if (x_24 == 0)
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_25 = lean_ctor_get(x_10, 2);
+lean_dec(x_25);
+x_26 = lean_ctor_get(x_10, 1);
+lean_dec(x_26);
+x_27 = lean_ctor_get(x_10, 0);
 lean_dec(x_27);
-lean_dec(x_24);
-lean_dec(x_7);
-return x_5;
-}
-else
+x_28 = lean_array_fget(x_20, x_21);
+x_29 = lean_unsigned_to_nat(1u);
+x_30 = lean_nat_add(x_21, x_29);
+lean_dec(x_21);
+lean_ctor_set(x_10, 1, x_30);
+x_31 = lean_ctor_get(x_18, 0);
+lean_inc(x_31);
+x_32 = lean_ctor_get(x_18, 1);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_18, 2);
+lean_inc(x_33);
+x_34 = lean_nat_dec_lt(x_32, x_33);
+if (x_34 == 0)
 {
-uint8_t x_31; 
-x_31 = !lean_is_exclusive(x_14);
-if (x_31 == 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; lean_object* x_38; lean_object* x_39; size_t x_40; size_t x_41; 
-x_32 = lean_ctor_get(x_14, 2);
-lean_dec(x_32);
-x_33 = lean_ctor_get(x_14, 1);
 lean_dec(x_33);
-x_34 = lean_ctor_get(x_14, 0);
-lean_dec(x_34);
-x_35 = lean_array_fget(x_27, x_28);
-x_36 = lean_nat_add(x_28, x_25);
+lean_dec(x_32);
+lean_dec(x_31);
 lean_dec(x_28);
-lean_ctor_set(x_14, 1, x_36);
-x_37 = l_Lean_Expr_fvarId_x21(x_7);
-x_38 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_24);
-x_39 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_37, x_38);
-lean_ctor_set(x_5, 0, x_39);
-x_40 = 1;
-x_41 = lean_usize_add(x_4, x_40);
-x_4 = x_41;
-goto _start;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; size_t x_49; size_t x_50; 
-lean_dec(x_14);
-x_43 = lean_array_fget(x_27, x_28);
-x_44 = lean_nat_add(x_28, x_25);
-lean_dec(x_28);
-x_45 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_45, 0, x_27);
-lean_ctor_set(x_45, 1, x_44);
-lean_ctor_set(x_45, 2, x_29);
-x_46 = l_Lean_Expr_fvarId_x21(x_7);
-x_47 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_47, 0, x_43);
-lean_ctor_set(x_47, 1, x_24);
-lean_ctor_set(x_8, 0, x_45);
-x_48 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_46, x_47);
-lean_ctor_set(x_5, 0, x_48);
-x_49 = 1;
-x_50 = lean_usize_add(x_4, x_49);
-x_4 = x_50;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; 
-lean_dec(x_9);
-x_52 = lean_array_fget(x_16, x_17);
-x_53 = lean_unsigned_to_nat(1u);
-x_54 = lean_nat_add(x_17, x_53);
-lean_dec(x_17);
-x_55 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_55, 0, x_16);
-lean_ctor_set(x_55, 1, x_54);
-lean_ctor_set(x_55, 2, x_18);
-x_56 = lean_ctor_get(x_14, 0);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_14, 1);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_14, 2);
-lean_inc(x_58);
-x_59 = lean_nat_dec_lt(x_57, x_58);
-if (x_59 == 0)
-{
-lean_dec(x_58);
-lean_dec(x_57);
-lean_dec(x_56);
-lean_dec(x_52);
 lean_dec(x_7);
-lean_ctor_set(x_8, 1, x_55);
 return x_5;
 }
 else
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; size_t x_67; size_t x_68; 
-if (lean_is_exclusive(x_14)) {
- lean_ctor_release(x_14, 0);
- lean_ctor_release(x_14, 1);
- lean_ctor_release(x_14, 2);
- x_60 = x_14;
-} else {
- lean_dec_ref(x_14);
- x_60 = lean_box(0);
+uint8_t x_35; 
+x_35 = !lean_is_exclusive(x_18);
+if (x_35 == 0)
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+x_36 = lean_ctor_get(x_18, 2);
+lean_dec(x_36);
+x_37 = lean_ctor_get(x_18, 1);
+lean_dec(x_37);
+x_38 = lean_ctor_get(x_18, 0);
+lean_dec(x_38);
+x_39 = lean_array_fget(x_31, x_32);
+x_40 = lean_nat_add(x_32, x_29);
+lean_dec(x_32);
+lean_ctor_set(x_18, 1, x_40);
+x_41 = lean_ctor_get(x_15, 0);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_15, 1);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_15, 2);
+lean_inc(x_43);
+x_44 = lean_nat_dec_lt(x_42, x_43);
+if (x_44 == 0)
+{
+lean_dec(x_43);
+lean_dec(x_42);
+lean_dec(x_41);
+lean_dec(x_39);
+lean_dec(x_28);
+lean_dec(x_7);
+return x_5;
 }
-x_61 = lean_array_fget(x_56, x_57);
-x_62 = lean_nat_add(x_57, x_53);
-lean_dec(x_57);
-if (lean_is_scalar(x_60)) {
- x_63 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_63 = x_60;
-}
-lean_ctor_set(x_63, 0, x_56);
-lean_ctor_set(x_63, 1, x_62);
-lean_ctor_set(x_63, 2, x_58);
-x_64 = l_Lean_Expr_fvarId_x21(x_7);
-x_65 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_65, 0, x_61);
-lean_ctor_set(x_65, 1, x_52);
-lean_ctor_set(x_8, 1, x_55);
-lean_ctor_set(x_8, 0, x_63);
-x_66 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_64, x_65);
-lean_ctor_set(x_5, 0, x_66);
-x_67 = 1;
-x_68 = lean_usize_add(x_4, x_67);
-x_4 = x_68;
+else
+{
+uint8_t x_45; 
+x_45 = !lean_is_exclusive(x_15);
+if (x_45 == 0)
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; size_t x_55; size_t x_56; 
+x_46 = lean_ctor_get(x_15, 2);
+lean_dec(x_46);
+x_47 = lean_ctor_get(x_15, 1);
+lean_dec(x_47);
+x_48 = lean_ctor_get(x_15, 0);
+lean_dec(x_48);
+x_49 = lean_array_fget(x_41, x_42);
+x_50 = lean_nat_add(x_42, x_29);
+lean_dec(x_42);
+lean_ctor_set(x_15, 1, x_50);
+x_51 = l_Lean_Expr_fvarId_x21(x_7);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_39);
+lean_ctor_set(x_52, 1, x_28);
+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 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_12, x_51, x_53);
+lean_ctor_set(x_5, 0, x_54);
+x_55 = 1;
+x_56 = lean_usize_add(x_4, x_55);
+x_4 = x_56;
 goto _start;
 }
+else
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; size_t x_65; size_t x_66; 
+lean_dec(x_15);
+x_58 = lean_array_fget(x_41, x_42);
+x_59 = lean_nat_add(x_42, x_29);
+lean_dec(x_42);
+x_60 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_60, 0, x_41);
+lean_ctor_set(x_60, 1, x_59);
+lean_ctor_set(x_60, 2, x_43);
+x_61 = l_Lean_Expr_fvarId_x21(x_7);
+x_62 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_62, 0, x_39);
+lean_ctor_set(x_62, 1, x_28);
+x_63 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_63, 0, x_58);
+lean_ctor_set(x_63, 1, x_62);
+lean_ctor_set(x_8, 0, x_60);
+x_64 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_12, x_61, x_63);
+lean_ctor_set(x_5, 0, x_64);
+x_65 = 1;
+x_66 = lean_usize_add(x_4, x_65);
+x_4 = x_66;
+goto _start;
 }
 }
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; 
-x_70 = lean_ctor_get(x_8, 0);
-lean_inc(x_70);
-lean_dec(x_8);
-x_71 = lean_ctor_get(x_9, 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; uint8_t x_74; 
+lean_dec(x_18);
+x_68 = lean_array_fget(x_31, x_32);
+x_69 = lean_nat_add(x_32, x_29);
+lean_dec(x_32);
+x_70 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_70, 0, x_31);
+lean_ctor_set(x_70, 1, x_69);
+lean_ctor_set(x_70, 2, x_33);
+x_71 = lean_ctor_get(x_15, 0);
 lean_inc(x_71);
-x_72 = lean_ctor_get(x_9, 1);
+x_72 = lean_ctor_get(x_15, 1);
 lean_inc(x_72);
-x_73 = lean_ctor_get(x_9, 2);
+x_73 = lean_ctor_get(x_15, 2);
 lean_inc(x_73);
 x_74 = lean_nat_dec_lt(x_72, x_73);
 if (x_74 == 0)
 {
-lean_object* x_75; 
 lean_dec(x_73);
 lean_dec(x_72);
 lean_dec(x_71);
+lean_dec(x_68);
+lean_dec(x_28);
 lean_dec(x_7);
-x_75 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_75, 0, x_70);
-lean_ctor_set(x_75, 1, x_9);
-lean_ctor_set(x_5, 1, x_75);
+lean_ctor_set(x_9, 0, x_70);
 return x_5;
 }
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; 
-if (lean_is_exclusive(x_9)) {
- lean_ctor_release(x_9, 0);
- lean_ctor_release(x_9, 1);
- lean_ctor_release(x_9, 2);
- x_76 = x_9;
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; size_t x_83; size_t x_84; 
+if (lean_is_exclusive(x_15)) {
+ lean_ctor_release(x_15, 0);
+ lean_ctor_release(x_15, 1);
+ lean_ctor_release(x_15, 2);
+ x_75 = x_15;
 } else {
- lean_dec_ref(x_9);
- x_76 = lean_box(0);
+ lean_dec_ref(x_15);
+ x_75 = lean_box(0);
 }
-x_77 = lean_array_fget(x_71, x_72);
-x_78 = lean_unsigned_to_nat(1u);
-x_79 = lean_nat_add(x_72, x_78);
+x_76 = lean_array_fget(x_71, x_72);
+x_77 = lean_nat_add(x_72, x_29);
 lean_dec(x_72);
-if (lean_is_scalar(x_76)) {
- x_80 = lean_alloc_ctor(0, 3, 0);
+if (lean_is_scalar(x_75)) {
+ x_78 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_80 = x_76;
+ x_78 = x_75;
 }
-lean_ctor_set(x_80, 0, x_71);
-lean_ctor_set(x_80, 1, x_79);
-lean_ctor_set(x_80, 2, x_73);
-x_81 = lean_ctor_get(x_70, 0);
-lean_inc(x_81);
-x_82 = lean_ctor_get(x_70, 1);
-lean_inc(x_82);
-x_83 = lean_ctor_get(x_70, 2);
-lean_inc(x_83);
-x_84 = lean_nat_dec_lt(x_82, x_83);
-if (x_84 == 0)
-{
-lean_object* x_85; 
-lean_dec(x_83);
-lean_dec(x_82);
-lean_dec(x_81);
-lean_dec(x_77);
-lean_dec(x_7);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_70);
-lean_ctor_set(x_85, 1, x_80);
-lean_ctor_set(x_5, 1, x_85);
-return x_5;
-}
-else
-{
-lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; size_t x_94; size_t x_95; 
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- lean_ctor_release(x_70, 2);
- x_86 = x_70;
-} else {
- lean_dec_ref(x_70);
- x_86 = lean_box(0);
-}
-x_87 = lean_array_fget(x_81, x_82);
-x_88 = lean_nat_add(x_82, x_78);
-lean_dec(x_82);
-if (lean_is_scalar(x_86)) {
- x_89 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_89 = x_86;
-}
-lean_ctor_set(x_89, 0, x_81);
-lean_ctor_set(x_89, 1, x_88);
-lean_ctor_set(x_89, 2, x_83);
-x_90 = l_Lean_Expr_fvarId_x21(x_7);
-x_91 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_91, 0, x_87);
-lean_ctor_set(x_91, 1, x_77);
-x_92 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_92, 0, x_89);
-lean_ctor_set(x_92, 1, x_80);
-x_93 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_90, x_91);
-lean_ctor_set(x_5, 1, x_92);
-lean_ctor_set(x_5, 0, x_93);
-x_94 = 1;
-x_95 = lean_usize_add(x_4, x_94);
-x_4 = x_95;
+lean_ctor_set(x_78, 0, x_71);
+lean_ctor_set(x_78, 1, x_77);
+lean_ctor_set(x_78, 2, x_73);
+x_79 = l_Lean_Expr_fvarId_x21(x_7);
+x_80 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_80, 0, x_68);
+lean_ctor_set(x_80, 1, x_28);
+x_81 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_81, 0, x_76);
+lean_ctor_set(x_81, 1, x_80);
+lean_ctor_set(x_9, 0, x_70);
+lean_ctor_set(x_8, 0, x_78);
+x_82 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_12, x_79, x_81);
+lean_ctor_set(x_5, 0, x_82);
+x_83 = 1;
+x_84 = lean_usize_add(x_4, x_83);
+x_4 = x_84;
 goto _start;
 }
 }
@@ -18186,139 +18138,707 @@ goto _start;
 }
 else
 {
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; uint8_t x_103; 
-x_97 = lean_ctor_get(x_5, 0);
-lean_inc(x_97);
-lean_dec(x_5);
-x_98 = lean_ctor_get(x_8, 0);
+lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; 
+lean_dec(x_10);
+x_86 = lean_array_fget(x_20, x_21);
+x_87 = lean_unsigned_to_nat(1u);
+x_88 = lean_nat_add(x_21, x_87);
+lean_dec(x_21);
+x_89 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_89, 0, x_20);
+lean_ctor_set(x_89, 1, x_88);
+lean_ctor_set(x_89, 2, x_22);
+x_90 = lean_ctor_get(x_18, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_18, 1);
+lean_inc(x_91);
+x_92 = lean_ctor_get(x_18, 2);
+lean_inc(x_92);
+x_93 = lean_nat_dec_lt(x_91, x_92);
+if (x_93 == 0)
+{
+lean_dec(x_92);
+lean_dec(x_91);
+lean_dec(x_90);
+lean_dec(x_86);
+lean_dec(x_7);
+lean_ctor_set(x_9, 1, x_89);
+return x_5;
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; uint8_t x_101; 
+if (lean_is_exclusive(x_18)) {
+ lean_ctor_release(x_18, 0);
+ lean_ctor_release(x_18, 1);
+ lean_ctor_release(x_18, 2);
+ x_94 = x_18;
+} else {
+ lean_dec_ref(x_18);
+ x_94 = lean_box(0);
+}
+x_95 = lean_array_fget(x_90, x_91);
+x_96 = lean_nat_add(x_91, x_87);
+lean_dec(x_91);
+if (lean_is_scalar(x_94)) {
+ x_97 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_97 = x_94;
+}
+lean_ctor_set(x_97, 0, x_90);
+lean_ctor_set(x_97, 1, x_96);
+lean_ctor_set(x_97, 2, x_92);
+x_98 = lean_ctor_get(x_15, 0);
 lean_inc(x_98);
+x_99 = lean_ctor_get(x_15, 1);
+lean_inc(x_99);
+x_100 = lean_ctor_get(x_15, 2);
+lean_inc(x_100);
+x_101 = lean_nat_dec_lt(x_99, x_100);
+if (x_101 == 0)
+{
+lean_dec(x_100);
+lean_dec(x_99);
+lean_dec(x_98);
+lean_dec(x_95);
+lean_dec(x_86);
+lean_dec(x_7);
+lean_ctor_set(x_9, 1, x_89);
+lean_ctor_set(x_9, 0, x_97);
+return x_5;
+}
+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; size_t x_110; size_t x_111; 
+if (lean_is_exclusive(x_15)) {
+ lean_ctor_release(x_15, 0);
+ lean_ctor_release(x_15, 1);
+ lean_ctor_release(x_15, 2);
+ x_102 = x_15;
+} else {
+ lean_dec_ref(x_15);
+ x_102 = lean_box(0);
+}
+x_103 = lean_array_fget(x_98, x_99);
+x_104 = lean_nat_add(x_99, x_87);
+lean_dec(x_99);
+if (lean_is_scalar(x_102)) {
+ x_105 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_105 = x_102;
+}
+lean_ctor_set(x_105, 0, x_98);
+lean_ctor_set(x_105, 1, x_104);
+lean_ctor_set(x_105, 2, x_100);
+x_106 = l_Lean_Expr_fvarId_x21(x_7);
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_95);
+lean_ctor_set(x_107, 1, x_86);
+x_108 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_108, 0, x_103);
+lean_ctor_set(x_108, 1, x_107);
+lean_ctor_set(x_9, 1, x_89);
+lean_ctor_set(x_9, 0, x_97);
+lean_ctor_set(x_8, 0, x_105);
+x_109 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_12, x_106, x_108);
+lean_ctor_set(x_5, 0, x_109);
+x_110 = 1;
+x_111 = lean_usize_add(x_4, x_110);
+x_4 = x_111;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; uint8_t x_117; 
+x_113 = lean_ctor_get(x_9, 0);
+lean_inc(x_113);
+lean_dec(x_9);
+x_114 = lean_ctor_get(x_10, 0);
+lean_inc(x_114);
+x_115 = lean_ctor_get(x_10, 1);
+lean_inc(x_115);
+x_116 = lean_ctor_get(x_10, 2);
+lean_inc(x_116);
+x_117 = lean_nat_dec_lt(x_115, x_116);
+if (x_117 == 0)
+{
+lean_object* x_118; 
+lean_dec(x_116);
+lean_dec(x_115);
+lean_dec(x_114);
+lean_dec(x_7);
+x_118 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_118, 0, x_113);
+lean_ctor_set(x_118, 1, x_10);
+lean_ctor_set(x_8, 1, x_118);
+return x_5;
+}
+else
+{
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; uint8_t x_127; 
+if (lean_is_exclusive(x_10)) {
+ lean_ctor_release(x_10, 0);
+ lean_ctor_release(x_10, 1);
+ lean_ctor_release(x_10, 2);
+ x_119 = x_10;
+} else {
+ lean_dec_ref(x_10);
+ x_119 = lean_box(0);
+}
+x_120 = lean_array_fget(x_114, x_115);
+x_121 = lean_unsigned_to_nat(1u);
+x_122 = lean_nat_add(x_115, x_121);
+lean_dec(x_115);
+if (lean_is_scalar(x_119)) {
+ x_123 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_123 = x_119;
+}
+lean_ctor_set(x_123, 0, x_114);
+lean_ctor_set(x_123, 1, x_122);
+lean_ctor_set(x_123, 2, x_116);
+x_124 = lean_ctor_get(x_113, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_113, 1);
+lean_inc(x_125);
+x_126 = lean_ctor_get(x_113, 2);
+lean_inc(x_126);
+x_127 = lean_nat_dec_lt(x_125, x_126);
+if (x_127 == 0)
+{
+lean_object* x_128; 
+lean_dec(x_126);
+lean_dec(x_125);
+lean_dec(x_124);
+lean_dec(x_120);
+lean_dec(x_7);
+x_128 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_128, 0, x_113);
+lean_ctor_set(x_128, 1, x_123);
+lean_ctor_set(x_8, 1, x_128);
+return x_5;
+}
+else
+{
+lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; uint8_t x_136; 
+if (lean_is_exclusive(x_113)) {
+ lean_ctor_release(x_113, 0);
+ lean_ctor_release(x_113, 1);
+ lean_ctor_release(x_113, 2);
+ x_129 = x_113;
+} else {
+ lean_dec_ref(x_113);
+ x_129 = lean_box(0);
+}
+x_130 = lean_array_fget(x_124, x_125);
+x_131 = lean_nat_add(x_125, x_121);
+lean_dec(x_125);
+if (lean_is_scalar(x_129)) {
+ x_132 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_132 = x_129;
+}
+lean_ctor_set(x_132, 0, x_124);
+lean_ctor_set(x_132, 1, x_131);
+lean_ctor_set(x_132, 2, x_126);
+x_133 = lean_ctor_get(x_15, 0);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_15, 1);
+lean_inc(x_134);
+x_135 = lean_ctor_get(x_15, 2);
+lean_inc(x_135);
+x_136 = lean_nat_dec_lt(x_134, x_135);
+if (x_136 == 0)
+{
+lean_object* x_137; 
+lean_dec(x_135);
+lean_dec(x_134);
+lean_dec(x_133);
+lean_dec(x_130);
+lean_dec(x_120);
+lean_dec(x_7);
+x_137 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_137, 0, x_132);
+lean_ctor_set(x_137, 1, x_123);
+lean_ctor_set(x_8, 1, x_137);
+return x_5;
+}
+else
+{
+lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; size_t x_147; size_t x_148; 
+if (lean_is_exclusive(x_15)) {
+ lean_ctor_release(x_15, 0);
+ lean_ctor_release(x_15, 1);
+ lean_ctor_release(x_15, 2);
+ x_138 = x_15;
+} else {
+ lean_dec_ref(x_15);
+ x_138 = lean_box(0);
+}
+x_139 = lean_array_fget(x_133, x_134);
+x_140 = lean_nat_add(x_134, x_121);
+lean_dec(x_134);
+if (lean_is_scalar(x_138)) {
+ x_141 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_141 = x_138;
+}
+lean_ctor_set(x_141, 0, x_133);
+lean_ctor_set(x_141, 1, x_140);
+lean_ctor_set(x_141, 2, x_135);
+x_142 = l_Lean_Expr_fvarId_x21(x_7);
+x_143 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_143, 0, x_130);
+lean_ctor_set(x_143, 1, x_120);
+x_144 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_144, 0, x_139);
+lean_ctor_set(x_144, 1, x_143);
+x_145 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_145, 0, x_132);
+lean_ctor_set(x_145, 1, x_123);
+lean_ctor_set(x_8, 1, x_145);
+lean_ctor_set(x_8, 0, x_141);
+x_146 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_12, x_142, x_144);
+lean_ctor_set(x_5, 0, x_146);
+x_147 = 1;
+x_148 = lean_usize_add(x_4, x_147);
+x_4 = x_148;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; uint8_t x_156; 
+x_150 = lean_ctor_get(x_8, 0);
+lean_inc(x_150);
+lean_dec(x_8);
+x_151 = lean_ctor_get(x_9, 0);
+lean_inc(x_151);
+if (lean_is_exclusive(x_9)) {
+ lean_ctor_release(x_9, 0);
+ lean_ctor_release(x_9, 1);
+ x_152 = x_9;
+} else {
+ lean_dec_ref(x_9);
+ x_152 = lean_box(0);
+}
+x_153 = lean_ctor_get(x_10, 0);
+lean_inc(x_153);
+x_154 = lean_ctor_get(x_10, 1);
+lean_inc(x_154);
+x_155 = lean_ctor_get(x_10, 2);
+lean_inc(x_155);
+x_156 = lean_nat_dec_lt(x_154, x_155);
+if (x_156 == 0)
+{
+lean_object* x_157; lean_object* x_158; 
+lean_dec(x_155);
+lean_dec(x_154);
+lean_dec(x_153);
+lean_dec(x_7);
+if (lean_is_scalar(x_152)) {
+ x_157 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_157 = x_152;
+}
+lean_ctor_set(x_157, 0, x_151);
+lean_ctor_set(x_157, 1, x_10);
+x_158 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_158, 0, x_150);
+lean_ctor_set(x_158, 1, x_157);
+lean_ctor_set(x_5, 1, x_158);
+return x_5;
+}
+else
+{
+lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; uint8_t x_167; 
+if (lean_is_exclusive(x_10)) {
+ lean_ctor_release(x_10, 0);
+ lean_ctor_release(x_10, 1);
+ lean_ctor_release(x_10, 2);
+ x_159 = x_10;
+} else {
+ lean_dec_ref(x_10);
+ x_159 = lean_box(0);
+}
+x_160 = lean_array_fget(x_153, x_154);
+x_161 = lean_unsigned_to_nat(1u);
+x_162 = lean_nat_add(x_154, x_161);
+lean_dec(x_154);
+if (lean_is_scalar(x_159)) {
+ x_163 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_163 = x_159;
+}
+lean_ctor_set(x_163, 0, x_153);
+lean_ctor_set(x_163, 1, x_162);
+lean_ctor_set(x_163, 2, x_155);
+x_164 = lean_ctor_get(x_151, 0);
+lean_inc(x_164);
+x_165 = lean_ctor_get(x_151, 1);
+lean_inc(x_165);
+x_166 = lean_ctor_get(x_151, 2);
+lean_inc(x_166);
+x_167 = lean_nat_dec_lt(x_165, x_166);
+if (x_167 == 0)
+{
+lean_object* x_168; lean_object* x_169; 
+lean_dec(x_166);
+lean_dec(x_165);
+lean_dec(x_164);
+lean_dec(x_160);
+lean_dec(x_7);
+if (lean_is_scalar(x_152)) {
+ x_168 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_168 = x_152;
+}
+lean_ctor_set(x_168, 0, x_151);
+lean_ctor_set(x_168, 1, x_163);
+x_169 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_169, 0, x_150);
+lean_ctor_set(x_169, 1, x_168);
+lean_ctor_set(x_5, 1, x_169);
+return x_5;
+}
+else
+{
+lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; uint8_t x_177; 
+if (lean_is_exclusive(x_151)) {
+ lean_ctor_release(x_151, 0);
+ lean_ctor_release(x_151, 1);
+ lean_ctor_release(x_151, 2);
+ x_170 = x_151;
+} else {
+ lean_dec_ref(x_151);
+ x_170 = lean_box(0);
+}
+x_171 = lean_array_fget(x_164, x_165);
+x_172 = lean_nat_add(x_165, x_161);
+lean_dec(x_165);
+if (lean_is_scalar(x_170)) {
+ x_173 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_173 = x_170;
+}
+lean_ctor_set(x_173, 0, x_164);
+lean_ctor_set(x_173, 1, x_172);
+lean_ctor_set(x_173, 2, x_166);
+x_174 = lean_ctor_get(x_150, 0);
+lean_inc(x_174);
+x_175 = lean_ctor_get(x_150, 1);
+lean_inc(x_175);
+x_176 = lean_ctor_get(x_150, 2);
+lean_inc(x_176);
+x_177 = lean_nat_dec_lt(x_175, x_176);
+if (x_177 == 0)
+{
+lean_object* x_178; lean_object* x_179; 
+lean_dec(x_176);
+lean_dec(x_175);
+lean_dec(x_174);
+lean_dec(x_171);
+lean_dec(x_160);
+lean_dec(x_7);
+if (lean_is_scalar(x_152)) {
+ x_178 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_178 = x_152;
+}
+lean_ctor_set(x_178, 0, x_173);
+lean_ctor_set(x_178, 1, x_163);
+x_179 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_179, 0, x_150);
+lean_ctor_set(x_179, 1, x_178);
+lean_ctor_set(x_5, 1, x_179);
+return x_5;
+}
+else
+{
+lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; size_t x_190; size_t x_191; 
+if (lean_is_exclusive(x_150)) {
+ lean_ctor_release(x_150, 0);
+ lean_ctor_release(x_150, 1);
+ lean_ctor_release(x_150, 2);
+ x_180 = x_150;
+} else {
+ lean_dec_ref(x_150);
+ x_180 = lean_box(0);
+}
+x_181 = lean_array_fget(x_174, x_175);
+x_182 = lean_nat_add(x_175, x_161);
+lean_dec(x_175);
+if (lean_is_scalar(x_180)) {
+ x_183 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_183 = x_180;
+}
+lean_ctor_set(x_183, 0, x_174);
+lean_ctor_set(x_183, 1, x_182);
+lean_ctor_set(x_183, 2, x_176);
+x_184 = l_Lean_Expr_fvarId_x21(x_7);
+x_185 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_185, 0, x_171);
+lean_ctor_set(x_185, 1, x_160);
+x_186 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_186, 0, x_181);
+lean_ctor_set(x_186, 1, x_185);
+if (lean_is_scalar(x_152)) {
+ x_187 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_187 = x_152;
+}
+lean_ctor_set(x_187, 0, x_173);
+lean_ctor_set(x_187, 1, x_163);
+x_188 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_188, 0, x_183);
+lean_ctor_set(x_188, 1, x_187);
+x_189 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_12, x_184, x_186);
+lean_ctor_set(x_5, 1, x_188);
+lean_ctor_set(x_5, 0, x_189);
+x_190 = 1;
+x_191 = lean_usize_add(x_4, x_190);
+x_4 = x_191;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; uint8_t x_201; 
+x_193 = lean_ctor_get(x_5, 0);
+lean_inc(x_193);
+lean_dec(x_5);
+x_194 = lean_ctor_get(x_8, 0);
+lean_inc(x_194);
 if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 0);
  lean_ctor_release(x_8, 1);
- x_99 = x_8;
+ x_195 = x_8;
 } else {
  lean_dec_ref(x_8);
- x_99 = lean_box(0);
+ x_195 = lean_box(0);
 }
-x_100 = lean_ctor_get(x_9, 0);
-lean_inc(x_100);
-x_101 = lean_ctor_get(x_9, 1);
-lean_inc(x_101);
-x_102 = lean_ctor_get(x_9, 2);
-lean_inc(x_102);
-x_103 = lean_nat_dec_lt(x_101, x_102);
-if (x_103 == 0)
-{
-lean_object* x_104; lean_object* x_105; 
-lean_dec(x_102);
-lean_dec(x_101);
-lean_dec(x_100);
-lean_dec(x_7);
-if (lean_is_scalar(x_99)) {
- x_104 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_104 = x_99;
-}
-lean_ctor_set(x_104, 0, x_98);
-lean_ctor_set(x_104, 1, x_9);
-x_105 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_105, 0, x_97);
-lean_ctor_set(x_105, 1, x_104);
-return x_105;
-}
-else
-{
-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; uint8_t x_114; 
+x_196 = lean_ctor_get(x_9, 0);
+lean_inc(x_196);
 if (lean_is_exclusive(x_9)) {
  lean_ctor_release(x_9, 0);
  lean_ctor_release(x_9, 1);
- lean_ctor_release(x_9, 2);
- x_106 = x_9;
+ x_197 = x_9;
 } else {
  lean_dec_ref(x_9);
- x_106 = lean_box(0);
+ x_197 = lean_box(0);
 }
-x_107 = lean_array_fget(x_100, x_101);
-x_108 = lean_unsigned_to_nat(1u);
-x_109 = lean_nat_add(x_101, x_108);
-lean_dec(x_101);
-if (lean_is_scalar(x_106)) {
- x_110 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_110 = x_106;
-}
-lean_ctor_set(x_110, 0, x_100);
-lean_ctor_set(x_110, 1, x_109);
-lean_ctor_set(x_110, 2, x_102);
-x_111 = lean_ctor_get(x_98, 0);
-lean_inc(x_111);
-x_112 = lean_ctor_get(x_98, 1);
-lean_inc(x_112);
-x_113 = lean_ctor_get(x_98, 2);
-lean_inc(x_113);
-x_114 = lean_nat_dec_lt(x_112, x_113);
-if (x_114 == 0)
+x_198 = lean_ctor_get(x_10, 0);
+lean_inc(x_198);
+x_199 = lean_ctor_get(x_10, 1);
+lean_inc(x_199);
+x_200 = lean_ctor_get(x_10, 2);
+lean_inc(x_200);
+x_201 = lean_nat_dec_lt(x_199, x_200);
+if (x_201 == 0)
 {
-lean_object* x_115; lean_object* x_116; 
-lean_dec(x_113);
-lean_dec(x_112);
-lean_dec(x_111);
-lean_dec(x_107);
+lean_object* x_202; lean_object* x_203; lean_object* x_204; 
+lean_dec(x_200);
+lean_dec(x_199);
+lean_dec(x_198);
 lean_dec(x_7);
-if (lean_is_scalar(x_99)) {
- x_115 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_197)) {
+ x_202 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_115 = x_99;
+ x_202 = x_197;
 }
-lean_ctor_set(x_115, 0, x_98);
-lean_ctor_set(x_115, 1, x_110);
-x_116 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_116, 0, x_97);
-lean_ctor_set(x_116, 1, x_115);
-return x_116;
+lean_ctor_set(x_202, 0, x_196);
+lean_ctor_set(x_202, 1, x_10);
+if (lean_is_scalar(x_195)) {
+ x_203 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_203 = x_195;
+}
+lean_ctor_set(x_203, 0, x_194);
+lean_ctor_set(x_203, 1, x_202);
+x_204 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_204, 0, x_193);
+lean_ctor_set(x_204, 1, x_203);
+return x_204;
 }
 else
 {
-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; size_t x_126; size_t x_127; 
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- lean_ctor_release(x_98, 2);
- x_117 = x_98;
+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; uint8_t x_213; 
+if (lean_is_exclusive(x_10)) {
+ lean_ctor_release(x_10, 0);
+ lean_ctor_release(x_10, 1);
+ lean_ctor_release(x_10, 2);
+ x_205 = x_10;
 } else {
- lean_dec_ref(x_98);
- x_117 = lean_box(0);
+ lean_dec_ref(x_10);
+ x_205 = lean_box(0);
 }
-x_118 = lean_array_fget(x_111, x_112);
-x_119 = lean_nat_add(x_112, x_108);
-lean_dec(x_112);
-if (lean_is_scalar(x_117)) {
- x_120 = lean_alloc_ctor(0, 3, 0);
+x_206 = lean_array_fget(x_198, x_199);
+x_207 = lean_unsigned_to_nat(1u);
+x_208 = lean_nat_add(x_199, x_207);
+lean_dec(x_199);
+if (lean_is_scalar(x_205)) {
+ x_209 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_120 = x_117;
+ x_209 = x_205;
 }
-lean_ctor_set(x_120, 0, x_111);
-lean_ctor_set(x_120, 1, x_119);
-lean_ctor_set(x_120, 2, x_113);
-x_121 = l_Lean_Expr_fvarId_x21(x_7);
-x_122 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_122, 0, x_118);
-lean_ctor_set(x_122, 1, x_107);
-if (lean_is_scalar(x_99)) {
- x_123 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_209, 0, x_198);
+lean_ctor_set(x_209, 1, x_208);
+lean_ctor_set(x_209, 2, x_200);
+x_210 = lean_ctor_get(x_196, 0);
+lean_inc(x_210);
+x_211 = lean_ctor_get(x_196, 1);
+lean_inc(x_211);
+x_212 = lean_ctor_get(x_196, 2);
+lean_inc(x_212);
+x_213 = lean_nat_dec_lt(x_211, x_212);
+if (x_213 == 0)
+{
+lean_object* x_214; lean_object* x_215; lean_object* x_216; 
+lean_dec(x_212);
+lean_dec(x_211);
+lean_dec(x_210);
+lean_dec(x_206);
+lean_dec(x_7);
+if (lean_is_scalar(x_197)) {
+ x_214 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_123 = x_99;
+ x_214 = x_197;
 }
-lean_ctor_set(x_123, 0, x_120);
-lean_ctor_set(x_123, 1, x_110);
-x_124 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_97, x_121, x_122);
-x_125 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_125, 0, x_124);
-lean_ctor_set(x_125, 1, x_123);
-x_126 = 1;
-x_127 = lean_usize_add(x_4, x_126);
-x_4 = x_127;
-x_5 = x_125;
+lean_ctor_set(x_214, 0, x_196);
+lean_ctor_set(x_214, 1, x_209);
+if (lean_is_scalar(x_195)) {
+ x_215 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_215 = x_195;
+}
+lean_ctor_set(x_215, 0, x_194);
+lean_ctor_set(x_215, 1, x_214);
+x_216 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_216, 0, x_193);
+lean_ctor_set(x_216, 1, x_215);
+return x_216;
+}
+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; lean_object* x_223; uint8_t x_224; 
+if (lean_is_exclusive(x_196)) {
+ lean_ctor_release(x_196, 0);
+ lean_ctor_release(x_196, 1);
+ lean_ctor_release(x_196, 2);
+ x_217 = x_196;
+} else {
+ lean_dec_ref(x_196);
+ x_217 = lean_box(0);
+}
+x_218 = lean_array_fget(x_210, x_211);
+x_219 = lean_nat_add(x_211, x_207);
+lean_dec(x_211);
+if (lean_is_scalar(x_217)) {
+ x_220 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_220 = x_217;
+}
+lean_ctor_set(x_220, 0, x_210);
+lean_ctor_set(x_220, 1, x_219);
+lean_ctor_set(x_220, 2, x_212);
+x_221 = lean_ctor_get(x_194, 0);
+lean_inc(x_221);
+x_222 = lean_ctor_get(x_194, 1);
+lean_inc(x_222);
+x_223 = lean_ctor_get(x_194, 2);
+lean_inc(x_223);
+x_224 = lean_nat_dec_lt(x_222, x_223);
+if (x_224 == 0)
+{
+lean_object* x_225; lean_object* x_226; lean_object* x_227; 
+lean_dec(x_223);
+lean_dec(x_222);
+lean_dec(x_221);
+lean_dec(x_218);
+lean_dec(x_206);
+lean_dec(x_7);
+if (lean_is_scalar(x_197)) {
+ x_225 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_225 = x_197;
+}
+lean_ctor_set(x_225, 0, x_220);
+lean_ctor_set(x_225, 1, x_209);
+if (lean_is_scalar(x_195)) {
+ x_226 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_226 = x_195;
+}
+lean_ctor_set(x_226, 0, x_194);
+lean_ctor_set(x_226, 1, x_225);
+x_227 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_227, 0, x_193);
+lean_ctor_set(x_227, 1, x_226);
+return x_227;
+}
+else
+{
+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; size_t x_239; size_t x_240; 
+if (lean_is_exclusive(x_194)) {
+ lean_ctor_release(x_194, 0);
+ lean_ctor_release(x_194, 1);
+ lean_ctor_release(x_194, 2);
+ x_228 = x_194;
+} else {
+ lean_dec_ref(x_194);
+ x_228 = lean_box(0);
+}
+x_229 = lean_array_fget(x_221, x_222);
+x_230 = lean_nat_add(x_222, x_207);
+lean_dec(x_222);
+if (lean_is_scalar(x_228)) {
+ x_231 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_231 = x_228;
+}
+lean_ctor_set(x_231, 0, x_221);
+lean_ctor_set(x_231, 1, x_230);
+lean_ctor_set(x_231, 2, x_223);
+x_232 = l_Lean_Expr_fvarId_x21(x_7);
+x_233 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_233, 0, x_218);
+lean_ctor_set(x_233, 1, x_206);
+x_234 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_234, 0, x_229);
+lean_ctor_set(x_234, 1, x_233);
+if (lean_is_scalar(x_197)) {
+ x_235 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_235 = x_197;
+}
+lean_ctor_set(x_235, 0, x_220);
+lean_ctor_set(x_235, 1, x_209);
+if (lean_is_scalar(x_195)) {
+ x_236 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_236 = x_195;
+}
+lean_ctor_set(x_236, 0, x_231);
+lean_ctor_set(x_236, 1, x_235);
+x_237 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_193, x_232, x_234);
+x_238 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_238, 0, x_237);
+lean_ctor_set(x_238, 1, x_236);
+x_239 = 1;
+x_240 = lean_usize_add(x_4, x_239);
+x_4 = x_240;
+x_5 = x_238;
 goto _start;
 }
 }
@@ -18326,6 +18846,7 @@ goto _start;
 }
 }
 }
+}
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__4(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
@@ -18337,303 +18858,243 @@ return x_4;
 }
 else
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
 x_6 = lean_array_uget(x_1, x_3);
 x_7 = lean_ctor_get(x_4, 1);
 lean_inc(x_7);
 x_8 = lean_ctor_get(x_7, 1);
 lean_inc(x_8);
-x_9 = !lean_is_exclusive(x_4);
-if (x_9 == 0)
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+x_10 = !lean_is_exclusive(x_4);
+if (x_10 == 0)
 {
-lean_object* x_10; lean_object* x_11; uint8_t x_12; 
-x_10 = lean_ctor_get(x_4, 0);
-x_11 = lean_ctor_get(x_4, 1);
-lean_dec(x_11);
-x_12 = !lean_is_exclusive(x_7);
-if (x_12 == 0)
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_4, 0);
+x_12 = lean_ctor_get(x_4, 1);
+lean_dec(x_12);
+x_13 = !lean_is_exclusive(x_7);
+if (x_13 == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
-x_13 = lean_ctor_get(x_7, 0);
-x_14 = lean_ctor_get(x_7, 1);
-lean_dec(x_14);
-x_15 = lean_ctor_get(x_8, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_8, 1);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_8, 2);
-lean_inc(x_17);
-x_18 = lean_nat_dec_lt(x_16, x_17);
-if (x_18 == 0)
-{
-lean_dec(x_17);
-lean_dec(x_16);
+lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_14 = lean_ctor_get(x_7, 0);
+x_15 = lean_ctor_get(x_7, 1);
 lean_dec(x_15);
-lean_dec(x_6);
-return x_4;
-}
-else
+x_16 = !lean_is_exclusive(x_8);
+if (x_16 == 0)
 {
-uint8_t x_19; 
-x_19 = !lean_is_exclusive(x_8);
-if (x_19 == 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_8, 0);
+x_18 = lean_ctor_get(x_8, 1);
+lean_dec(x_18);
+x_19 = lean_ctor_get(x_9, 0);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_9, 1);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_9, 2);
+lean_inc(x_21);
+x_22 = lean_nat_dec_lt(x_20, x_21);
+if (x_22 == 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; uint8_t x_29; 
-x_20 = lean_ctor_get(x_8, 2);
-lean_dec(x_20);
-x_21 = lean_ctor_get(x_8, 1);
 lean_dec(x_21);
-x_22 = lean_ctor_get(x_8, 0);
-lean_dec(x_22);
-x_23 = lean_array_fget(x_15, x_16);
-x_24 = lean_unsigned_to_nat(1u);
-x_25 = lean_nat_add(x_16, x_24);
-lean_dec(x_16);
-lean_ctor_set(x_8, 1, x_25);
-x_26 = lean_ctor_get(x_13, 0);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_13, 1);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_13, 2);
-lean_inc(x_28);
-x_29 = lean_nat_dec_lt(x_27, x_28);
-if (x_29 == 0)
+lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_6);
+return x_4;
+}
+else
 {
-lean_dec(x_28);
-lean_dec(x_27);
+uint8_t x_23; 
+x_23 = !lean_is_exclusive(x_9);
+if (x_23 == 0)
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
+x_24 = lean_ctor_get(x_9, 2);
+lean_dec(x_24);
+x_25 = lean_ctor_get(x_9, 1);
+lean_dec(x_25);
+x_26 = lean_ctor_get(x_9, 0);
 lean_dec(x_26);
-lean_dec(x_23);
-lean_dec(x_6);
-return x_4;
-}
-else
+x_27 = lean_array_fget(x_19, x_20);
+x_28 = lean_unsigned_to_nat(1u);
+x_29 = lean_nat_add(x_20, x_28);
+lean_dec(x_20);
+lean_ctor_set(x_9, 1, x_29);
+x_30 = lean_ctor_get(x_17, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_17, 1);
+lean_inc(x_31);
+x_32 = lean_ctor_get(x_17, 2);
+lean_inc(x_32);
+x_33 = lean_nat_dec_lt(x_31, x_32);
+if (x_33 == 0)
 {
-uint8_t x_30; 
-x_30 = !lean_is_exclusive(x_13);
-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; size_t x_39; size_t x_40; 
-x_31 = lean_ctor_get(x_13, 2);
-lean_dec(x_31);
-x_32 = lean_ctor_get(x_13, 1);
 lean_dec(x_32);
-x_33 = lean_ctor_get(x_13, 0);
-lean_dec(x_33);
-x_34 = lean_array_fget(x_26, x_27);
-x_35 = lean_nat_add(x_27, x_24);
+lean_dec(x_31);
+lean_dec(x_30);
 lean_dec(x_27);
-lean_ctor_set(x_13, 1, x_35);
-x_36 = l_Lean_Expr_fvarId_x21(x_6);
-x_37 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_37, 0, x_34);
-lean_ctor_set(x_37, 1, x_23);
-x_38 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_10, x_36, x_37);
-lean_ctor_set(x_4, 0, x_38);
-x_39 = 1;
-x_40 = lean_usize_add(x_3, x_39);
-x_3 = x_40;
-goto _start;
-}
-else
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; size_t x_48; size_t x_49; 
-lean_dec(x_13);
-x_42 = lean_array_fget(x_26, x_27);
-x_43 = lean_nat_add(x_27, x_24);
-lean_dec(x_27);
-x_44 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_44, 0, x_26);
-lean_ctor_set(x_44, 1, x_43);
-lean_ctor_set(x_44, 2, x_28);
-x_45 = l_Lean_Expr_fvarId_x21(x_6);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_42);
-lean_ctor_set(x_46, 1, x_23);
-lean_ctor_set(x_7, 0, x_44);
-x_47 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_10, x_45, x_46);
-lean_ctor_set(x_4, 0, x_47);
-x_48 = 1;
-x_49 = lean_usize_add(x_3, x_48);
-x_3 = x_49;
-goto _start;
-}
-}
-}
-else
-{
-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; uint8_t x_58; 
-lean_dec(x_8);
-x_51 = lean_array_fget(x_15, x_16);
-x_52 = lean_unsigned_to_nat(1u);
-x_53 = lean_nat_add(x_16, x_52);
-lean_dec(x_16);
-x_54 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_54, 0, x_15);
-lean_ctor_set(x_54, 1, x_53);
-lean_ctor_set(x_54, 2, x_17);
-x_55 = lean_ctor_get(x_13, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_13, 1);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_13, 2);
-lean_inc(x_57);
-x_58 = lean_nat_dec_lt(x_56, x_57);
-if (x_58 == 0)
-{
-lean_dec(x_57);
-lean_dec(x_56);
-lean_dec(x_55);
-lean_dec(x_51);
 lean_dec(x_6);
-lean_ctor_set(x_7, 1, x_54);
 return x_4;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; size_t x_66; size_t x_67; 
-if (lean_is_exclusive(x_13)) {
- lean_ctor_release(x_13, 0);
- lean_ctor_release(x_13, 1);
- lean_ctor_release(x_13, 2);
- x_59 = x_13;
-} else {
- lean_dec_ref(x_13);
- x_59 = lean_box(0);
+uint8_t x_34; 
+x_34 = !lean_is_exclusive(x_17);
+if (x_34 == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; 
+x_35 = lean_ctor_get(x_17, 2);
+lean_dec(x_35);
+x_36 = lean_ctor_get(x_17, 1);
+lean_dec(x_36);
+x_37 = lean_ctor_get(x_17, 0);
+lean_dec(x_37);
+x_38 = lean_array_fget(x_30, x_31);
+x_39 = lean_nat_add(x_31, x_28);
+lean_dec(x_31);
+lean_ctor_set(x_17, 1, x_39);
+x_40 = lean_ctor_get(x_14, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_14, 1);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_14, 2);
+lean_inc(x_42);
+x_43 = lean_nat_dec_lt(x_41, x_42);
+if (x_43 == 0)
+{
+lean_dec(x_42);
+lean_dec(x_41);
+lean_dec(x_40);
+lean_dec(x_38);
+lean_dec(x_27);
+lean_dec(x_6);
+return x_4;
 }
-x_60 = lean_array_fget(x_55, x_56);
-x_61 = lean_nat_add(x_56, x_52);
-lean_dec(x_56);
-if (lean_is_scalar(x_59)) {
- x_62 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_62 = x_59;
-}
-lean_ctor_set(x_62, 0, x_55);
-lean_ctor_set(x_62, 1, x_61);
-lean_ctor_set(x_62, 2, x_57);
-x_63 = l_Lean_Expr_fvarId_x21(x_6);
-x_64 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_64, 0, x_60);
-lean_ctor_set(x_64, 1, x_51);
-lean_ctor_set(x_7, 1, x_54);
-lean_ctor_set(x_7, 0, x_62);
-x_65 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_10, x_63, x_64);
-lean_ctor_set(x_4, 0, x_65);
-x_66 = 1;
-x_67 = lean_usize_add(x_3, x_66);
-x_3 = x_67;
+else
+{
+uint8_t x_44; 
+x_44 = !lean_is_exclusive(x_14);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; size_t x_54; size_t x_55; 
+x_45 = lean_ctor_get(x_14, 2);
+lean_dec(x_45);
+x_46 = lean_ctor_get(x_14, 1);
+lean_dec(x_46);
+x_47 = lean_ctor_get(x_14, 0);
+lean_dec(x_47);
+x_48 = lean_array_fget(x_40, x_41);
+x_49 = lean_nat_add(x_41, x_28);
+lean_dec(x_41);
+lean_ctor_set(x_14, 1, x_49);
+x_50 = l_Lean_Expr_fvarId_x21(x_6);
+x_51 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_51, 0, x_38);
+lean_ctor_set(x_51, 1, x_27);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_48);
+lean_ctor_set(x_52, 1, x_51);
+x_53 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_50, x_52);
+lean_ctor_set(x_4, 0, x_53);
+x_54 = 1;
+x_55 = lean_usize_add(x_3, x_54);
+x_3 = x_55;
 goto _start;
 }
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; size_t x_64; size_t x_65; 
+lean_dec(x_14);
+x_57 = lean_array_fget(x_40, x_41);
+x_58 = lean_nat_add(x_41, x_28);
+lean_dec(x_41);
+x_59 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_59, 0, x_40);
+lean_ctor_set(x_59, 1, x_58);
+lean_ctor_set(x_59, 2, x_42);
+x_60 = l_Lean_Expr_fvarId_x21(x_6);
+x_61 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_61, 0, x_38);
+lean_ctor_set(x_61, 1, x_27);
+x_62 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_62, 0, x_57);
+lean_ctor_set(x_62, 1, x_61);
+lean_ctor_set(x_7, 0, x_59);
+x_63 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_60, x_62);
+lean_ctor_set(x_4, 0, x_63);
+x_64 = 1;
+x_65 = lean_usize_add(x_3, x_64);
+x_3 = x_65;
+goto _start;
 }
 }
 }
 else
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_73; 
-x_69 = lean_ctor_get(x_7, 0);
-lean_inc(x_69);
-lean_dec(x_7);
-x_70 = lean_ctor_get(x_8, 0);
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_73; 
+lean_dec(x_17);
+x_67 = lean_array_fget(x_30, x_31);
+x_68 = lean_nat_add(x_31, x_28);
+lean_dec(x_31);
+x_69 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_69, 0, x_30);
+lean_ctor_set(x_69, 1, x_68);
+lean_ctor_set(x_69, 2, x_32);
+x_70 = lean_ctor_get(x_14, 0);
 lean_inc(x_70);
-x_71 = lean_ctor_get(x_8, 1);
+x_71 = lean_ctor_get(x_14, 1);
 lean_inc(x_71);
-x_72 = lean_ctor_get(x_8, 2);
+x_72 = lean_ctor_get(x_14, 2);
 lean_inc(x_72);
 x_73 = lean_nat_dec_lt(x_71, x_72);
 if (x_73 == 0)
 {
-lean_object* x_74; 
 lean_dec(x_72);
 lean_dec(x_71);
 lean_dec(x_70);
+lean_dec(x_67);
+lean_dec(x_27);
 lean_dec(x_6);
-x_74 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_74, 0, x_69);
-lean_ctor_set(x_74, 1, x_8);
-lean_ctor_set(x_4, 1, x_74);
+lean_ctor_set(x_8, 0, x_69);
 return x_4;
 }
 else
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t x_83; 
-if (lean_is_exclusive(x_8)) {
- lean_ctor_release(x_8, 0);
- lean_ctor_release(x_8, 1);
- lean_ctor_release(x_8, 2);
- x_75 = x_8;
+lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; size_t x_82; size_t x_83; 
+if (lean_is_exclusive(x_14)) {
+ lean_ctor_release(x_14, 0);
+ lean_ctor_release(x_14, 1);
+ lean_ctor_release(x_14, 2);
+ x_74 = x_14;
 } else {
- lean_dec_ref(x_8);
- x_75 = lean_box(0);
+ lean_dec_ref(x_14);
+ x_74 = lean_box(0);
 }
-x_76 = lean_array_fget(x_70, x_71);
-x_77 = lean_unsigned_to_nat(1u);
-x_78 = lean_nat_add(x_71, x_77);
+x_75 = lean_array_fget(x_70, x_71);
+x_76 = lean_nat_add(x_71, x_28);
 lean_dec(x_71);
-if (lean_is_scalar(x_75)) {
- x_79 = lean_alloc_ctor(0, 3, 0);
+if (lean_is_scalar(x_74)) {
+ x_77 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_79 = x_75;
+ x_77 = x_74;
 }
-lean_ctor_set(x_79, 0, x_70);
-lean_ctor_set(x_79, 1, x_78);
-lean_ctor_set(x_79, 2, x_72);
-x_80 = lean_ctor_get(x_69, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_69, 1);
-lean_inc(x_81);
-x_82 = lean_ctor_get(x_69, 2);
-lean_inc(x_82);
-x_83 = lean_nat_dec_lt(x_81, x_82);
-if (x_83 == 0)
-{
-lean_object* x_84; 
-lean_dec(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
-lean_dec(x_76);
-lean_dec(x_6);
-x_84 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_84, 0, x_69);
-lean_ctor_set(x_84, 1, x_79);
-lean_ctor_set(x_4, 1, x_84);
-return x_4;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; size_t x_93; size_t x_94; 
-if (lean_is_exclusive(x_69)) {
- lean_ctor_release(x_69, 0);
- lean_ctor_release(x_69, 1);
- lean_ctor_release(x_69, 2);
- x_85 = x_69;
-} else {
- lean_dec_ref(x_69);
- x_85 = lean_box(0);
-}
-x_86 = lean_array_fget(x_80, x_81);
-x_87 = lean_nat_add(x_81, x_77);
-lean_dec(x_81);
-if (lean_is_scalar(x_85)) {
- x_88 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_88 = x_85;
-}
-lean_ctor_set(x_88, 0, x_80);
-lean_ctor_set(x_88, 1, x_87);
-lean_ctor_set(x_88, 2, x_82);
-x_89 = l_Lean_Expr_fvarId_x21(x_6);
-x_90 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_90, 0, x_86);
-lean_ctor_set(x_90, 1, x_76);
-x_91 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_91, 0, x_88);
-lean_ctor_set(x_91, 1, x_79);
-x_92 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_10, x_89, x_90);
-lean_ctor_set(x_4, 1, x_91);
-lean_ctor_set(x_4, 0, x_92);
-x_93 = 1;
-x_94 = lean_usize_add(x_3, x_93);
-x_3 = x_94;
+lean_ctor_set(x_77, 0, x_70);
+lean_ctor_set(x_77, 1, x_76);
+lean_ctor_set(x_77, 2, x_72);
+x_78 = l_Lean_Expr_fvarId_x21(x_6);
+x_79 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_79, 0, x_67);
+lean_ctor_set(x_79, 1, x_27);
+x_80 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_80, 0, x_75);
+lean_ctor_set(x_80, 1, x_79);
+lean_ctor_set(x_8, 0, x_69);
+lean_ctor_set(x_7, 0, x_77);
+x_81 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_78, x_80);
+lean_ctor_set(x_4, 0, x_81);
+x_82 = 1;
+x_83 = lean_usize_add(x_3, x_82);
+x_3 = x_83;
 goto _start;
 }
 }
@@ -18641,139 +19102,707 @@ goto _start;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; uint8_t x_102; 
-x_96 = lean_ctor_get(x_4, 0);
-lean_inc(x_96);
-lean_dec(x_4);
-x_97 = lean_ctor_get(x_7, 0);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; 
+lean_dec(x_9);
+x_85 = lean_array_fget(x_19, x_20);
+x_86 = lean_unsigned_to_nat(1u);
+x_87 = lean_nat_add(x_20, x_86);
+lean_dec(x_20);
+x_88 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_88, 0, x_19);
+lean_ctor_set(x_88, 1, x_87);
+lean_ctor_set(x_88, 2, x_21);
+x_89 = lean_ctor_get(x_17, 0);
+lean_inc(x_89);
+x_90 = lean_ctor_get(x_17, 1);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_17, 2);
+lean_inc(x_91);
+x_92 = lean_nat_dec_lt(x_90, x_91);
+if (x_92 == 0)
+{
+lean_dec(x_91);
+lean_dec(x_90);
+lean_dec(x_89);
+lean_dec(x_85);
+lean_dec(x_6);
+lean_ctor_set(x_8, 1, x_88);
+return x_4;
+}
+else
+{
+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; uint8_t x_100; 
+if (lean_is_exclusive(x_17)) {
+ lean_ctor_release(x_17, 0);
+ lean_ctor_release(x_17, 1);
+ lean_ctor_release(x_17, 2);
+ x_93 = x_17;
+} else {
+ lean_dec_ref(x_17);
+ x_93 = lean_box(0);
+}
+x_94 = lean_array_fget(x_89, x_90);
+x_95 = lean_nat_add(x_90, x_86);
+lean_dec(x_90);
+if (lean_is_scalar(x_93)) {
+ x_96 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_96 = x_93;
+}
+lean_ctor_set(x_96, 0, x_89);
+lean_ctor_set(x_96, 1, x_95);
+lean_ctor_set(x_96, 2, x_91);
+x_97 = lean_ctor_get(x_14, 0);
 lean_inc(x_97);
+x_98 = lean_ctor_get(x_14, 1);
+lean_inc(x_98);
+x_99 = lean_ctor_get(x_14, 2);
+lean_inc(x_99);
+x_100 = lean_nat_dec_lt(x_98, x_99);
+if (x_100 == 0)
+{
+lean_dec(x_99);
+lean_dec(x_98);
+lean_dec(x_97);
+lean_dec(x_94);
+lean_dec(x_85);
+lean_dec(x_6);
+lean_ctor_set(x_8, 1, x_88);
+lean_ctor_set(x_8, 0, x_96);
+return x_4;
+}
+else
+{
+lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; size_t x_109; size_t x_110; 
+if (lean_is_exclusive(x_14)) {
+ lean_ctor_release(x_14, 0);
+ lean_ctor_release(x_14, 1);
+ lean_ctor_release(x_14, 2);
+ x_101 = x_14;
+} else {
+ lean_dec_ref(x_14);
+ x_101 = lean_box(0);
+}
+x_102 = lean_array_fget(x_97, x_98);
+x_103 = lean_nat_add(x_98, x_86);
+lean_dec(x_98);
+if (lean_is_scalar(x_101)) {
+ x_104 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_104 = x_101;
+}
+lean_ctor_set(x_104, 0, x_97);
+lean_ctor_set(x_104, 1, x_103);
+lean_ctor_set(x_104, 2, x_99);
+x_105 = l_Lean_Expr_fvarId_x21(x_6);
+x_106 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_106, 0, x_94);
+lean_ctor_set(x_106, 1, x_85);
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_102);
+lean_ctor_set(x_107, 1, x_106);
+lean_ctor_set(x_8, 1, x_88);
+lean_ctor_set(x_8, 0, x_96);
+lean_ctor_set(x_7, 0, x_104);
+x_108 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_105, x_107);
+lean_ctor_set(x_4, 0, x_108);
+x_109 = 1;
+x_110 = lean_usize_add(x_3, x_109);
+x_3 = x_110;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; 
+x_112 = lean_ctor_get(x_8, 0);
+lean_inc(x_112);
+lean_dec(x_8);
+x_113 = lean_ctor_get(x_9, 0);
+lean_inc(x_113);
+x_114 = lean_ctor_get(x_9, 1);
+lean_inc(x_114);
+x_115 = lean_ctor_get(x_9, 2);
+lean_inc(x_115);
+x_116 = lean_nat_dec_lt(x_114, x_115);
+if (x_116 == 0)
+{
+lean_object* x_117; 
+lean_dec(x_115);
+lean_dec(x_114);
+lean_dec(x_113);
+lean_dec(x_6);
+x_117 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_117, 0, x_112);
+lean_ctor_set(x_117, 1, x_9);
+lean_ctor_set(x_7, 1, x_117);
+return x_4;
+}
+else
+{
+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; uint8_t x_126; 
+if (lean_is_exclusive(x_9)) {
+ lean_ctor_release(x_9, 0);
+ lean_ctor_release(x_9, 1);
+ lean_ctor_release(x_9, 2);
+ x_118 = x_9;
+} else {
+ lean_dec_ref(x_9);
+ x_118 = lean_box(0);
+}
+x_119 = lean_array_fget(x_113, x_114);
+x_120 = lean_unsigned_to_nat(1u);
+x_121 = lean_nat_add(x_114, x_120);
+lean_dec(x_114);
+if (lean_is_scalar(x_118)) {
+ x_122 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_122 = x_118;
+}
+lean_ctor_set(x_122, 0, x_113);
+lean_ctor_set(x_122, 1, x_121);
+lean_ctor_set(x_122, 2, x_115);
+x_123 = lean_ctor_get(x_112, 0);
+lean_inc(x_123);
+x_124 = lean_ctor_get(x_112, 1);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_112, 2);
+lean_inc(x_125);
+x_126 = lean_nat_dec_lt(x_124, x_125);
+if (x_126 == 0)
+{
+lean_object* x_127; 
+lean_dec(x_125);
+lean_dec(x_124);
+lean_dec(x_123);
+lean_dec(x_119);
+lean_dec(x_6);
+x_127 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_127, 0, x_112);
+lean_ctor_set(x_127, 1, x_122);
+lean_ctor_set(x_7, 1, x_127);
+return x_4;
+}
+else
+{
+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; uint8_t x_135; 
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ lean_ctor_release(x_112, 1);
+ lean_ctor_release(x_112, 2);
+ x_128 = x_112;
+} else {
+ lean_dec_ref(x_112);
+ x_128 = lean_box(0);
+}
+x_129 = lean_array_fget(x_123, x_124);
+x_130 = lean_nat_add(x_124, x_120);
+lean_dec(x_124);
+if (lean_is_scalar(x_128)) {
+ x_131 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_131 = x_128;
+}
+lean_ctor_set(x_131, 0, x_123);
+lean_ctor_set(x_131, 1, x_130);
+lean_ctor_set(x_131, 2, x_125);
+x_132 = lean_ctor_get(x_14, 0);
+lean_inc(x_132);
+x_133 = lean_ctor_get(x_14, 1);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_14, 2);
+lean_inc(x_134);
+x_135 = lean_nat_dec_lt(x_133, x_134);
+if (x_135 == 0)
+{
+lean_object* x_136; 
+lean_dec(x_134);
+lean_dec(x_133);
+lean_dec(x_132);
+lean_dec(x_129);
+lean_dec(x_119);
+lean_dec(x_6);
+x_136 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_136, 0, x_131);
+lean_ctor_set(x_136, 1, x_122);
+lean_ctor_set(x_7, 1, x_136);
+return x_4;
+}
+else
+{
+lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; size_t x_146; size_t x_147; 
+if (lean_is_exclusive(x_14)) {
+ lean_ctor_release(x_14, 0);
+ lean_ctor_release(x_14, 1);
+ lean_ctor_release(x_14, 2);
+ x_137 = x_14;
+} else {
+ lean_dec_ref(x_14);
+ x_137 = lean_box(0);
+}
+x_138 = lean_array_fget(x_132, x_133);
+x_139 = lean_nat_add(x_133, x_120);
+lean_dec(x_133);
+if (lean_is_scalar(x_137)) {
+ x_140 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_140 = x_137;
+}
+lean_ctor_set(x_140, 0, x_132);
+lean_ctor_set(x_140, 1, x_139);
+lean_ctor_set(x_140, 2, x_134);
+x_141 = l_Lean_Expr_fvarId_x21(x_6);
+x_142 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_142, 0, x_129);
+lean_ctor_set(x_142, 1, x_119);
+x_143 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_143, 0, x_138);
+lean_ctor_set(x_143, 1, x_142);
+x_144 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_144, 0, x_131);
+lean_ctor_set(x_144, 1, x_122);
+lean_ctor_set(x_7, 1, x_144);
+lean_ctor_set(x_7, 0, x_140);
+x_145 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_141, x_143);
+lean_ctor_set(x_4, 0, x_145);
+x_146 = 1;
+x_147 = lean_usize_add(x_3, x_146);
+x_3 = x_147;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; uint8_t x_155; 
+x_149 = lean_ctor_get(x_7, 0);
+lean_inc(x_149);
+lean_dec(x_7);
+x_150 = lean_ctor_get(x_8, 0);
+lean_inc(x_150);
+if (lean_is_exclusive(x_8)) {
+ lean_ctor_release(x_8, 0);
+ lean_ctor_release(x_8, 1);
+ x_151 = x_8;
+} else {
+ lean_dec_ref(x_8);
+ x_151 = lean_box(0);
+}
+x_152 = lean_ctor_get(x_9, 0);
+lean_inc(x_152);
+x_153 = lean_ctor_get(x_9, 1);
+lean_inc(x_153);
+x_154 = lean_ctor_get(x_9, 2);
+lean_inc(x_154);
+x_155 = lean_nat_dec_lt(x_153, x_154);
+if (x_155 == 0)
+{
+lean_object* x_156; lean_object* x_157; 
+lean_dec(x_154);
+lean_dec(x_153);
+lean_dec(x_152);
+lean_dec(x_6);
+if (lean_is_scalar(x_151)) {
+ x_156 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_156 = x_151;
+}
+lean_ctor_set(x_156, 0, x_150);
+lean_ctor_set(x_156, 1, x_9);
+x_157 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_157, 0, x_149);
+lean_ctor_set(x_157, 1, x_156);
+lean_ctor_set(x_4, 1, x_157);
+return x_4;
+}
+else
+{
+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; uint8_t x_166; 
+if (lean_is_exclusive(x_9)) {
+ lean_ctor_release(x_9, 0);
+ lean_ctor_release(x_9, 1);
+ lean_ctor_release(x_9, 2);
+ x_158 = x_9;
+} else {
+ lean_dec_ref(x_9);
+ x_158 = lean_box(0);
+}
+x_159 = lean_array_fget(x_152, x_153);
+x_160 = lean_unsigned_to_nat(1u);
+x_161 = lean_nat_add(x_153, x_160);
+lean_dec(x_153);
+if (lean_is_scalar(x_158)) {
+ x_162 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_162 = x_158;
+}
+lean_ctor_set(x_162, 0, x_152);
+lean_ctor_set(x_162, 1, x_161);
+lean_ctor_set(x_162, 2, x_154);
+x_163 = lean_ctor_get(x_150, 0);
+lean_inc(x_163);
+x_164 = lean_ctor_get(x_150, 1);
+lean_inc(x_164);
+x_165 = lean_ctor_get(x_150, 2);
+lean_inc(x_165);
+x_166 = lean_nat_dec_lt(x_164, x_165);
+if (x_166 == 0)
+{
+lean_object* x_167; lean_object* x_168; 
+lean_dec(x_165);
+lean_dec(x_164);
+lean_dec(x_163);
+lean_dec(x_159);
+lean_dec(x_6);
+if (lean_is_scalar(x_151)) {
+ x_167 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_167 = x_151;
+}
+lean_ctor_set(x_167, 0, x_150);
+lean_ctor_set(x_167, 1, x_162);
+x_168 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_168, 0, x_149);
+lean_ctor_set(x_168, 1, x_167);
+lean_ctor_set(x_4, 1, x_168);
+return x_4;
+}
+else
+{
+lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; uint8_t x_176; 
+if (lean_is_exclusive(x_150)) {
+ lean_ctor_release(x_150, 0);
+ lean_ctor_release(x_150, 1);
+ lean_ctor_release(x_150, 2);
+ x_169 = x_150;
+} else {
+ lean_dec_ref(x_150);
+ x_169 = lean_box(0);
+}
+x_170 = lean_array_fget(x_163, x_164);
+x_171 = lean_nat_add(x_164, x_160);
+lean_dec(x_164);
+if (lean_is_scalar(x_169)) {
+ x_172 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_172 = x_169;
+}
+lean_ctor_set(x_172, 0, x_163);
+lean_ctor_set(x_172, 1, x_171);
+lean_ctor_set(x_172, 2, x_165);
+x_173 = lean_ctor_get(x_149, 0);
+lean_inc(x_173);
+x_174 = lean_ctor_get(x_149, 1);
+lean_inc(x_174);
+x_175 = lean_ctor_get(x_149, 2);
+lean_inc(x_175);
+x_176 = lean_nat_dec_lt(x_174, x_175);
+if (x_176 == 0)
+{
+lean_object* x_177; lean_object* x_178; 
+lean_dec(x_175);
+lean_dec(x_174);
+lean_dec(x_173);
+lean_dec(x_170);
+lean_dec(x_159);
+lean_dec(x_6);
+if (lean_is_scalar(x_151)) {
+ x_177 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_177 = x_151;
+}
+lean_ctor_set(x_177, 0, x_172);
+lean_ctor_set(x_177, 1, x_162);
+x_178 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_178, 0, x_149);
+lean_ctor_set(x_178, 1, x_177);
+lean_ctor_set(x_4, 1, x_178);
+return x_4;
+}
+else
+{
+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; size_t x_189; size_t x_190; 
+if (lean_is_exclusive(x_149)) {
+ lean_ctor_release(x_149, 0);
+ lean_ctor_release(x_149, 1);
+ lean_ctor_release(x_149, 2);
+ x_179 = x_149;
+} else {
+ lean_dec_ref(x_149);
+ x_179 = lean_box(0);
+}
+x_180 = lean_array_fget(x_173, x_174);
+x_181 = lean_nat_add(x_174, x_160);
+lean_dec(x_174);
+if (lean_is_scalar(x_179)) {
+ x_182 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_182 = x_179;
+}
+lean_ctor_set(x_182, 0, x_173);
+lean_ctor_set(x_182, 1, x_181);
+lean_ctor_set(x_182, 2, x_175);
+x_183 = l_Lean_Expr_fvarId_x21(x_6);
+x_184 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_184, 0, x_170);
+lean_ctor_set(x_184, 1, x_159);
+x_185 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_185, 0, x_180);
+lean_ctor_set(x_185, 1, x_184);
+if (lean_is_scalar(x_151)) {
+ x_186 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_186 = x_151;
+}
+lean_ctor_set(x_186, 0, x_172);
+lean_ctor_set(x_186, 1, x_162);
+x_187 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_187, 0, x_182);
+lean_ctor_set(x_187, 1, x_186);
+x_188 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_11, x_183, x_185);
+lean_ctor_set(x_4, 1, x_187);
+lean_ctor_set(x_4, 0, x_188);
+x_189 = 1;
+x_190 = lean_usize_add(x_3, x_189);
+x_3 = x_190;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; uint8_t x_200; 
+x_192 = lean_ctor_get(x_4, 0);
+lean_inc(x_192);
+lean_dec(x_4);
+x_193 = lean_ctor_get(x_7, 0);
+lean_inc(x_193);
 if (lean_is_exclusive(x_7)) {
  lean_ctor_release(x_7, 0);
  lean_ctor_release(x_7, 1);
- x_98 = x_7;
+ x_194 = x_7;
 } else {
  lean_dec_ref(x_7);
- x_98 = lean_box(0);
+ x_194 = lean_box(0);
 }
-x_99 = lean_ctor_get(x_8, 0);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_8, 1);
-lean_inc(x_100);
-x_101 = lean_ctor_get(x_8, 2);
-lean_inc(x_101);
-x_102 = lean_nat_dec_lt(x_100, x_101);
-if (x_102 == 0)
-{
-lean_object* x_103; lean_object* x_104; 
-lean_dec(x_101);
-lean_dec(x_100);
-lean_dec(x_99);
-lean_dec(x_6);
-if (lean_is_scalar(x_98)) {
- x_103 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_103 = x_98;
-}
-lean_ctor_set(x_103, 0, x_97);
-lean_ctor_set(x_103, 1, x_8);
-x_104 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_104, 0, x_96);
-lean_ctor_set(x_104, 1, x_103);
-return x_104;
-}
-else
-{
-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; uint8_t x_113; 
+x_195 = lean_ctor_get(x_8, 0);
+lean_inc(x_195);
 if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 0);
  lean_ctor_release(x_8, 1);
- lean_ctor_release(x_8, 2);
- x_105 = x_8;
+ x_196 = x_8;
 } else {
  lean_dec_ref(x_8);
- x_105 = lean_box(0);
+ x_196 = lean_box(0);
 }
-x_106 = lean_array_fget(x_99, x_100);
-x_107 = lean_unsigned_to_nat(1u);
-x_108 = lean_nat_add(x_100, x_107);
-lean_dec(x_100);
-if (lean_is_scalar(x_105)) {
- x_109 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_109 = x_105;
-}
-lean_ctor_set(x_109, 0, x_99);
-lean_ctor_set(x_109, 1, x_108);
-lean_ctor_set(x_109, 2, x_101);
-x_110 = lean_ctor_get(x_97, 0);
-lean_inc(x_110);
-x_111 = lean_ctor_get(x_97, 1);
-lean_inc(x_111);
-x_112 = lean_ctor_get(x_97, 2);
-lean_inc(x_112);
-x_113 = lean_nat_dec_lt(x_111, x_112);
-if (x_113 == 0)
+x_197 = lean_ctor_get(x_9, 0);
+lean_inc(x_197);
+x_198 = lean_ctor_get(x_9, 1);
+lean_inc(x_198);
+x_199 = lean_ctor_get(x_9, 2);
+lean_inc(x_199);
+x_200 = lean_nat_dec_lt(x_198, x_199);
+if (x_200 == 0)
 {
-lean_object* x_114; lean_object* x_115; 
-lean_dec(x_112);
-lean_dec(x_111);
-lean_dec(x_110);
-lean_dec(x_106);
+lean_object* x_201; lean_object* x_202; lean_object* x_203; 
+lean_dec(x_199);
+lean_dec(x_198);
+lean_dec(x_197);
 lean_dec(x_6);
-if (lean_is_scalar(x_98)) {
- x_114 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_196)) {
+ x_201 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_114 = x_98;
+ x_201 = x_196;
 }
-lean_ctor_set(x_114, 0, x_97);
-lean_ctor_set(x_114, 1, x_109);
-x_115 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_115, 0, x_96);
-lean_ctor_set(x_115, 1, x_114);
-return x_115;
+lean_ctor_set(x_201, 0, x_195);
+lean_ctor_set(x_201, 1, x_9);
+if (lean_is_scalar(x_194)) {
+ x_202 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_202 = x_194;
+}
+lean_ctor_set(x_202, 0, x_193);
+lean_ctor_set(x_202, 1, x_201);
+x_203 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_203, 0, x_192);
+lean_ctor_set(x_203, 1, x_202);
+return x_203;
 }
 else
 {
-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; size_t x_125; size_t x_126; 
-if (lean_is_exclusive(x_97)) {
- lean_ctor_release(x_97, 0);
- lean_ctor_release(x_97, 1);
- lean_ctor_release(x_97, 2);
- x_116 = x_97;
+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; uint8_t x_212; 
+if (lean_is_exclusive(x_9)) {
+ lean_ctor_release(x_9, 0);
+ lean_ctor_release(x_9, 1);
+ lean_ctor_release(x_9, 2);
+ x_204 = x_9;
 } else {
- lean_dec_ref(x_97);
- x_116 = lean_box(0);
+ lean_dec_ref(x_9);
+ x_204 = lean_box(0);
 }
-x_117 = lean_array_fget(x_110, x_111);
-x_118 = lean_nat_add(x_111, x_107);
-lean_dec(x_111);
-if (lean_is_scalar(x_116)) {
- x_119 = lean_alloc_ctor(0, 3, 0);
+x_205 = lean_array_fget(x_197, x_198);
+x_206 = lean_unsigned_to_nat(1u);
+x_207 = lean_nat_add(x_198, x_206);
+lean_dec(x_198);
+if (lean_is_scalar(x_204)) {
+ x_208 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_119 = x_116;
+ x_208 = x_204;
 }
-lean_ctor_set(x_119, 0, x_110);
-lean_ctor_set(x_119, 1, x_118);
-lean_ctor_set(x_119, 2, x_112);
-x_120 = l_Lean_Expr_fvarId_x21(x_6);
-x_121 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_121, 0, x_117);
-lean_ctor_set(x_121, 1, x_106);
-if (lean_is_scalar(x_98)) {
- x_122 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_208, 0, x_197);
+lean_ctor_set(x_208, 1, x_207);
+lean_ctor_set(x_208, 2, x_199);
+x_209 = lean_ctor_get(x_195, 0);
+lean_inc(x_209);
+x_210 = lean_ctor_get(x_195, 1);
+lean_inc(x_210);
+x_211 = lean_ctor_get(x_195, 2);
+lean_inc(x_211);
+x_212 = lean_nat_dec_lt(x_210, x_211);
+if (x_212 == 0)
+{
+lean_object* x_213; lean_object* x_214; lean_object* x_215; 
+lean_dec(x_211);
+lean_dec(x_210);
+lean_dec(x_209);
+lean_dec(x_205);
+lean_dec(x_6);
+if (lean_is_scalar(x_196)) {
+ x_213 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_122 = x_98;
+ x_213 = x_196;
 }
-lean_ctor_set(x_122, 0, x_119);
-lean_ctor_set(x_122, 1, x_109);
-x_123 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_96, x_120, x_121);
-x_124 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_122);
-x_125 = 1;
-x_126 = lean_usize_add(x_3, x_125);
-x_3 = x_126;
-x_4 = x_124;
+lean_ctor_set(x_213, 0, x_195);
+lean_ctor_set(x_213, 1, x_208);
+if (lean_is_scalar(x_194)) {
+ x_214 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_214 = x_194;
+}
+lean_ctor_set(x_214, 0, x_193);
+lean_ctor_set(x_214, 1, x_213);
+x_215 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_215, 0, x_192);
+lean_ctor_set(x_215, 1, x_214);
+return x_215;
+}
+else
+{
+lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; uint8_t x_223; 
+if (lean_is_exclusive(x_195)) {
+ lean_ctor_release(x_195, 0);
+ lean_ctor_release(x_195, 1);
+ lean_ctor_release(x_195, 2);
+ x_216 = x_195;
+} else {
+ lean_dec_ref(x_195);
+ x_216 = lean_box(0);
+}
+x_217 = lean_array_fget(x_209, x_210);
+x_218 = lean_nat_add(x_210, x_206);
+lean_dec(x_210);
+if (lean_is_scalar(x_216)) {
+ x_219 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_219 = x_216;
+}
+lean_ctor_set(x_219, 0, x_209);
+lean_ctor_set(x_219, 1, x_218);
+lean_ctor_set(x_219, 2, x_211);
+x_220 = lean_ctor_get(x_193, 0);
+lean_inc(x_220);
+x_221 = lean_ctor_get(x_193, 1);
+lean_inc(x_221);
+x_222 = lean_ctor_get(x_193, 2);
+lean_inc(x_222);
+x_223 = lean_nat_dec_lt(x_221, x_222);
+if (x_223 == 0)
+{
+lean_object* x_224; lean_object* x_225; lean_object* x_226; 
+lean_dec(x_222);
+lean_dec(x_221);
+lean_dec(x_220);
+lean_dec(x_217);
+lean_dec(x_205);
+lean_dec(x_6);
+if (lean_is_scalar(x_196)) {
+ x_224 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_224 = x_196;
+}
+lean_ctor_set(x_224, 0, x_219);
+lean_ctor_set(x_224, 1, x_208);
+if (lean_is_scalar(x_194)) {
+ x_225 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_225 = x_194;
+}
+lean_ctor_set(x_225, 0, x_193);
+lean_ctor_set(x_225, 1, x_224);
+x_226 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_226, 0, x_192);
+lean_ctor_set(x_226, 1, x_225);
+return x_226;
+}
+else
+{
+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; size_t x_238; size_t x_239; 
+if (lean_is_exclusive(x_193)) {
+ lean_ctor_release(x_193, 0);
+ lean_ctor_release(x_193, 1);
+ lean_ctor_release(x_193, 2);
+ x_227 = x_193;
+} else {
+ lean_dec_ref(x_193);
+ x_227 = lean_box(0);
+}
+x_228 = lean_array_fget(x_220, x_221);
+x_229 = lean_nat_add(x_221, x_206);
+lean_dec(x_221);
+if (lean_is_scalar(x_227)) {
+ x_230 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_230 = x_227;
+}
+lean_ctor_set(x_230, 0, x_220);
+lean_ctor_set(x_230, 1, x_229);
+lean_ctor_set(x_230, 2, x_222);
+x_231 = l_Lean_Expr_fvarId_x21(x_6);
+x_232 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_232, 0, x_217);
+lean_ctor_set(x_232, 1, x_205);
+x_233 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_233, 0, x_228);
+lean_ctor_set(x_233, 1, x_232);
+if (lean_is_scalar(x_196)) {
+ x_234 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_234 = x_196;
+}
+lean_ctor_set(x_234, 0, x_219);
+lean_ctor_set(x_234, 1, x_208);
+if (lean_is_scalar(x_194)) {
+ x_235 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_235 = x_194;
+}
+lean_ctor_set(x_235, 0, x_230);
+lean_ctor_set(x_235, 1, x_234);
+x_236 = l_Std_RBNode_insert___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__1(x_192, x_231, x_233);
+x_237 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_237, 0, x_236);
+lean_ctor_set(x_237, 1, x_235);
+x_238 = 1;
+x_239 = lean_usize_add(x_3, x_238);
+x_3 = x_239;
+x_4 = x_237;
 goto _start;
 }
 }
@@ -18781,31 +19810,37 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; size_t x_13; size_t x_14; lean_object* x_15; lean_object* x_16; 
-x_4 = lean_box(0);
-x_5 = lean_array_get_size(x_2);
-x_6 = lean_unsigned_to_nat(0u);
-x_7 = l_Array_toSubarray___rarg(x_2, x_6, x_5);
-x_8 = lean_array_get_size(x_3);
-x_9 = l_Array_toSubarray___rarg(x_3, x_6, x_8);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_7);
-lean_ctor_set(x_10, 1, x_9);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_4);
-lean_ctor_set(x_11, 1, x_10);
-x_12 = lean_array_get_size(x_1);
-x_13 = lean_usize_of_nat(x_12);
-lean_dec(x_12);
-x_14 = 0;
-x_15 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__4(x_1, x_13, x_14, x_11);
-x_16 = lean_ctor_get(x_15, 0);
-lean_inc(x_16);
-lean_dec(x_15);
-return x_16;
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; lean_object* x_20; 
+x_5 = lean_box(0);
+x_6 = lean_array_get_size(x_2);
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = l_Array_toSubarray___rarg(x_2, x_7, x_6);
+x_9 = lean_array_get_size(x_3);
+x_10 = l_Array_toSubarray___rarg(x_3, x_7, x_9);
+x_11 = lean_array_get_size(x_4);
+x_12 = l_Array_toSubarray___rarg(x_4, x_7, x_11);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_10);
+lean_ctor_set(x_13, 1, x_12);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_8);
+lean_ctor_set(x_14, 1, x_13);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_5);
+lean_ctor_set(x_15, 1, x_14);
+x_16 = lean_array_get_size(x_1);
+x_17 = lean_usize_of_nat(x_16);
+lean_dec(x_16);
+x_18 = 0;
+x_19 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__4(x_1, x_17, x_18, x_15);
+x_20 = lean_ctor_get(x_19, 0);
+lean_inc(x_20);
+lean_dec(x_19);
+return x_20;
 }
 }
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -18835,13 +19870,13 @@ lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_4; 
-x_4 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(x_1, x_2, x_3);
+lean_object* x_5; 
+x_5 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(x_1, x_2, x_3, x_4);
 lean_dec(x_1);
-return x_4;
+return x_5;
 }
 }
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -19215,7 +20250,7 @@ lean_ctor_set(x_28, 1, x_27);
 x_29 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_29, 0, x_28);
 lean_ctor_set(x_29, 1, x_13);
-x_30 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_30 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_31 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_31, 0, x_29);
 lean_ctor_set(x_31, 1, x_30);
@@ -19274,7 +20309,7 @@ lean_ctor_set(x_50, 1, x_49);
 x_51 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_51, 0, x_50);
 lean_ctor_set(x_51, 1, x_13);
-x_52 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_52 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_53 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_53, 0, x_51);
 lean_ctor_set(x_53, 1, x_52);
@@ -19349,7 +20384,7 @@ lean_ctor_set(x_76, 1, x_75);
 x_77 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_77, 0, x_76);
 lean_ctor_set(x_77, 1, x_13);
-x_78 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_78 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_79 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_79, 0, x_77);
 lean_ctor_set(x_79, 1, x_78);
@@ -21735,165 +22770,169 @@ return x_31;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___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_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t 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_11 = lean_array_get_size(x_1);
-x_12 = lean_unsigned_to_nat(0u);
-x_13 = l_Array_toSubarray___rarg(x_1, x_12, x_11);
-x_14 = l_Lean_Expr_getAppNumArgsAux(x_2, x_12);
-x_15 = l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___closed__1;
-lean_inc(x_14);
-x_16 = lean_mk_array(x_14, x_15);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_nat_sub(x_14, x_17);
-lean_dec(x_14);
-x_19 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_2, x_16, x_18);
-x_20 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_13);
-lean_ctor_set(x_21, 1, x_20);
-x_22 = lean_array_get_size(x_19);
-x_23 = lean_usize_of_nat(x_22);
-lean_dec(x_22);
-x_24 = 0;
-x_25 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__2(x_19, x_23, x_24, x_21, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_19);
-x_26 = lean_ctor_get(x_25, 0);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; size_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_12 = lean_array_get_size(x_1);
+x_13 = lean_unsigned_to_nat(0u);
+x_14 = l_Array_toSubarray___rarg(x_1, x_13, x_12);
+x_15 = l_Lean_Expr_getAppNumArgsAux(x_2, x_13);
+x_16 = l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___closed__1;
+lean_inc(x_15);
+x_17 = lean_mk_array(x_15, x_16);
+x_18 = lean_unsigned_to_nat(1u);
+x_19 = lean_nat_sub(x_15, x_18);
+lean_dec(x_15);
+x_20 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_2, x_17, x_19);
+x_21 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_14);
+lean_ctor_set(x_22, 1, x_21);
+x_23 = lean_array_get_size(x_20);
+x_24 = lean_usize_of_nat(x_23);
+lean_dec(x_23);
+x_25 = 0;
+x_26 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__2(x_20, x_24, x_25, x_22, x_6, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_20);
+x_27 = lean_ctor_get(x_26, 0);
 lean_inc(x_27);
-lean_dec(x_25);
 x_28 = lean_ctor_get(x_26, 1);
 lean_inc(x_28);
 lean_dec(x_26);
-x_29 = l_Lean_mkAppN(x_3, x_28);
+x_29 = lean_ctor_get(x_27, 1);
+lean_inc(x_29);
+lean_dec(x_27);
+lean_inc(x_29);
+x_30 = l_Lean_mkAppN(x_3, x_29);
+lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_29);
-x_30 = lean_infer_type(x_29, x_6, x_7, x_8, x_9, x_27);
-if (lean_obj_tag(x_30) == 0)
+lean_inc(x_30);
+x_31 = lean_infer_type(x_30, x_7, x_8, x_9, x_10, x_28);
+if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; uint8_t x_35; lean_object* x_36; 
-x_31 = lean_ctor_get(x_30, 0);
-lean_inc(x_31);
-x_32 = lean_ctor_get(x_30, 1);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; 
+x_32 = lean_ctor_get(x_31, 0);
 lean_inc(x_32);
-lean_dec(x_30);
-x_33 = lean_box(0);
-x_34 = 1;
-x_35 = 2;
-lean_inc(x_9);
-x_36 = l___private_Lean_Meta_Basic_0__Lean_Meta_forallMetaTelescopeReducingAux(x_31, x_34, x_33, x_35, x_6, x_7, x_8, x_9, x_32);
-if (lean_obj_tag(x_36) == 0)
+x_33 = lean_ctor_get(x_31, 1);
+lean_inc(x_33);
+lean_dec(x_31);
+x_34 = lean_array_get_size(x_29);
+lean_dec(x_29);
+x_35 = lean_nat_sub(x_4, x_34);
+lean_dec(x_34);
+x_36 = 2;
+lean_inc(x_10);
+x_37 = l_Lean_Meta_forallMetaBoundedTelescope(x_32, x_35, x_36, x_7, x_8, x_9, x_10, x_33);
+if (lean_obj_tag(x_37) == 0)
 {
-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; size_t x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; size_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_38 = lean_ctor_get(x_37, 0);
 lean_inc(x_38);
-lean_dec(x_36);
-x_39 = lean_ctor_get(x_37, 0);
+x_39 = lean_ctor_get(x_37, 1);
 lean_inc(x_39);
 lean_dec(x_37);
-x_40 = lean_st_ref_get(x_9, x_38);
-lean_dec(x_9);
-x_41 = lean_ctor_get(x_40, 1);
-lean_inc(x_41);
-lean_dec(x_40);
-x_42 = lean_st_ref_take(x_5, x_41);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
+x_40 = lean_ctor_get(x_38, 0);
+lean_inc(x_40);
+lean_dec(x_38);
+x_41 = lean_st_ref_get(x_10, x_39);
+lean_dec(x_10);
+x_42 = lean_ctor_get(x_41, 1);
+lean_inc(x_42);
+lean_dec(x_41);
+x_43 = lean_st_ref_take(x_6, x_42);
+x_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
-lean_dec(x_42);
-x_45 = lean_array_get_size(x_39);
-x_46 = lean_usize_of_nat(x_45);
-lean_dec(x_45);
-lean_inc(x_39);
-x_47 = l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__3(x_46, x_24, x_39);
-x_48 = l_Array_append___rarg(x_43, x_47);
-x_49 = lean_st_ref_set(x_5, x_48, x_44);
-x_50 = !lean_is_exclusive(x_49);
-if (x_50 == 0)
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
+x_46 = lean_array_get_size(x_40);
+x_47 = lean_usize_of_nat(x_46);
+lean_dec(x_46);
+lean_inc(x_40);
+x_48 = l_Array_mapMUnsafe_map___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__3(x_47, x_25, x_40);
+x_49 = l_Array_append___rarg(x_44, x_48);
+x_50 = lean_st_ref_set(x_6, x_49, x_45);
+x_51 = !lean_is_exclusive(x_50);
+if (x_51 == 0)
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_49, 0);
-lean_dec(x_51);
-x_52 = l_Lean_mkAppN(x_29, x_39);
-x_53 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_53, 0, x_52);
-lean_ctor_set(x_49, 0, x_53);
-return x_49;
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_50, 0);
+lean_dec(x_52);
+x_53 = l_Lean_mkAppN(x_30, x_40);
+x_54 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_50, 0, x_54);
+return x_50;
 }
 else
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_54 = lean_ctor_get(x_49, 1);
-lean_inc(x_54);
-lean_dec(x_49);
-x_55 = l_Lean_mkAppN(x_29, x_39);
-x_56 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_56, 0, x_55);
-x_57 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_55 = lean_ctor_get(x_50, 1);
+lean_inc(x_55);
+lean_dec(x_50);
+x_56 = l_Lean_mkAppN(x_30, x_40);
+x_57 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_54);
-return x_57;
+x_58 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_58, 0, x_57);
+lean_ctor_set(x_58, 1, x_55);
+return x_58;
 }
 }
 else
 {
-uint8_t x_58; 
-lean_dec(x_29);
-lean_dec(x_9);
-x_58 = !lean_is_exclusive(x_36);
-if (x_58 == 0)
+uint8_t x_59; 
+lean_dec(x_30);
+lean_dec(x_10);
+x_59 = !lean_is_exclusive(x_37);
+if (x_59 == 0)
 {
-return x_36;
+return x_37;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_36, 0);
-x_60 = lean_ctor_get(x_36, 1);
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_37, 0);
+x_61 = lean_ctor_get(x_37, 1);
+lean_inc(x_61);
 lean_inc(x_60);
-lean_inc(x_59);
-lean_dec(x_36);
-x_61 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_61, 0, x_59);
-lean_ctor_set(x_61, 1, x_60);
-return x_61;
+lean_dec(x_37);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_60);
+lean_ctor_set(x_62, 1, x_61);
+return x_62;
 }
 }
 }
 else
 {
-uint8_t x_62; 
+uint8_t x_63; 
+lean_dec(x_30);
 lean_dec(x_29);
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-lean_dec(x_6);
-x_62 = !lean_is_exclusive(x_30);
-if (x_62 == 0)
+x_63 = !lean_is_exclusive(x_31);
+if (x_63 == 0)
 {
-return x_30;
+return x_31;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_63 = lean_ctor_get(x_30, 0);
-x_64 = lean_ctor_get(x_30, 1);
+lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_64 = lean_ctor_get(x_31, 0);
+x_65 = lean_ctor_get(x_31, 1);
+lean_inc(x_65);
 lean_inc(x_64);
-lean_inc(x_63);
-lean_dec(x_30);
-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;
+lean_dec(x_31);
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_64);
+lean_ctor_set(x_66, 1, x_65);
+return x_66;
 }
 }
 }
@@ -21963,104 +23002,111 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+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_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 
 x_14 = lean_ctor_get(x_11, 0);
 lean_inc(x_14);
 lean_dec(x_11);
-x_15 = lean_ctor_get(x_14, 0);
+x_15 = lean_ctor_get(x_14, 1);
 lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
+x_16 = lean_ctor_get(x_14, 0);
 lean_inc(x_16);
 lean_dec(x_14);
-x_17 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
-x_36 = lean_st_ref_get(x_7, x_8);
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_37, 3);
-lean_inc(x_38);
-lean_dec(x_37);
-x_39 = lean_ctor_get_uint8(x_38, sizeof(void*)*1);
-lean_dec(x_38);
-if (x_39 == 0)
-{
-lean_object* x_40; uint8_t x_41; 
-x_40 = lean_ctor_get(x_36, 1);
+x_17 = lean_ctor_get(x_15, 0);
+lean_inc(x_17);
+x_18 = lean_ctor_get(x_15, 1);
+lean_inc(x_18);
+lean_dec(x_15);
+x_19 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
+x_38 = lean_st_ref_get(x_7, x_8);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_39, 3);
 lean_inc(x_40);
-lean_dec(x_36);
-x_41 = 0;
-x_18 = x_41;
-x_19 = x_40;
-goto block_35;
-}
-else
+lean_dec(x_39);
+x_41 = lean_ctor_get_uint8(x_40, sizeof(void*)*1);
+lean_dec(x_40);
+if (x_41 == 0)
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; uint8_t x_46; 
-x_42 = lean_ctor_get(x_36, 1);
+lean_object* x_42; uint8_t x_43; 
+x_42 = lean_ctor_get(x_38, 1);
 lean_inc(x_42);
-lean_dec(x_36);
-x_43 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__5(x_17, x_3, x_4, x_5, x_6, x_7, x_42);
-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_unbox(x_44);
-lean_dec(x_44);
-x_18 = x_46;
-x_19 = x_45;
-goto block_35;
-}
-block_35:
-{
-if (x_18 == 0)
-{
-lean_object* x_20; lean_object* x_21; 
-x_20 = lean_box(0);
-x_21 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(x_16, x_2, x_15, x_20, x_3, x_4, x_5, x_6, x_7, x_19);
-lean_dec(x_3);
-return x_21;
+lean_dec(x_38);
+x_43 = 0;
+x_20 = x_43;
+x_21 = x_42;
+goto block_37;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
+x_44 = lean_ctor_get(x_38, 1);
+lean_inc(x_44);
+lean_dec(x_38);
+x_45 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__5(x_19, x_3, x_4, x_5, x_6, x_7, x_44);
+x_46 = lean_ctor_get(x_45, 0);
+lean_inc(x_46);
+x_47 = lean_ctor_get(x_45, 1);
+lean_inc(x_47);
+lean_dec(x_45);
+x_48 = lean_unbox(x_46);
+lean_dec(x_46);
+x_20 = x_48;
+x_21 = x_47;
+goto block_37;
+}
+block_37:
+{
+if (x_20 == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_box(0);
+x_23 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(x_18, x_2, x_16, x_17, x_22, x_3, x_4, x_5, x_6, x_7, x_21);
+lean_dec(x_3);
+lean_dec(x_17);
+return x_23;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 lean_inc(x_2);
-x_22 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_22, 0, x_2);
-x_23 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__2;
-x_24 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_22);
-x_25 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__4;
+x_24 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_24, 0, x_2);
+x_25 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__2;
 x_26 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_26, 0, x_24);
-lean_ctor_set(x_26, 1, x_25);
-lean_inc(x_15);
-x_27 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_27, 0, x_15);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_24);
+x_27 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__2___closed__4;
 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___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+lean_inc(x_16);
+x_29 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_29, 0, x_16);
 x_30 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_30, 0, x_28);
 lean_ctor_set(x_30, 1, x_29);
-x_31 = l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4(x_17, x_30, x_3, x_4, x_5, x_6, x_7, x_19);
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
-lean_inc(x_33);
-lean_dec(x_31);
-x_34 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(x_16, x_2, x_15, x_32, x_3, x_4, x_5, x_6, x_7, x_33);
+x_31 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_32 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+x_33 = l_Lean_addTrace___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__4(x_19, x_32, x_3, x_4, x_5, x_6, x_7, x_21);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
+lean_dec(x_33);
+x_36 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(x_18, x_2, x_16, x_17, x_34, x_3, x_4, x_5, x_6, x_7, x_35);
 lean_dec(x_3);
-lean_dec(x_32);
-return x_34;
+lean_dec(x_34);
+lean_dec(x_17);
+return x_36;
 }
 }
 }
 }
 else
 {
-lean_object* x_47; lean_object* x_48; 
+lean_object* x_49; lean_object* x_50; 
 lean_dec(x_9);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -22068,12 +23114,12 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_47 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_47, 0, x_2);
-x_48 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_48, 0, x_47);
-lean_ctor_set(x_48, 1, x_8);
-return x_48;
+x_49 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_49, 0, x_2);
+x_50 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_50, 0, x_49);
+lean_ctor_set(x_50, 1, x_8);
+return x_50;
 }
 }
 }
@@ -22276,14 +23322,15 @@ lean_dec(x_3);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___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_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___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) {
 _start:
 {
-lean_object* x_11; 
-x_11 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_object* x_12; 
+x_12 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__1(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_6);
 lean_dec(x_5);
 lean_dec(x_4);
-return x_11;
+return x_12;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
@@ -22352,7 +23399,7 @@ lean_ctor_set(x_14, 0, x_2);
 x_15 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_15, 0, x_13);
 lean_ctor_set(x_15, 1, x_14);
-x_16 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_16 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_17 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_17, 0, x_15);
 lean_ctor_set(x_17, 1, x_16);
@@ -22699,7 +23746,7 @@ x_14 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_p
 x_15 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_15, 0, x_14);
 lean_ctor_set(x_15, 1, x_13);
-x_16 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_16 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_17 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_17, 0, x_15);
 lean_ctor_set(x_17, 1, x_16);
@@ -23056,7 +24103,7 @@ lean_ctor_set(x_37, 1, x_36);
 x_38 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_32);
-x_39 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_39 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_40 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_40, 0, x_38);
 lean_ctor_set(x_40, 1, x_39);
@@ -23084,7 +24131,7 @@ lean_ctor_set(x_48, 1, x_47);
 x_49 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_49, 0, x_48);
 lean_ctor_set(x_49, 1, x_32);
-x_50 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_50 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_51 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_51, 0, x_49);
 lean_ctor_set(x_51, 1, x_50);
@@ -23301,152 +24348,152 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _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; lean_object* x_20; 
-lean_dec(x_7);
-x_13 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(x_1, x_2, x_3);
-x_14 = lean_st_ref_get(x_11, x_12);
-x_15 = lean_ctor_get(x_14, 1);
-lean_inc(x_15);
-lean_dec(x_14);
-x_16 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_17 = lean_st_mk_ref(x_16, x_15);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+lean_dec(x_8);
+x_14 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_mkMap(x_1, x_2, x_3, x_4);
+x_15 = lean_st_ref_get(x_12, x_13);
+x_16 = lean_ctor_get(x_15, 1);
+lean_inc(x_16);
+lean_dec(x_15);
+x_17 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_18 = lean_st_mk_ref(x_17, x_16);
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_18);
-x_20 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate(x_4, x_13, x_18, x_8, x_9, x_10, x_11, x_19);
-if (lean_obj_tag(x_20) == 0)
+lean_inc(x_19);
+x_21 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate(x_5, x_14, x_19, x_9, x_10, x_11, x_12, x_20);
+if (lean_obj_tag(x_21) == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; 
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_43; lean_object* x_44; lean_object* x_45; uint8_t x_46; 
+x_22 = lean_ctor_get(x_21, 0);
 lean_inc(x_22);
-lean_dec(x_20);
-x_23 = lean_st_ref_get(x_11, x_22);
-x_24 = lean_ctor_get(x_23, 1);
-lean_inc(x_24);
-lean_dec(x_23);
-x_25 = lean_st_ref_get(x_18, x_24);
-lean_dec(x_18);
-x_26 = lean_ctor_get(x_25, 0);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
+x_23 = lean_ctor_get(x_21, 1);
+lean_inc(x_23);
+lean_dec(x_21);
+x_24 = lean_st_ref_get(x_12, x_23);
+x_25 = lean_ctor_get(x_24, 1);
+lean_inc(x_25);
+lean_dec(x_24);
+x_26 = lean_st_ref_get(x_19, x_25);
+lean_dec(x_19);
+x_27 = lean_ctor_get(x_26, 0);
 lean_inc(x_27);
-lean_dec(x_25);
-x_42 = lean_st_ref_get(x_11, x_27);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_43, 3);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+x_43 = lean_st_ref_get(x_12, x_28);
+x_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
-lean_dec(x_43);
-x_45 = lean_ctor_get_uint8(x_44, sizeof(void*)*1);
+x_45 = lean_ctor_get(x_44, 3);
+lean_inc(x_45);
 lean_dec(x_44);
-if (x_45 == 0)
+x_46 = lean_ctor_get_uint8(x_45, sizeof(void*)*1);
+lean_dec(x_45);
+if (x_46 == 0)
 {
-lean_object* x_46; uint8_t x_47; 
-x_46 = lean_ctor_get(x_42, 1);
-lean_inc(x_46);
-lean_dec(x_42);
-x_47 = 0;
-x_28 = x_47;
-x_29 = x_46;
-goto block_41;
+lean_object* x_47; uint8_t x_48; 
+x_47 = lean_ctor_get(x_43, 1);
+lean_inc(x_47);
+lean_dec(x_43);
+x_48 = 0;
+x_29 = x_48;
+x_30 = x_47;
+goto block_42;
 }
 else
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; 
-x_48 = lean_ctor_get(x_42, 1);
-lean_inc(x_48);
-lean_dec(x_42);
-lean_inc(x_6);
-x_49 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_6, x_8, x_9, x_10, x_11, x_48);
-x_50 = lean_ctor_get(x_49, 0);
-lean_inc(x_50);
-x_51 = lean_ctor_get(x_49, 1);
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+x_49 = lean_ctor_get(x_43, 1);
+lean_inc(x_49);
+lean_dec(x_43);
+lean_inc(x_7);
+x_50 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_9, x_10, x_11, x_12, x_49);
+x_51 = lean_ctor_get(x_50, 0);
 lean_inc(x_51);
-lean_dec(x_49);
-x_52 = lean_unbox(x_50);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
 lean_dec(x_50);
-x_28 = x_52;
-x_29 = x_51;
-goto block_41;
+x_53 = lean_unbox(x_51);
+lean_dec(x_51);
+x_29 = x_53;
+x_30 = x_52;
+goto block_42;
 }
-block_41:
+block_42:
 {
-if (x_28 == 0)
+if (x_29 == 0)
 {
-lean_object* x_30; lean_object* x_31; 
-lean_dec(x_6);
-x_30 = lean_box(0);
-x_31 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__1(x_26, x_5, x_1, x_21, x_30, x_8, x_9, x_10, x_11, x_29);
-lean_dec(x_26);
-return x_31;
+lean_object* x_31; lean_object* x_32; 
+lean_dec(x_7);
+x_31 = lean_box(0);
+x_32 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__1(x_27, x_6, x_1, x_22, x_31, x_9, x_10, x_11, x_12, x_30);
+lean_dec(x_27);
+return x_32;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-lean_inc(x_21);
-x_32 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_32, 0, x_21);
-x_33 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2___closed__2;
-x_34 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_32);
-x_35 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
-x_36 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-x_37 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_6, x_36, x_8, x_9, x_10, x_11, x_29);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+lean_inc(x_22);
+x_33 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_33, 0, x_22);
+x_34 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2___closed__2;
+x_35 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_33);
+x_36 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_37 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_37, 0, x_35);
+lean_ctor_set(x_37, 1, x_36);
+x_38 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_37, x_9, x_10, x_11, x_12, x_30);
+x_39 = lean_ctor_get(x_38, 0);
 lean_inc(x_39);
-lean_dec(x_37);
-x_40 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__1(x_26, x_5, x_1, x_21, x_38, x_8, x_9, x_10, x_11, x_39);
+x_40 = lean_ctor_get(x_38, 1);
+lean_inc(x_40);
 lean_dec(x_38);
-lean_dec(x_26);
-return x_40;
+x_41 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__1(x_27, x_6, x_1, x_22, x_39, x_9, x_10, x_11, x_12, x_40);
+lean_dec(x_39);
+lean_dec(x_27);
+return x_41;
 }
 }
 }
 else
 {
-uint8_t x_53; 
-lean_dec(x_18);
+uint8_t x_54; 
+lean_dec(x_19);
+lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
-lean_dec(x_8);
+lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_5);
 lean_dec(x_1);
-x_53 = !lean_is_exclusive(x_20);
-if (x_53 == 0)
+x_54 = !lean_is_exclusive(x_21);
+if (x_54 == 0)
 {
-return x_20;
+return x_21;
 }
 else
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_54 = lean_ctor_get(x_20, 0);
-x_55 = lean_ctor_get(x_20, 1);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_21, 0);
+x_56 = lean_ctor_get(x_21, 1);
+lean_inc(x_56);
 lean_inc(x_55);
-lean_inc(x_54);
-lean_dec(x_20);
-x_56 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_56, 0, x_54);
-lean_ctor_set(x_56, 1, x_55);
-return x_56;
+lean_dec(x_21);
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_55);
+lean_ctor_set(x_57, 1, x_56);
+return x_57;
 }
 }
 }
@@ -23468,79 +24515,79 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof(lean_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_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof(lean_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_11; uint8_t x_12; lean_object* x_13; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
-x_11 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
-x_26 = lean_st_ref_get(x_9, x_10);
-x_27 = lean_ctor_get(x_26, 0);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_27, 3);
+lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
+x_12 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
+x_27 = lean_st_ref_get(x_10, x_11);
+x_28 = lean_ctor_get(x_27, 0);
 lean_inc(x_28);
-lean_dec(x_27);
-x_29 = lean_ctor_get_uint8(x_28, sizeof(void*)*1);
+x_29 = lean_ctor_get(x_28, 3);
+lean_inc(x_29);
 lean_dec(x_28);
-if (x_29 == 0)
+x_30 = lean_ctor_get_uint8(x_29, sizeof(void*)*1);
+lean_dec(x_29);
+if (x_30 == 0)
 {
-lean_object* x_30; uint8_t x_31; 
-x_30 = lean_ctor_get(x_26, 1);
-lean_inc(x_30);
-lean_dec(x_26);
-x_31 = 0;
-x_12 = x_31;
-x_13 = x_30;
-goto block_25;
+lean_object* x_31; uint8_t x_32; 
+x_31 = lean_ctor_get(x_27, 1);
+lean_inc(x_31);
+lean_dec(x_27);
+x_32 = 0;
+x_13 = x_32;
+x_14 = x_31;
+goto block_26;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
-x_32 = lean_ctor_get(x_26, 1);
-lean_inc(x_32);
-lean_dec(x_26);
-x_33 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_11, x_6, x_7, x_8, x_9, x_32);
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc(x_34);
-x_35 = lean_ctor_get(x_33, 1);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; 
+x_33 = lean_ctor_get(x_27, 1);
+lean_inc(x_33);
+lean_dec(x_27);
+x_34 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_12, x_7, x_8, x_9, x_10, x_33);
+x_35 = lean_ctor_get(x_34, 0);
 lean_inc(x_35);
-lean_dec(x_33);
-x_36 = lean_unbox(x_34);
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
 lean_dec(x_34);
-x_12 = x_36;
-x_13 = x_35;
-goto block_25;
+x_37 = lean_unbox(x_35);
+lean_dec(x_35);
+x_13 = x_37;
+x_14 = x_36;
+goto block_26;
 }
-block_25:
+block_26:
 {
-if (x_12 == 0)
+if (x_13 == 0)
 {
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_box(0);
-x_15 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(x_3, x_4, x_5, x_2, x_1, x_11, x_14, x_6, x_7, x_8, x_9, x_13);
-return x_15;
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_box(0);
+x_16 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(x_3, x_4, x_5, x_6, x_2, x_1, x_12, x_15, x_7, x_8, x_9, x_10, x_14);
+return x_16;
 }
 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; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
 lean_inc(x_2);
-x_16 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_16, 0, x_2);
-x_17 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__2;
-x_18 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-x_19 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
-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_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_11, x_20, x_6, x_7, x_8, x_9, x_13);
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
+x_17 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_17, 0, x_2);
+x_18 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__2;
+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 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_21 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+x_22 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_12, x_21, x_7, x_8, x_9, x_10, x_14);
+x_23 = lean_ctor_get(x_22, 0);
 lean_inc(x_23);
-lean_dec(x_21);
-x_24 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(x_3, x_4, x_5, x_2, x_1, x_11, x_22, x_6, x_7, x_8, x_9, x_23);
-return x_24;
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___lambda__2(x_3, x_4, x_5, x_6, x_2, x_1, x_12, x_23, x_7, x_8, x_9, x_10, x_24);
+return x_25;
 }
 }
 }
@@ -23568,6 +24615,148 @@ lean_dec(x_1);
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_13 = lean_unsigned_to_nat(1u);
+x_14 = lean_nat_add(x_1, x_13);
+lean_dec(x_1);
+x_15 = lean_array_push(x_2, x_7);
+x_16 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___rarg(x_3, x_4, x_5, x_6, x_14, x_15, x_8, x_9, x_10, x_11, x_12);
+return x_16;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___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, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; uint8_t x_13; 
+x_12 = lean_array_get_size(x_3);
+x_13 = lean_nat_dec_lt(x_5, x_12);
+lean_dec(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_14 = lean_apply_6(x_4, x_6, x_7, x_8, x_9, x_10, x_11);
+return x_14;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_array_fget(x_3, x_5);
+lean_inc(x_7);
+x_16 = l_Lean_Meta_getFVarLocalDecl(x_15, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_16) == 0)
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; 
+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 = l_Lean_LocalDecl_type(x_17);
+x_20 = l_Lean_Expr_replaceFVars(x_19, x_1, x_2);
+lean_dec(x_19);
+x_21 = l_Lean_LocalDecl_userName(x_17);
+x_22 = l_Lean_LocalDecl_binderInfo(x_17);
+lean_dec(x_17);
+x_23 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___rarg___lambda__1), 12, 6);
+lean_closure_set(x_23, 0, x_5);
+lean_closure_set(x_23, 1, x_6);
+lean_closure_set(x_23, 2, x_1);
+lean_closure_set(x_23, 3, x_2);
+lean_closure_set(x_23, 4, x_3);
+lean_closure_set(x_23, 5, x_4);
+x_24 = l_Lean_Meta_withLocalDecl___at_Lean_Meta_GeneralizeTelescope_generalizeTelescopeAux___spec__1___rarg(x_21, x_22, x_20, x_23, x_7, x_8, x_9, x_10, x_18);
+return x_24;
+}
+else
+{
+uint8_t x_25; 
+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_25 = !lean_is_exclusive(x_16);
+if (x_25 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_16, 0);
+x_27 = lean_ctor_get(x_16, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_16);
+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;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___rarg), 11, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___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, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_unsigned_to_nat(0u);
+x_12 = lean_nat_dec_eq(x_1, x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_14 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts_go___rarg(x_2, x_3, x_4, x_5, x_11, x_13, x_6, x_7, x_8, x_9, x_10);
+return x_14;
+}
+else
+{
+lean_object* x_15; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_15 = lean_apply_6(x_5, x_4, x_6, x_7, x_8, x_9, x_10);
+return x_15;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___rarg___boxed), 10, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___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) {
+_start:
+{
+lean_object* x_11; 
+x_11 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_1);
+return x_11;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -24748,74 +25937,68 @@ return x_18;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21, lean_object* x_22, lean_object* x_23, lean_object* x_24) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, size_t x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21, lean_object* x_22, lean_object* x_23, lean_object* x_24) {
 _start:
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_137; uint8_t x_138; 
-x_25 = lean_array_get_size(x_1);
-x_137 = lean_unsigned_to_nat(0u);
-x_138 = lean_nat_dec_lt(x_137, x_25);
-if (x_138 == 0)
-{
-x_26 = x_18;
-x_27 = x_24;
-goto block_136;
-}
-else
-{
-size_t x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
-x_139 = lean_usize_of_nat(x_25);
-x_140 = l_Array_foldrMUnsafe_fold___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__4(x_1, x_139, x_6, x_18, x_20, x_21, x_22, x_23, x_24);
-x_141 = lean_ctor_get(x_140, 0);
-lean_inc(x_141);
-x_142 = lean_ctor_get(x_140, 1);
-lean_inc(x_142);
-lean_dec(x_140);
-x_26 = x_141;
-x_27 = x_142;
-goto block_136;
-}
-block_136:
-{
-uint8_t x_28; uint8_t x_29; uint8_t x_30; lean_object* x_31; 
-x_28 = 0;
-x_29 = 1;
-x_30 = 1;
-lean_inc(x_2);
-x_31 = l_Lean_Meta_mkForallFVars(x_2, x_26, x_28, x_29, x_30, x_20, x_21, x_22, x_23, x_27);
-if (lean_obj_tag(x_31) == 0)
-{
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 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; size_t x_46; lean_object* x_47; 
-x_32 = lean_ctor_get(x_31, 0);
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_25 = l_Lean_instInhabitedExpr;
+x_26 = lean_array_get(x_25, x_19, x_1);
+x_27 = l_Lean_ConstantInfo_name(x_2);
+x_28 = l_Lean_mkConst(x_27, x_3);
+x_29 = l_Array_ofSubarray___rarg(x_4);
+x_30 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__6;
+x_31 = lean_array_push(x_30, x_5);
+x_32 = l_Array_append___rarg(x_29, x_31);
 lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
-lean_inc(x_33);
-lean_dec(x_31);
-x_34 = lean_array_get_size(x_2);
-x_35 = lean_nat_add(x_25, x_34);
-lean_dec(x_34);
-x_36 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__2;
-x_37 = l_Lean_mkConst(x_36, x_3);
-lean_inc(x_4);
-x_38 = l_Array_reverse___rarg(x_4);
-x_39 = lean_array_get_size(x_38);
-x_40 = lean_unsigned_to_nat(0u);
-x_41 = l_Array_toSubarray___rarg(x_38, x_40, x_39);
-x_42 = l_Array_ofSubarray___rarg(x_5);
-lean_inc(x_42);
-x_43 = l_Array_reverse___rarg(x_42);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_37);
-lean_ctor_set(x_44, 1, x_41);
-x_45 = lean_array_get_size(x_43);
-x_46 = lean_usize_of_nat(x_45);
-lean_dec(x_45);
+x_33 = l_Array_append___rarg(x_32, x_6);
+lean_inc(x_19);
+x_34 = l_Array_append___rarg(x_33, x_19);
+x_35 = l_Lean_mkAppN(x_28, x_34);
+x_36 = l_Lean_mkAppN(x_26, x_7);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
-x_47 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__3(x_43, x_46, x_6, x_44, x_20, x_21, x_22, x_23, x_33);
-lean_dec(x_43);
+x_37 = l_Lean_Meta_mkEq(x_35, x_36, x_20, x_21, x_22, x_23, x_24);
+if (lean_obj_tag(x_37) == 0)
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_89; uint8_t x_90; 
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_37, 1);
+lean_inc(x_39);
+lean_dec(x_37);
+x_89 = lean_unsigned_to_nat(0u);
+x_90 = lean_nat_dec_lt(x_89, x_16);
+if (x_90 == 0)
+{
+x_40 = x_38;
+x_41 = x_39;
+goto block_88;
+}
+else
+{
+size_t x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_91 = lean_usize_of_nat(x_16);
+x_92 = l_Array_foldrMUnsafe_fold___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__4(x_17, x_91, x_18, x_38, x_20, x_21, x_22, x_23, x_39);
+x_93 = lean_ctor_get(x_92, 0);
+lean_inc(x_93);
+x_94 = lean_ctor_get(x_92, 1);
+lean_inc(x_94);
+lean_dec(x_92);
+x_40 = x_93;
+x_41 = x_94;
+goto block_88;
+}
+block_88:
+{
+lean_object* x_42; lean_object* x_43; uint8_t x_44; uint8_t x_45; uint8_t x_46; lean_object* x_47; 
+x_42 = l_Array_append___rarg(x_32, x_8);
+x_43 = l_Array_append___rarg(x_42, x_19);
+x_44 = 0;
+x_45 = 1;
+x_46 = 1;
+x_47 = l_Lean_Meta_mkForallFVars(x_43, x_40, x_44, x_45, x_46, x_20, x_21, x_22, x_23, x_41);
 if (lean_obj_tag(x_47) == 0)
 {
 lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
@@ -24824,347 +26007,158 @@ lean_inc(x_48);
 x_49 = lean_ctor_get(x_47, 1);
 lean_inc(x_49);
 lean_dec(x_47);
-x_50 = lean_ctor_get(x_48, 0);
-lean_inc(x_50);
-lean_dec(x_48);
-lean_inc(x_2);
-x_51 = l_Array_append___rarg(x_42, x_2);
-x_52 = l_Lean_Meta_mkForallFVars(x_51, x_50, x_28, x_29, x_30, x_20, x_21, x_22, x_23, x_49);
+x_50 = l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
+x_51 = l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
+lean_inc(x_23);
+lean_inc(x_22);
+lean_inc(x_21);
+lean_inc(x_20);
+x_52 = l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(x_48, x_50, x_51, x_20, x_21, x_22, x_23, x_49);
 if (lean_obj_tag(x_52) == 0)
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 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_53; lean_object* x_54; lean_object* x_55; 
 x_53 = lean_ctor_get(x_52, 0);
 lean_inc(x_53);
 x_54 = lean_ctor_get(x_52, 1);
 lean_inc(x_54);
 lean_dec(x_52);
-x_55 = l_Lean_ConstantInfo_name(x_7);
-x_56 = l_Lean_mkConst(x_55, x_8);
-x_57 = l_Array_ofSubarray___rarg(x_9);
-x_58 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__6;
-x_59 = lean_array_push(x_58, x_10);
-x_60 = l_Array_append___rarg(x_57, x_59);
-lean_inc(x_60);
-x_61 = l_Array_append___rarg(x_60, x_4);
-x_62 = l_Array_ofSubarray___rarg(x_11);
-lean_inc(x_62);
-x_63 = l_Array_append___rarg(x_61, x_62);
-x_64 = l_Lean_mkAppN(x_56, x_63);
-x_65 = l_Lean_mkAppN(x_12, x_13);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
-x_66 = l_Lean_Meta_mkEq(x_64, x_65, x_20, x_21, x_22, x_23, x_54);
-if (lean_obj_tag(x_66) == 0)
+lean_inc(x_53);
+x_55 = l_Lean_Meta_Match_proveCondEqThm(x_9, x_53, x_20, x_21, x_22, x_23, x_54);
+if (lean_obj_tag(x_55) == 0)
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; uint8_t x_115; 
-x_67 = lean_ctor_get(x_66, 0);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+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_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_58, 0, x_10);
+lean_ctor_set(x_58, 1, x_11);
+lean_ctor_set(x_58, 2, x_53);
+x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_59, 0, x_58);
+lean_ctor_set(x_59, 1, x_56);
+x_60 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_60, 0, x_59);
+x_61 = l_Lean_addDecl___at_Lean_Meta_mkAuxLemma___spec__4(x_60, x_20, x_21, x_22, x_23, x_57);
+lean_dec(x_23);
+lean_dec(x_21);
+lean_dec(x_20);
+if (lean_obj_tag(x_61) == 0)
+{
+uint8_t x_62; 
+x_62 = !lean_is_exclusive(x_61);
+if (x_62 == 0)
+{
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_63 = lean_ctor_get(x_61, 0);
+lean_dec(x_63);
+x_64 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_64, 0, x_12);
+lean_ctor_set(x_64, 1, x_13);
+x_65 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_65, 0, x_14);
+lean_ctor_set(x_65, 1, x_64);
+x_66 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_66, 0, x_15);
+lean_ctor_set(x_66, 1, x_65);
+lean_ctor_set(x_61, 0, x_66);
+return x_61;
+}
+else
+{
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_67 = lean_ctor_get(x_61, 1);
 lean_inc(x_67);
-x_68 = lean_ctor_get(x_66, 1);
-lean_inc(x_68);
-lean_dec(x_66);
-x_115 = lean_nat_dec_lt(x_40, x_25);
-if (x_115 == 0)
-{
-lean_dec(x_25);
-x_69 = x_67;
-x_70 = x_68;
-goto block_114;
+lean_dec(x_61);
+x_68 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_68, 0, x_12);
+lean_ctor_set(x_68, 1, x_13);
+x_69 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_69, 0, x_14);
+lean_ctor_set(x_69, 1, x_68);
+x_70 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_70, 0, x_15);
+lean_ctor_set(x_70, 1, x_69);
+x_71 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_71, 0, x_70);
+lean_ctor_set(x_71, 1, x_67);
+return x_71;
+}
 }
 else
 {
-size_t x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
-x_116 = lean_usize_of_nat(x_25);
-lean_dec(x_25);
-x_117 = l_Array_foldrMUnsafe_fold___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__4(x_1, x_116, x_6, x_67, x_20, x_21, x_22, x_23, x_68);
-x_118 = lean_ctor_get(x_117, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_117, 1);
-lean_inc(x_119);
-lean_dec(x_117);
-x_69 = x_118;
-x_70 = x_119;
-goto block_114;
+uint8_t x_72; 
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+x_72 = !lean_is_exclusive(x_61);
+if (x_72 == 0)
+{
+return x_61;
 }
-block_114:
+else
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_71 = l_Array_append___rarg(x_60, x_62);
-x_72 = l_Array_append___rarg(x_71, x_2);
-x_73 = l_Lean_Meta_mkForallFVars(x_72, x_69, x_28, x_29, x_30, x_20, x_21, x_22, x_23, x_70);
-if (lean_obj_tag(x_73) == 0)
-{
-lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_74 = lean_ctor_get(x_73, 0);
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_61, 0);
+x_74 = lean_ctor_get(x_61, 1);
 lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
-lean_inc(x_75);
-lean_dec(x_73);
-x_76 = l_Lean_Meta_Match_unfoldNamedPattern___closed__1;
-x_77 = l_Lean_Meta_Match_unfoldNamedPattern___closed__2;
-lean_inc(x_23);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_inc(x_20);
-x_78 = l_Lean_Meta_transform___at_Lean_Meta_Match_unfoldNamedPattern___spec__1(x_74, x_76, x_77, x_20, x_21, x_22, x_23, x_75);
-if (lean_obj_tag(x_78) == 0)
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_ctor_get(x_78, 0);
-lean_inc(x_79);
-x_80 = lean_ctor_get(x_78, 1);
-lean_inc(x_80);
-lean_dec(x_78);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_inc(x_79);
-x_81 = l_Lean_Meta_Match_proveCondEqThm(x_14, x_79, x_20, x_21, x_22, x_23, x_80);
-if (lean_obj_tag(x_81) == 0)
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-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 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_84, 0, x_15);
-lean_ctor_set(x_84, 1, x_16);
-lean_ctor_set(x_84, 2, x_79);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_84);
-lean_ctor_set(x_85, 1, x_82);
-x_86 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_86, 0, x_85);
-x_87 = l_Lean_addDecl___at_Lean_Meta_mkAuxLemma___spec__4(x_86, x_20, x_21, x_22, x_23, x_83);
-lean_dec(x_23);
-lean_dec(x_21);
-lean_dec(x_20);
-if (lean_obj_tag(x_87) == 0)
-{
-uint8_t x_88; 
-x_88 = !lean_is_exclusive(x_87);
-if (x_88 == 0)
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_89 = lean_ctor_get(x_87, 0);
-lean_dec(x_89);
-x_90 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_90, 0, x_35);
-lean_ctor_set(x_90, 1, x_17);
-x_91 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_91, 0, x_32);
-lean_ctor_set(x_91, 1, x_90);
-x_92 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_92, 0, x_53);
-lean_ctor_set(x_92, 1, x_91);
-lean_ctor_set(x_87, 0, x_92);
-return x_87;
+lean_inc(x_73);
+lean_dec(x_61);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+return x_75;
 }
-else
-{
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_93 = lean_ctor_get(x_87, 1);
-lean_inc(x_93);
-lean_dec(x_87);
-x_94 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_94, 0, x_35);
-lean_ctor_set(x_94, 1, x_17);
-x_95 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_95, 0, x_32);
-lean_ctor_set(x_95, 1, x_94);
-x_96 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_96, 0, x_53);
-lean_ctor_set(x_96, 1, x_95);
-x_97 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_97, 0, x_96);
-lean_ctor_set(x_97, 1, x_93);
-return x_97;
 }
 }
 else
 {
-uint8_t x_98; 
+uint8_t x_76; 
 lean_dec(x_53);
-lean_dec(x_35);
-lean_dec(x_32);
-lean_dec(x_17);
-x_98 = !lean_is_exclusive(x_87);
-if (x_98 == 0)
-{
-return x_87;
-}
-else
-{
-lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_99 = lean_ctor_get(x_87, 0);
-x_100 = lean_ctor_get(x_87, 1);
-lean_inc(x_100);
-lean_inc(x_99);
-lean_dec(x_87);
-x_101 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_101, 0, x_99);
-lean_ctor_set(x_101, 1, x_100);
-return x_101;
-}
-}
-}
-else
-{
-uint8_t x_102; 
-lean_dec(x_79);
-lean_dec(x_53);
-lean_dec(x_35);
-lean_dec(x_32);
 lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
 lean_dec(x_20);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-x_102 = !lean_is_exclusive(x_81);
-if (x_102 == 0)
-{
-return x_81;
-}
-else
-{
-lean_object* x_103; lean_object* x_104; lean_object* x_105; 
-x_103 = lean_ctor_get(x_81, 0);
-x_104 = lean_ctor_get(x_81, 1);
-lean_inc(x_104);
-lean_inc(x_103);
-lean_dec(x_81);
-x_105 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_105, 0, x_103);
-lean_ctor_set(x_105, 1, x_104);
-return x_105;
-}
-}
-}
-else
-{
-uint8_t x_106; 
-lean_dec(x_53);
-lean_dec(x_35);
-lean_dec(x_32);
-lean_dec(x_23);
-lean_dec(x_22);
-lean_dec(x_21);
-lean_dec(x_20);
-lean_dec(x_17);
-lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
-x_106 = !lean_is_exclusive(x_78);
-if (x_106 == 0)
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+x_76 = !lean_is_exclusive(x_55);
+if (x_76 == 0)
 {
-return x_78;
+return x_55;
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_78, 0);
-x_108 = lean_ctor_get(x_78, 1);
-lean_inc(x_108);
-lean_inc(x_107);
-lean_dec(x_78);
-x_109 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_109, 0, x_107);
-lean_ctor_set(x_109, 1, x_108);
-return x_109;
+lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_77 = lean_ctor_get(x_55, 0);
+x_78 = lean_ctor_get(x_55, 1);
+lean_inc(x_78);
+lean_inc(x_77);
+lean_dec(x_55);
+x_79 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_79, 0, x_77);
+lean_ctor_set(x_79, 1, x_78);
+return x_79;
 }
 }
 }
 else
 {
-uint8_t x_110; 
-lean_dec(x_53);
-lean_dec(x_35);
-lean_dec(x_32);
+uint8_t x_80; 
 lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
 lean_dec(x_20);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-x_110 = !lean_is_exclusive(x_73);
-if (x_110 == 0)
-{
-return x_73;
-}
-else
-{
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_73, 0);
-x_112 = lean_ctor_get(x_73, 1);
-lean_inc(x_112);
-lean_inc(x_111);
-lean_dec(x_73);
-x_113 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_113, 0, x_111);
-lean_ctor_set(x_113, 1, x_112);
-return x_113;
-}
-}
-}
-}
-else
-{
-uint8_t x_120; 
-lean_dec(x_62);
-lean_dec(x_60);
-lean_dec(x_53);
-lean_dec(x_35);
-lean_dec(x_32);
-lean_dec(x_25);
-lean_dec(x_23);
-lean_dec(x_22);
-lean_dec(x_21);
-lean_dec(x_20);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_2);
-x_120 = !lean_is_exclusive(x_66);
-if (x_120 == 0)
-{
-return x_66;
-}
-else
-{
-lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-x_121 = lean_ctor_get(x_66, 0);
-x_122 = lean_ctor_get(x_66, 1);
-lean_inc(x_122);
-lean_inc(x_121);
-lean_dec(x_66);
-x_123 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_123, 0, x_121);
-lean_ctor_set(x_123, 1, x_122);
-return x_123;
-}
-}
-}
-else
-{
-uint8_t x_124; 
-lean_dec(x_35);
-lean_dec(x_32);
-lean_dec(x_25);
-lean_dec(x_23);
-lean_dec(x_22);
-lean_dec(x_21);
-lean_dec(x_20);
-lean_dec(x_17);
-lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -25172,42 +26166,33 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_4);
-lean_dec(x_2);
-x_124 = !lean_is_exclusive(x_52);
-if (x_124 == 0)
+x_80 = !lean_is_exclusive(x_52);
+if (x_80 == 0)
 {
 return x_52;
 }
 else
 {
-lean_object* x_125; lean_object* x_126; lean_object* x_127; 
-x_125 = lean_ctor_get(x_52, 0);
-x_126 = lean_ctor_get(x_52, 1);
-lean_inc(x_126);
-lean_inc(x_125);
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_52, 0);
+x_82 = lean_ctor_get(x_52, 1);
+lean_inc(x_82);
+lean_inc(x_81);
 lean_dec(x_52);
-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_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 }
 else
 {
-uint8_t x_128; 
-lean_dec(x_42);
-lean_dec(x_35);
-lean_dec(x_32);
-lean_dec(x_25);
+uint8_t x_84; 
 lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
 lean_dec(x_20);
-lean_dec(x_17);
-lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -25215,37 +26200,203 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_4);
-lean_dec(x_2);
-x_128 = !lean_is_exclusive(x_47);
-if (x_128 == 0)
+x_84 = !lean_is_exclusive(x_47);
+if (x_84 == 0)
 {
 return x_47;
 }
 else
 {
-lean_object* x_129; lean_object* x_130; lean_object* x_131; 
-x_129 = lean_ctor_get(x_47, 0);
-x_130 = lean_ctor_get(x_47, 1);
-lean_inc(x_130);
-lean_inc(x_129);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+x_85 = lean_ctor_get(x_47, 0);
+x_86 = lean_ctor_get(x_47, 1);
+lean_inc(x_86);
+lean_inc(x_85);
 lean_dec(x_47);
-x_131 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_131, 0, x_129);
-lean_ctor_set(x_131, 1, x_130);
-return x_131;
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_85);
+lean_ctor_set(x_87, 1, x_86);
+return x_87;
+}
 }
 }
 }
 else
 {
-uint8_t x_132; 
-lean_dec(x_25);
+uint8_t x_95; 
+lean_dec(x_32);
 lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
 lean_dec(x_20);
+lean_dec(x_19);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+x_95 = !lean_is_exclusive(x_37);
+if (x_95 == 0)
+{
+return x_37;
+}
+else
+{
+lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_96 = lean_ctor_get(x_37, 0);
+x_97 = lean_ctor_get(x_37, 1);
+lean_inc(x_97);
+lean_inc(x_96);
+lean_dec(x_37);
+x_98 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_98, 0, x_96);
+lean_ctor_set(x_98, 1, x_97);
+return x_98;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, size_t x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_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) {
+_start:
+{
+uint8_t x_27; uint8_t x_28; uint8_t x_29; lean_object* x_30; 
+x_27 = 0;
+x_28 = 1;
+x_29 = 1;
+x_30 = l_Lean_Meta_mkForallFVars(x_1, x_2, x_27, x_28, x_29, x_22, x_23, x_24, x_25, x_26);
+if (lean_obj_tag(x_30) == 0)
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_77; uint8_t x_78; 
+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_33 = lean_array_get_size(x_3);
+x_77 = lean_unsigned_to_nat(0u);
+x_78 = lean_nat_dec_lt(x_77, x_33);
+if (x_78 == 0)
+{
+x_34 = x_31;
+x_35 = x_32;
+goto block_76;
+}
+else
+{
+size_t x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_79 = lean_usize_of_nat(x_33);
+x_80 = l_Array_foldrMUnsafe_fold___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__4(x_3, x_79, x_8, x_31, x_22, x_23, x_24, x_25, x_32);
+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_34 = x_81;
+x_35 = x_82;
+goto block_76;
+}
+block_76:
+{
+lean_object* x_36; 
+lean_inc(x_4);
+x_36 = l_Lean_Meta_mkForallFVars(x_4, x_34, x_27, x_28, x_29, x_22, x_23, x_24, x_25, x_35);
+if (lean_obj_tag(x_36) == 0)
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_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; size_t x_51; lean_object* x_52; 
+x_37 = lean_ctor_get(x_36, 0);
+lean_inc(x_37);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
+lean_dec(x_36);
+x_39 = lean_array_get_size(x_4);
+x_40 = lean_nat_add(x_33, x_39);
+lean_dec(x_39);
+x_41 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__2;
+x_42 = l_Lean_mkConst(x_41, x_5);
+lean_inc(x_6);
+x_43 = l_Array_reverse___rarg(x_6);
+x_44 = lean_array_get_size(x_43);
+x_45 = lean_unsigned_to_nat(0u);
+x_46 = l_Array_toSubarray___rarg(x_43, x_45, x_44);
+x_47 = l_Array_ofSubarray___rarg(x_7);
+lean_inc(x_47);
+x_48 = l_Array_reverse___rarg(x_47);
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_42);
+lean_ctor_set(x_49, 1, x_46);
+x_50 = lean_array_get_size(x_48);
+x_51 = lean_usize_of_nat(x_50);
+lean_dec(x_50);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_inc(x_22);
+x_52 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__3(x_48, x_51, x_8, x_49, x_22, x_23, x_24, x_25, x_38);
+lean_dec(x_48);
+if (lean_obj_tag(x_52) == 0)
+{
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_53 = lean_ctor_get(x_52, 0);
+lean_inc(x_53);
+x_54 = lean_ctor_get(x_52, 1);
+lean_inc(x_54);
+lean_dec(x_52);
+x_55 = lean_ctor_get(x_53, 0);
+lean_inc(x_55);
+lean_dec(x_53);
+lean_inc(x_4);
+lean_inc(x_47);
+x_56 = l_Array_append___rarg(x_47, x_4);
+x_57 = l_Lean_Meta_mkForallFVars(x_56, x_55, x_27, x_28, x_29, x_22, x_23, x_24, x_25, x_54);
+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; lean_object* x_63; 
+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_Array_ofSubarray___rarg(x_9);
+x_61 = lean_box_usize(x_8);
+lean_inc(x_6);
+x_62 = lean_alloc_closure((void*)(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1___boxed), 24, 18);
+lean_closure_set(x_62, 0, x_10);
+lean_closure_set(x_62, 1, x_11);
+lean_closure_set(x_62, 2, x_12);
+lean_closure_set(x_62, 3, x_13);
+lean_closure_set(x_62, 4, x_14);
+lean_closure_set(x_62, 5, x_6);
+lean_closure_set(x_62, 6, x_15);
+lean_closure_set(x_62, 7, x_4);
+lean_closure_set(x_62, 8, x_16);
+lean_closure_set(x_62, 9, x_17);
+lean_closure_set(x_62, 10, x_18);
+lean_closure_set(x_62, 11, x_40);
+lean_closure_set(x_62, 12, x_19);
+lean_closure_set(x_62, 13, x_37);
+lean_closure_set(x_62, 14, x_58);
+lean_closure_set(x_62, 15, x_33);
+lean_closure_set(x_62, 16, x_3);
+lean_closure_set(x_62, 17, x_61);
+x_63 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withNewAlts___rarg(x_20, x_47, x_6, x_60, x_62, x_22, x_23, x_24, x_25, x_59);
+return x_63;
+}
+else
+{
+uint8_t x_64; 
+lean_dec(x_47);
+lean_dec(x_40);
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_25);
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
 lean_dec(x_15);
@@ -25255,34 +26406,164 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_5);
+lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-x_132 = !lean_is_exclusive(x_31);
-if (x_132 == 0)
+x_64 = !lean_is_exclusive(x_57);
+if (x_64 == 0)
 {
-return x_31;
+return x_57;
 }
 else
 {
-lean_object* x_133; lean_object* x_134; lean_object* x_135; 
-x_133 = lean_ctor_get(x_31, 0);
-x_134 = lean_ctor_get(x_31, 1);
-lean_inc(x_134);
-lean_inc(x_133);
-lean_dec(x_31);
-x_135 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_135, 0, x_133);
-lean_ctor_set(x_135, 1, x_134);
-return x_135;
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_57, 0);
+x_66 = lean_ctor_get(x_57, 1);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_57);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
+}
+}
+}
+else
+{
+uint8_t x_68; 
+lean_dec(x_47);
+lean_dec(x_40);
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_25);
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+x_68 = !lean_is_exclusive(x_52);
+if (x_68 == 0)
+{
+return x_52;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_52, 0);
+x_70 = lean_ctor_get(x_52, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_52);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
+}
+else
+{
+uint8_t x_72; 
+lean_dec(x_33);
+lean_dec(x_25);
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_72 = !lean_is_exclusive(x_36);
+if (x_72 == 0)
+{
+return x_36;
+}
+else
+{
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_36, 0);
+x_74 = lean_ctor_get(x_36, 1);
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_36);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+return x_75;
 }
 }
 }
 }
+else
+{
+uint8_t x_83; 
+lean_dec(x_25);
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_83 = !lean_is_exclusive(x_30);
+if (x_83 == 0)
+{
+return x_30;
 }
-static lean_object* _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__1() {
+else
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_84 = lean_ctor_get(x_30, 0);
+x_85 = lean_ctor_get(x_30, 1);
+lean_inc(x_85);
+lean_inc(x_84);
+lean_dec(x_30);
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_84);
+lean_ctor_set(x_86, 1, x_85);
+return x_86;
+}
+}
+}
+}
+static lean_object* _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -25290,132 +26571,132 @@ x_1 = lean_mk_string("hs: ");
 return x_1;
 }
 }
-static lean_object* _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__2() {
+static lean_object* _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__1;
+x_1 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__1;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21, lean_object* x_22, lean_object* x_23) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21, lean_object* x_22, lean_object* x_23, lean_object* x_24, lean_object* x_25) {
 _start:
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; size_t x_32; size_t x_33; lean_object* x_34; 
-x_24 = lean_unsigned_to_nat(0u);
-x_25 = l_Lean_Expr_getAppNumArgsAux(x_18, x_24);
-x_26 = l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___closed__1;
-lean_inc(x_25);
-x_27 = lean_mk_array(x_25, x_26);
-x_28 = lean_unsigned_to_nat(1u);
-x_29 = lean_nat_sub(x_25, x_28);
-lean_dec(x_25);
-lean_inc(x_18);
-x_30 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_18, x_27, x_29);
-x_31 = lean_array_get_size(x_1);
-x_32 = lean_usize_of_nat(x_31);
-lean_dec(x_31);
-x_33 = 0;
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; size_t x_34; size_t x_35; lean_object* x_36; 
+x_26 = lean_unsigned_to_nat(0u);
+x_27 = l_Lean_Expr_getAppNumArgsAux(x_20, x_26);
+x_28 = l_Lean_Meta_casesOnStuckLHS_findFVar_x3f___closed__1;
+lean_inc(x_27);
+x_29 = lean_mk_array(x_27, x_28);
+x_30 = lean_unsigned_to_nat(1u);
+x_31 = lean_nat_sub(x_27, x_30);
+lean_dec(x_27);
+lean_inc(x_20);
+x_32 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_20, x_29, x_31);
+x_33 = lean_array_get_size(x_1);
+x_34 = lean_usize_of_nat(x_33);
+lean_dec(x_33);
+x_35 = 0;
+lean_inc(x_24);
+lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
-lean_inc(x_20);
-lean_inc(x_19);
-x_34 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__2(x_30, x_1, x_32, x_33, x_2, x_19, x_20, x_21, x_22, x_23);
+x_36 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__2(x_32, x_1, x_34, x_35, x_2, x_21, x_22, x_23, x_24, x_25);
 lean_dec(x_1);
-if (lean_obj_tag(x_34) == 0)
+if (lean_obj_tag(x_36) == 0)
 {
-lean_object* x_35; lean_object* x_36; uint8_t x_37; lean_object* x_38; lean_object* x_54; lean_object* x_55; lean_object* x_56; uint8_t x_57; 
-x_35 = lean_ctor_get(x_34, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
-lean_inc(x_36);
-lean_dec(x_34);
-x_54 = lean_st_ref_get(x_22, x_36);
-x_55 = lean_ctor_get(x_54, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_55, 3);
-lean_inc(x_56);
-lean_dec(x_55);
-x_57 = lean_ctor_get_uint8(x_56, sizeof(void*)*1);
-lean_dec(x_56);
-if (x_57 == 0)
-{
-lean_object* x_58; uint8_t x_59; 
-x_58 = lean_ctor_get(x_54, 1);
+lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; 
+x_37 = lean_ctor_get(x_36, 0);
+lean_inc(x_37);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
+lean_dec(x_36);
+x_56 = lean_st_ref_get(x_24, x_38);
+x_57 = lean_ctor_get(x_56, 0);
+lean_inc(x_57);
+x_58 = lean_ctor_get(x_57, 3);
 lean_inc(x_58);
-lean_dec(x_54);
-x_59 = 0;
-x_37 = x_59;
-x_38 = x_58;
-goto block_53;
-}
-else
+lean_dec(x_57);
+x_59 = lean_ctor_get_uint8(x_58, sizeof(void*)*1);
+lean_dec(x_58);
+if (x_59 == 0)
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
-x_60 = lean_ctor_get(x_54, 1);
+lean_object* x_60; uint8_t x_61; 
+x_60 = lean_ctor_get(x_56, 1);
 lean_inc(x_60);
-lean_dec(x_54);
-lean_inc(x_14);
-x_61 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_14, x_19, x_20, x_21, x_22, x_60);
-x_62 = lean_ctor_get(x_61, 0);
+lean_dec(x_56);
+x_61 = 0;
+x_39 = x_61;
+x_40 = x_60;
+goto block_55;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; 
+x_62 = lean_ctor_get(x_56, 1);
 lean_inc(x_62);
-x_63 = lean_ctor_get(x_61, 1);
-lean_inc(x_63);
-lean_dec(x_61);
-x_64 = lean_unbox(x_62);
-lean_dec(x_62);
-x_37 = x_64;
-x_38 = x_63;
-goto block_53;
+lean_dec(x_56);
+lean_inc(x_15);
+x_63 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_15, x_21, x_22, x_23, x_24, x_62);
+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_unbox(x_64);
+lean_dec(x_64);
+x_39 = x_66;
+x_40 = x_65;
+goto block_55;
 }
-block_53:
+block_55:
 {
-if (x_37 == 0)
+if (x_39 == 0)
 {
-lean_object* x_39; lean_object* x_40; 
+lean_object* x_41; lean_object* x_42; 
+lean_dec(x_15);
+x_41 = lean_box(0);
+x_42 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(x_17, x_20, x_37, x_16, x_3, x_32, x_4, x_35, x_5, x_6, x_7, x_8, x_9, x_10, x_18, x_11, x_12, x_13, x_19, x_14, x_41, x_21, x_22, x_23, x_24, x_40);
 lean_dec(x_14);
-x_39 = lean_box(0);
-x_40 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(x_35, x_15, x_3, x_30, x_4, x_33, x_5, x_6, x_7, x_8, x_9, x_10, x_16, x_11, x_12, x_13, x_17, x_18, x_39, x_19, x_20, x_21, x_22, x_38);
-lean_dec(x_5);
-lean_dec(x_35);
-return x_40;
+return x_42;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-lean_inc(x_35);
-x_41 = lean_array_to_list(lean_box(0), x_35);
-x_42 = lean_box(0);
-x_43 = l_List_mapTRAux___at_Lean_MessageData_instCoeListExprMessageData___spec__1(x_41, x_42);
-x_44 = l_Lean_MessageData_ofList(x_43);
-lean_dec(x_43);
-x_45 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__2;
-x_46 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_46, 0, x_45);
-lean_ctor_set(x_46, 1, x_44);
-x_47 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+lean_inc(x_37);
+x_43 = lean_array_to_list(lean_box(0), x_37);
+x_44 = lean_box(0);
+x_45 = l_List_mapTRAux___at_Lean_MessageData_instCoeListExprMessageData___spec__1(x_43, x_44);
+x_46 = l_Lean_MessageData_ofList(x_45);
+lean_dec(x_45);
+x_47 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__2;
 x_48 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-x_49 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_14, x_48, x_19, x_20, x_21, x_22, x_38);
-x_50 = lean_ctor_get(x_49, 0);
-lean_inc(x_50);
-x_51 = lean_ctor_get(x_49, 1);
-lean_inc(x_51);
-lean_dec(x_49);
-x_52 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(x_35, x_15, x_3, x_30, x_4, x_33, x_5, x_6, x_7, x_8, x_9, x_10, x_16, x_11, x_12, x_13, x_17, x_18, x_50, x_19, x_20, x_21, x_22, x_51);
-lean_dec(x_50);
-lean_dec(x_5);
-lean_dec(x_35);
-return x_52;
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_46);
+x_49 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_50 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_50, 0, x_48);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_15, x_50, x_21, x_22, x_23, x_24, x_40);
+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_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(x_17, x_20, x_37, x_16, x_3, x_32, x_4, x_35, x_5, x_6, x_7, x_8, x_9, x_10, x_18, x_11, x_12, x_13, x_19, x_14, x_52, x_21, x_22, x_23, x_24, x_53);
+lean_dec(x_52);
+lean_dec(x_14);
+return x_54;
 }
 }
 }
 else
 {
-uint8_t x_65; 
-lean_dec(x_30);
+uint8_t x_67; 
+lean_dec(x_32);
+lean_dec(x_24);
+lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
 lean_dec(x_20);
@@ -25436,28 +26717,28 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_65 = !lean_is_exclusive(x_34);
-if (x_65 == 0)
+x_67 = !lean_is_exclusive(x_36);
+if (x_67 == 0)
 {
-return x_34;
+return x_36;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_34, 0);
-x_67 = lean_ctor_get(x_34, 1);
-lean_inc(x_67);
-lean_inc(x_66);
-lean_dec(x_34);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_66);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_36, 0);
+x_69 = lean_ctor_get(x_36, 1);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_dec(x_36);
+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;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; lean_object* x_14; 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; 
@@ -25486,7 +26767,7 @@ lean_ctor_set(x_21, 1, x_12);
 return x_21;
 }
 }
-static lean_object* _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1() {
+static lean_object* _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -25494,17 +26775,17 @@ x_1 = lean_mk_string("eq");
 return x_1;
 }
 }
-static lean_object* _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2() {
+static lean_object* _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1;
+x_2 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3() {
+static lean_object* _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -25512,345 +26793,397 @@ x_1 = lean_mk_string("splitterAltType: ");
 return x_1;
 }
 }
-static lean_object* _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4() {
+static lean_object* _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3;
+x_1 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, 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, lean_object* x_20, lean_object* x_21) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20, lean_object* x_21, lean_object* x_22, lean_object* x_23, lean_object* x_24) {
 _start:
 {
-uint8_t x_22; 
-x_22 = lean_usize_dec_lt(x_15, x_14);
-if (x_22 == 0)
+uint8_t x_25; 
+x_25 = lean_nat_dec_le(x_17, x_16);
+if (x_25 == 0)
 {
-lean_object* x_23; 
-lean_dec(x_20);
+lean_object* x_26; uint8_t x_27; 
+x_26 = lean_unsigned_to_nat(0u);
+x_27 = lean_nat_dec_eq(x_15, x_26);
+if (x_27 == 0)
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_28 = lean_unsigned_to_nat(1u);
+x_29 = lean_nat_sub(x_15, x_28);
+lean_dec(x_15);
+x_30 = lean_ctor_get(x_19, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_19, 1);
+lean_inc(x_31);
 lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_16);
-lean_ctor_set(x_23, 1, x_21);
-return x_23;
-}
-else
-{
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_24 = lean_ctor_get(x_13, 0);
-x_25 = lean_array_uget(x_24, x_15);
-x_33 = lean_ctor_get(x_16, 0);
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
 lean_inc(x_33);
-x_34 = lean_ctor_get(x_16, 1);
+lean_dec(x_31);
+x_34 = lean_ctor_get(x_33, 0);
 lean_inc(x_34);
-lean_dec(x_16);
-x_35 = lean_ctor_get(x_34, 0);
+x_35 = lean_ctor_get(x_33, 1);
 lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
+lean_dec(x_33);
+x_36 = lean_ctor_get(x_35, 0);
 lean_inc(x_36);
-lean_dec(x_34);
-x_37 = lean_ctor_get(x_36, 0);
+x_37 = lean_ctor_get(x_35, 1);
 lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
+lean_dec(x_35);
+x_38 = lean_ctor_get(x_37, 0);
 lean_inc(x_38);
-lean_dec(x_36);
-x_39 = lean_ctor_get(x_38, 0);
+x_39 = lean_ctor_get(x_37, 1);
 lean_inc(x_39);
-x_40 = lean_ctor_get(x_38, 1);
-lean_inc(x_40);
-lean_dec(x_38);
-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_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2;
-lean_inc(x_42);
-x_44 = lean_name_append_index_after(x_43, x_42);
-x_45 = l_Lean_Name_append(x_3, x_44);
-lean_inc(x_45);
-x_46 = lean_array_push(x_39, x_45);
+lean_dec(x_37);
+x_40 = lean_ctor_get(x_8, 2);
+x_41 = l_instInhabitedNat;
+x_42 = lean_array_get(x_41, x_40, x_16);
+x_43 = lean_nat_sub(x_42, x_9);
+lean_dec(x_42);
+x_44 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2;
+lean_inc(x_39);
+x_45 = lean_name_append_index_after(x_44, x_39);
+x_46 = l_Lean_Name_append(x_3, x_45);
+lean_inc(x_46);
+x_47 = lean_array_push(x_36, x_46);
+x_48 = l_Lean_instInhabitedExpr;
+x_49 = l_Subarray_get_x21___rarg(x_48, x_12, x_16);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_inc(x_21);
 lean_inc(x_20);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_inc(x_17);
-lean_inc(x_25);
-x_47 = lean_infer_type(x_25, x_17, x_18, x_19, x_20, x_21);
-if (lean_obj_tag(x_47) == 0)
+x_50 = lean_infer_type(x_49, x_20, x_21, x_22, x_23, x_24);
+if (lean_obj_tag(x_50) == 0)
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_48 = lean_ctor_get(x_47, 0);
-lean_inc(x_48);
-x_49 = lean_ctor_get(x_47, 1);
-lean_inc(x_49);
-lean_dec(x_47);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_51 = lean_ctor_get(x_50, 0);
+lean_inc(x_51);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+lean_dec(x_50);
 lean_inc(x_2);
+lean_inc(x_9);
 lean_inc(x_5);
 lean_inc(x_1);
+lean_inc(x_11);
 lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_4);
-lean_inc(x_11);
-lean_inc(x_6);
+lean_inc(x_16);
 lean_inc(x_12);
-lean_inc(x_41);
-x_50 = lean_alloc_closure((void*)(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___boxed), 23, 14);
-lean_closure_set(x_50, 0, x_41);
-lean_closure_set(x_50, 1, x_12);
-lean_closure_set(x_50, 2, x_6);
-lean_closure_set(x_50, 3, x_11);
-lean_closure_set(x_50, 4, x_4);
-lean_closure_set(x_50, 5, x_7);
-lean_closure_set(x_50, 6, x_8);
-lean_closure_set(x_50, 7, x_9);
-lean_closure_set(x_50, 8, x_10);
-lean_closure_set(x_50, 9, x_25);
-lean_closure_set(x_50, 10, x_1);
-lean_closure_set(x_50, 11, x_45);
-lean_closure_set(x_50, 12, x_5);
-lean_closure_set(x_50, 13, x_2);
+lean_inc(x_13);
+lean_inc(x_6);
+lean_inc(x_14);
+lean_inc(x_38);
+x_53 = lean_alloc_closure((void*)(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___boxed), 25, 15);
+lean_closure_set(x_53, 0, x_38);
+lean_closure_set(x_53, 1, x_14);
+lean_closure_set(x_53, 2, x_6);
+lean_closure_set(x_53, 3, x_13);
+lean_closure_set(x_53, 4, x_12);
+lean_closure_set(x_53, 5, x_16);
+lean_closure_set(x_53, 6, x_4);
+lean_closure_set(x_53, 7, x_7);
+lean_closure_set(x_53, 8, x_10);
+lean_closure_set(x_53, 9, x_11);
+lean_closure_set(x_53, 10, x_1);
+lean_closure_set(x_53, 11, x_46);
+lean_closure_set(x_53, 12, x_5);
+lean_closure_set(x_53, 13, x_9);
+lean_closure_set(x_53, 14, x_2);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_inc(x_21);
 lean_inc(x_20);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_inc(x_17);
-x_51 = l_Lean_Meta_Match_forallAltTelescope___rarg(x_48, x_50, x_17, x_18, x_19, x_20, x_49);
-if (lean_obj_tag(x_51) == 0)
+x_54 = l_Lean_Meta_Match_forallAltTelescope___rarg(x_51, x_43, x_53, x_20, x_21, x_22, x_23, x_52);
+if (lean_obj_tag(x_54) == 0)
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; lean_object* x_65; lean_object* x_82; lean_object* x_83; lean_object* x_84; uint8_t x_85; 
-x_52 = lean_ctor_get(x_51, 0);
-lean_inc(x_52);
-x_53 = lean_ctor_get(x_52, 1);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_53, 1);
-lean_inc(x_54);
-x_55 = lean_ctor_get(x_51, 1);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; lean_object* x_91; lean_object* x_92; lean_object* x_93; uint8_t x_94; 
+x_55 = lean_ctor_get(x_54, 0);
 lean_inc(x_55);
-lean_dec(x_51);
-x_56 = lean_ctor_get(x_52, 0);
+x_56 = lean_ctor_get(x_55, 1);
 lean_inc(x_56);
-lean_dec(x_52);
-x_57 = lean_ctor_get(x_53, 0);
+x_57 = lean_ctor_get(x_56, 1);
 lean_inc(x_57);
-lean_dec(x_53);
-x_58 = lean_ctor_get(x_54, 0);
+x_58 = lean_ctor_get(x_54, 1);
 lean_inc(x_58);
-x_59 = lean_ctor_get(x_54, 1);
-lean_inc(x_59);
 lean_dec(x_54);
-x_60 = lean_array_push(x_41, x_56);
-lean_inc(x_57);
-x_61 = lean_array_push(x_35, x_57);
-x_62 = lean_array_push(x_37, x_58);
-x_63 = lean_array_push(x_33, x_59);
-x_82 = lean_st_ref_get(x_20, x_55);
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc(x_83);
-x_84 = lean_ctor_get(x_83, 3);
-lean_inc(x_84);
-lean_dec(x_83);
-x_85 = lean_ctor_get_uint8(x_84, sizeof(void*)*1);
-lean_dec(x_84);
-if (x_85 == 0)
-{
-lean_object* x_86; uint8_t x_87; 
-x_86 = lean_ctor_get(x_82, 1);
-lean_inc(x_86);
-lean_dec(x_82);
-x_87 = 0;
-x_64 = x_87;
-x_65 = x_86;
-goto block_81;
-}
-else
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; 
-x_88 = lean_ctor_get(x_82, 1);
-lean_inc(x_88);
-lean_dec(x_82);
-lean_inc(x_2);
-x_89 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_2, x_17, x_18, x_19, x_20, x_88);
-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_unbox(x_90);
-lean_dec(x_90);
-x_64 = x_92;
-x_65 = x_91;
-goto block_81;
-}
-block_81:
-{
-if (x_64 == 0)
-{
-lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_59 = lean_ctor_get(x_55, 0);
+lean_inc(x_59);
+lean_dec(x_55);
+x_60 = lean_ctor_get(x_56, 0);
+lean_inc(x_60);
+lean_dec(x_56);
+x_61 = lean_ctor_get(x_57, 0);
+lean_inc(x_61);
+x_62 = lean_ctor_get(x_57, 1);
+lean_inc(x_62);
 lean_dec(x_57);
-x_66 = lean_box(0);
-x_67 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3(x_60, x_46, x_62, x_61, x_63, x_42, x_66, x_17, x_18, x_19, x_20, x_65);
-lean_dec(x_42);
-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_26 = x_68;
-x_27 = x_69;
-goto block_32;
-}
-else
+x_63 = lean_array_push(x_38, x_59);
+lean_inc(x_60);
+x_64 = lean_array_push(x_32, x_60);
+x_65 = lean_array_push(x_34, x_61);
+x_66 = lean_array_push(x_30, x_62);
+x_91 = lean_st_ref_get(x_23, x_58);
+x_92 = lean_ctor_get(x_91, 0);
+lean_inc(x_92);
+x_93 = lean_ctor_get(x_92, 3);
+lean_inc(x_93);
+lean_dec(x_92);
+x_94 = lean_ctor_get_uint8(x_93, sizeof(void*)*1);
+lean_dec(x_93);
+if (x_94 == 0)
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_70 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_70, 0, x_57);
-x_71 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4;
-x_72 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_72, 0, x_71);
-lean_ctor_set(x_72, 1, x_70);
-x_73 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
-x_74 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-lean_inc(x_2);
-x_75 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_2, x_74, x_17, x_18, x_19, x_20, x_65);
-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);
-x_78 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3(x_60, x_46, x_62, x_61, x_63, x_42, x_76, x_17, x_18, x_19, x_20, x_77);
-lean_dec(x_76);
-lean_dec(x_42);
-x_79 = lean_ctor_get(x_78, 0);
-lean_inc(x_79);
-x_80 = lean_ctor_get(x_78, 1);
-lean_inc(x_80);
-lean_dec(x_78);
-x_26 = x_79;
-x_27 = x_80;
-goto block_32;
-}
-}
-}
-else
-{
-uint8_t x_93; 
-lean_dec(x_46);
-lean_dec(x_42);
-lean_dec(x_41);
-lean_dec(x_37);
-lean_dec(x_35);
-lean_dec(x_33);
-lean_dec(x_20);
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_93 = !lean_is_exclusive(x_51);
-if (x_93 == 0)
-{
-return x_51;
-}
-else
-{
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_51, 0);
-x_95 = lean_ctor_get(x_51, 1);
+lean_object* x_95; uint8_t x_96; 
+x_95 = lean_ctor_get(x_91, 1);
 lean_inc(x_95);
-lean_inc(x_94);
-lean_dec(x_51);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_95);
-return x_96;
-}
-}
+lean_dec(x_91);
+x_96 = 0;
+x_67 = x_96;
+x_68 = x_95;
+goto block_90;
 }
 else
 {
-uint8_t x_97; 
-lean_dec(x_46);
-lean_dec(x_45);
-lean_dec(x_42);
-lean_dec(x_41);
-lean_dec(x_37);
-lean_dec(x_35);
-lean_dec(x_33);
-lean_dec(x_25);
-lean_dec(x_20);
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_97 = !lean_is_exclusive(x_47);
-if (x_97 == 0)
-{
-return x_47;
-}
-else
-{
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_47, 0);
-x_99 = lean_ctor_get(x_47, 1);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; uint8_t x_101; 
+x_97 = lean_ctor_get(x_91, 1);
+lean_inc(x_97);
+lean_dec(x_91);
+lean_inc(x_2);
+x_98 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_2, x_20, x_21, x_22, x_23, x_97);
+x_99 = lean_ctor_get(x_98, 0);
 lean_inc(x_99);
-lean_inc(x_98);
-lean_dec(x_47);
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_98);
-lean_ctor_set(x_100, 1, x_99);
-return x_100;
+x_100 = lean_ctor_get(x_98, 1);
+lean_inc(x_100);
+lean_dec(x_98);
+x_101 = lean_unbox(x_99);
+lean_dec(x_99);
+x_67 = x_101;
+x_68 = x_100;
+goto block_90;
 }
-}
-block_32:
+block_90:
 {
-lean_object* x_28; size_t x_29; size_t x_30; 
-x_28 = lean_ctor_get(x_26, 0);
-lean_inc(x_28);
-lean_dec(x_26);
-x_29 = 1;
-x_30 = lean_usize_add(x_15, x_29);
-x_15 = x_30;
-x_16 = x_28;
-x_21 = x_27;
+if (x_67 == 0)
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+lean_dec(x_60);
+x_69 = lean_box(0);
+x_70 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4(x_63, x_47, x_65, x_64, x_66, x_39, x_69, x_20, x_21, x_22, x_23, x_68);
+lean_dec(x_39);
+x_71 = lean_ctor_get(x_70, 0);
+lean_inc(x_71);
+x_72 = lean_ctor_get(x_70, 1);
+lean_inc(x_72);
+lean_dec(x_70);
+x_73 = lean_ctor_get(x_71, 0);
+lean_inc(x_73);
+lean_dec(x_71);
+x_74 = lean_nat_add(x_16, x_18);
+lean_dec(x_16);
+x_15 = x_29;
+x_16 = x_74;
+x_19 = x_73;
+x_24 = x_72;
 goto _start;
 }
+else
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_76 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_76, 0, x_60);
+x_77 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4;
+x_78 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_78, 0, x_77);
+lean_ctor_set(x_78, 1, x_76);
+x_79 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
+x_80 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_80, 0, x_78);
+lean_ctor_set(x_80, 1, x_79);
+lean_inc(x_2);
+x_81 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_2, x_80, x_20, x_21, x_22, x_23, x_68);
+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_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4(x_63, x_47, x_65, x_64, x_66, x_39, x_82, x_20, x_21, x_22, x_23, x_83);
+lean_dec(x_82);
+lean_dec(x_39);
+x_85 = lean_ctor_get(x_84, 0);
+lean_inc(x_85);
+x_86 = lean_ctor_get(x_84, 1);
+lean_inc(x_86);
+lean_dec(x_84);
+x_87 = lean_ctor_get(x_85, 0);
+lean_inc(x_87);
+lean_dec(x_85);
+x_88 = lean_nat_add(x_16, x_18);
+lean_dec(x_16);
+x_15 = x_29;
+x_16 = x_88;
+x_19 = x_87;
+x_24 = x_86;
+goto _start;
+}
+}
+}
+else
+{
+uint8_t x_102; 
+lean_dec(x_47);
+lean_dec(x_39);
+lean_dec(x_38);
+lean_dec(x_34);
+lean_dec(x_32);
+lean_dec(x_30);
+lean_dec(x_29);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_20);
+lean_dec(x_16);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_102 = !lean_is_exclusive(x_54);
+if (x_102 == 0)
+{
+return x_54;
+}
+else
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+x_103 = lean_ctor_get(x_54, 0);
+x_104 = lean_ctor_get(x_54, 1);
+lean_inc(x_104);
+lean_inc(x_103);
+lean_dec(x_54);
+x_105 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_105, 0, x_103);
+lean_ctor_set(x_105, 1, x_104);
+return x_105;
+}
+}
+}
+else
+{
+uint8_t x_106; 
+lean_dec(x_47);
+lean_dec(x_46);
+lean_dec(x_43);
+lean_dec(x_39);
+lean_dec(x_38);
+lean_dec(x_34);
+lean_dec(x_32);
+lean_dec(x_30);
+lean_dec(x_29);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_20);
+lean_dec(x_16);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_106 = !lean_is_exclusive(x_50);
+if (x_106 == 0)
+{
+return x_50;
+}
+else
+{
+lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_107 = lean_ctor_get(x_50, 0);
+x_108 = lean_ctor_get(x_50, 1);
+lean_inc(x_108);
+lean_inc(x_107);
+lean_dec(x_50);
+x_109 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_109, 0, x_107);
+lean_ctor_set(x_109, 1, x_108);
+return x_109;
+}
+}
+}
+else
+{
+lean_object* x_110; 
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_20);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_110 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_110, 0, x_19);
+lean_ctor_set(x_110, 1, x_24);
+return x_110;
+}
+}
+else
+{
+lean_object* x_111; 
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_20);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_111 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_111, 0, x_19);
+lean_ctor_set(x_111, 1, x_24);
+return x_111;
 }
 }
 }
@@ -25890,121 +27223,123 @@ lean_inc(x_17);
 x_26 = l_Lean_Meta_deltaExpand(x_24, x_25, x_17, x_18, x_19);
 if (lean_obj_tag(x_26) == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_27 = lean_ctor_get(x_26, 0);
 lean_inc(x_27);
 x_28 = lean_ctor_get(x_26, 1);
 lean_inc(x_28);
 lean_dec(x_26);
+x_29 = l_Lean_Expr_headBeta(x_27);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
+lean_inc(x_7);
 lean_inc(x_5);
-x_29 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof(x_5, x_27, x_22, x_6, x_7, x_15, x_16, x_17, x_18, x_28);
-if (lean_obj_tag(x_29) == 0)
+x_30 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof(x_5, x_29, x_22, x_6, x_7, x_8, x_15, x_16, x_17, x_18, x_28);
+if (lean_obj_tag(x_30) == 0)
 {
-lean_object* x_30; lean_object* x_31; uint8_t x_32; uint8_t x_33; uint8_t x_34; lean_object* x_35; 
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
+lean_object* x_31; lean_object* x_32; uint8_t x_33; uint8_t x_34; uint8_t x_35; lean_object* x_36; 
+x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
-lean_dec(x_29);
-x_32 = 0;
-x_33 = 1;
+x_32 = lean_ctor_get(x_30, 1);
+lean_inc(x_32);
+lean_dec(x_30);
+x_33 = 0;
 x_34 = 1;
-x_35 = l_Lean_Meta_mkLambdaFVars(x_8, x_30, x_32, x_33, x_34, x_15, x_16, x_17, x_18, x_31);
-if (lean_obj_tag(x_35) == 0)
+x_35 = 1;
+x_36 = l_Lean_Meta_mkLambdaFVars(x_9, x_31, x_33, x_34, x_35, x_15, x_16, x_17, x_18, x_32);
+if (lean_obj_tag(x_36) == 0)
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_36 = lean_ctor_get(x_35, 0);
-lean_inc(x_36);
-x_37 = lean_ctor_get(x_35, 1);
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_37 = lean_ctor_get(x_36, 0);
 lean_inc(x_37);
-lean_dec(x_35);
-x_38 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__2;
-x_39 = l_Lean_Name_append(x_9, x_38);
-lean_inc(x_39);
-x_40 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_10);
-lean_ctor_set(x_40, 2, x_11);
-x_41 = lean_alloc_ctor(0, 2, 0);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
+lean_dec(x_36);
+x_39 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__2;
+x_40 = l_Lean_Name_append(x_10, x_39);
+lean_inc(x_40);
+x_41 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_41, 0, x_40);
-lean_ctor_set(x_41, 1, x_36);
-x_42 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_41, 1, x_11);
+lean_ctor_set(x_41, 2, x_12);
+x_42 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_37);
+x_43 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_43, 0, x_42);
 lean_inc(x_17);
-x_43 = l_Lean_addDecl___at_Lean_Meta_mkAuxLemma___spec__4(x_42, x_15, x_16, x_17, x_18, x_37);
+x_44 = l_Lean_addDecl___at_Lean_Meta_mkAuxLemma___spec__4(x_43, x_15, x_16, x_17, x_18, x_38);
 lean_dec(x_16);
 lean_dec(x_15);
-if (lean_obj_tag(x_43) == 0)
+if (lean_obj_tag(x_44) == 0)
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; 
-x_44 = lean_ctor_get(x_43, 1);
-lean_inc(x_44);
-lean_dec(x_43);
-x_45 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_45, 0, x_12);
-lean_ctor_set(x_45, 1, x_39);
-lean_ctor_set(x_45, 2, x_13);
+lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
+x_45 = lean_ctor_get(x_44, 1);
 lean_inc(x_45);
-x_46 = l_Lean_Meta_Match_registerMatchEqns(x_5, x_45, x_17, x_18, x_44);
+lean_dec(x_44);
+x_46 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_46, 0, x_13);
+lean_ctor_set(x_46, 1, x_40);
+lean_ctor_set(x_46, 2, x_7);
+lean_inc(x_46);
+x_47 = l_Lean_Meta_Match_registerMatchEqns(x_5, x_46, x_17, x_18, x_45);
 lean_dec(x_18);
 lean_dec(x_17);
-x_47 = !lean_is_exclusive(x_46);
-if (x_47 == 0)
+x_48 = !lean_is_exclusive(x_47);
+if (x_48 == 0)
 {
-lean_object* x_48; 
-x_48 = lean_ctor_get(x_46, 0);
-lean_dec(x_48);
-lean_ctor_set(x_46, 0, x_45);
-return x_46;
+lean_object* x_49; 
+x_49 = lean_ctor_get(x_47, 0);
+lean_dec(x_49);
+lean_ctor_set(x_47, 0, x_46);
+return x_47;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; 
-x_49 = lean_ctor_get(x_46, 1);
-lean_inc(x_49);
-lean_dec(x_46);
-x_50 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_50, 0, x_45);
-lean_ctor_set(x_50, 1, x_49);
-return x_50;
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_ctor_get(x_47, 1);
+lean_inc(x_50);
+lean_dec(x_47);
+x_51 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_51, 0, x_46);
+lean_ctor_set(x_51, 1, x_50);
+return x_51;
 }
 }
 else
 {
-uint8_t x_51; 
-lean_dec(x_39);
+uint8_t x_52; 
+lean_dec(x_40);
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_13);
-lean_dec(x_12);
+lean_dec(x_7);
 lean_dec(x_5);
-x_51 = !lean_is_exclusive(x_43);
-if (x_51 == 0)
+x_52 = !lean_is_exclusive(x_44);
+if (x_52 == 0)
 {
-return x_43;
+return x_44;
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_52 = lean_ctor_get(x_43, 0);
-x_53 = lean_ctor_get(x_43, 1);
+lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_53 = lean_ctor_get(x_44, 0);
+x_54 = lean_ctor_get(x_44, 1);
+lean_inc(x_54);
 lean_inc(x_53);
-lean_inc(x_52);
-lean_dec(x_43);
-x_54 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_54, 0, x_52);
-lean_ctor_set(x_54, 1, x_53);
-return x_54;
+lean_dec(x_44);
+x_55 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_55, 0, x_53);
+lean_ctor_set(x_55, 1, x_54);
+return x_55;
 }
 }
 }
 else
 {
-uint8_t x_55; 
+uint8_t x_56; 
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
@@ -26012,31 +27347,31 @@ lean_dec(x_15);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
-lean_dec(x_10);
+lean_dec(x_7);
 lean_dec(x_5);
-x_55 = !lean_is_exclusive(x_35);
-if (x_55 == 0)
+x_56 = !lean_is_exclusive(x_36);
+if (x_56 == 0)
 {
-return x_35;
+return x_36;
 }
 else
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_56 = lean_ctor_get(x_35, 0);
-x_57 = lean_ctor_get(x_35, 1);
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_36, 0);
+x_58 = lean_ctor_get(x_36, 1);
+lean_inc(x_58);
 lean_inc(x_57);
-lean_inc(x_56);
-lean_dec(x_35);
-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_dec(x_36);
+x_59 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+return x_59;
 }
 }
 }
 else
 {
-uint8_t x_59; 
+uint8_t x_60; 
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
@@ -26044,32 +27379,32 @@ lean_dec(x_15);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_8);
+lean_dec(x_9);
+lean_dec(x_7);
 lean_dec(x_5);
-x_59 = !lean_is_exclusive(x_29);
-if (x_59 == 0)
+x_60 = !lean_is_exclusive(x_30);
+if (x_60 == 0)
 {
-return x_29;
+return x_30;
 }
 else
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_60 = lean_ctor_get(x_29, 0);
-x_61 = lean_ctor_get(x_29, 1);
+lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_61 = lean_ctor_get(x_30, 0);
+x_62 = lean_ctor_get(x_30, 1);
+lean_inc(x_62);
 lean_inc(x_61);
-lean_inc(x_60);
-lean_dec(x_29);
-x_62 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_62, 0, x_60);
-lean_ctor_set(x_62, 1, x_61);
-return x_62;
+lean_dec(x_30);
+x_63 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+return x_63;
 }
 }
 }
 else
 {
-uint8_t x_63; 
+uint8_t x_64; 
 lean_dec(x_22);
 lean_dec(x_18);
 lean_dec(x_17);
@@ -26078,28 +27413,28 @@ lean_dec(x_15);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
-lean_dec(x_10);
+lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_63 = !lean_is_exclusive(x_26);
-if (x_63 == 0)
+x_64 = !lean_is_exclusive(x_26);
+if (x_64 == 0)
 {
 return x_26;
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_26, 0);
-x_65 = lean_ctor_get(x_26, 1);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_26, 0);
+x_66 = lean_ctor_get(x_26, 1);
+lean_inc(x_66);
 lean_inc(x_65);
-lean_inc(x_64);
 lean_dec(x_26);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_65);
-return x_66;
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
 }
 }
 }
@@ -26191,8 +27526,8 @@ if (x_34 == 0)
 lean_object* x_36; lean_object* x_37; 
 lean_dec(x_14);
 x_36 = lean_box(0);
-x_37 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1(x_5, x_6, x_7, x_26, x_8, x_15, x_9, x_27, x_10, x_11, x_32, x_12, x_13, x_36, x_16, x_17, x_18, x_19, x_35);
-lean_dec(x_10);
+x_37 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1(x_5, x_6, x_7, x_26, x_8, x_15, x_9, x_10, x_27, x_11, x_12, x_32, x_13, x_36, x_16, x_17, x_18, x_19, x_35);
+lean_dec(x_11);
 lean_dec(x_5);
 return x_37;
 }
@@ -26206,7 +27541,7 @@ x_39 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___
 x_40 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_40, 0, x_39);
 lean_ctor_set(x_40, 1, x_38);
-x_41 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10;
+x_41 = l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12;
 x_42 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_42, 0, x_40);
 lean_ctor_set(x_42, 1, x_41);
@@ -26216,9 +27551,9 @@ lean_inc(x_44);
 x_45 = lean_ctor_get(x_43, 1);
 lean_inc(x_45);
 lean_dec(x_43);
-x_46 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1(x_5, x_6, x_7, x_26, x_8, x_15, x_9, x_27, x_10, x_11, x_32, x_12, x_13, x_44, x_16, x_17, x_18, x_19, x_45);
+x_46 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1(x_5, x_6, x_7, x_26, x_8, x_15, x_9, x_10, x_27, x_11, x_12, x_32, x_13, x_44, x_16, x_17, x_18, x_19, x_45);
 lean_dec(x_44);
-lean_dec(x_10);
+lean_dec(x_11);
 lean_dec(x_5);
 return x_46;
 }
@@ -26265,137 +27600,84 @@ return x_61;
 }
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__1() {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17) {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_2 = lean_unsigned_to_nat(1u);
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_2 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__1;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_2 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__2;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_2 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__3;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_2 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__4;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
-_start:
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; size_t x_32; lean_object* x_33; size_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_16 = lean_ctor_get(x_1, 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; 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; 
+x_18 = lean_ctor_get(x_1, 0);
+lean_inc(x_18);
+x_19 = lean_unsigned_to_nat(0u);
+lean_inc(x_18);
+lean_inc(x_11);
+x_20 = l_Array_toSubarray___rarg(x_11, x_19, x_18);
+x_21 = l_Lean_instInhabitedExpr;
+x_22 = lean_array_get(x_21, x_11, x_18);
+x_23 = lean_array_get_size(x_11);
+x_24 = l_Lean_Meta_Match_MatcherInfo_numAlts(x_1);
+x_25 = lean_nat_sub(x_23, x_24);
+lean_dec(x_24);
+lean_dec(x_23);
+x_26 = lean_array_get_size(x_11);
+lean_inc(x_11);
+x_27 = l_Array_toSubarray___rarg(x_11, x_25, x_26);
+x_28 = lean_unsigned_to_nat(1u);
+x_29 = lean_nat_add(x_18, x_28);
+lean_dec(x_18);
+x_30 = lean_ctor_get(x_1, 1);
+lean_inc(x_30);
+x_31 = lean_nat_add(x_29, x_30);
+lean_dec(x_30);
+x_32 = l_Array_toSubarray___rarg(x_11, x_29, x_31);
+x_33 = l_Subarray_size___rarg(x_27);
+lean_inc(x_2);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_2);
+lean_ctor_set(x_34, 1, x_28);
+lean_inc(x_2);
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_2);
+lean_ctor_set(x_35, 1, x_34);
+lean_inc(x_2);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_2);
+lean_ctor_set(x_36, 1, x_35);
+lean_inc(x_2);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_2);
+lean_ctor_set(x_37, 1, x_36);
+lean_inc(x_2);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_2);
+lean_ctor_set(x_38, 1, x_37);
 lean_inc(x_16);
-x_17 = lean_unsigned_to_nat(0u);
-lean_inc(x_16);
-lean_inc(x_9);
-x_18 = l_Array_toSubarray___rarg(x_9, x_17, x_16);
-x_19 = l_Lean_instInhabitedExpr;
-x_20 = lean_array_get(x_19, x_9, x_16);
-x_21 = lean_array_get_size(x_9);
-x_22 = l_Lean_Meta_Match_MatcherInfo_numAlts(x_1);
-x_23 = lean_nat_sub(x_21, x_22);
-lean_dec(x_22);
-lean_dec(x_21);
-x_24 = lean_array_get_size(x_9);
-lean_inc(x_9);
-x_25 = l_Array_toSubarray___rarg(x_9, x_23, x_24);
-x_26 = lean_unsigned_to_nat(1u);
-x_27 = lean_nat_add(x_16, x_26);
-lean_dec(x_16);
-x_28 = lean_ctor_get(x_1, 1);
-lean_inc(x_28);
-lean_dec(x_1);
-x_29 = lean_nat_add(x_27, x_28);
-lean_dec(x_28);
-x_30 = l_Array_toSubarray___rarg(x_9, x_27, x_29);
-x_31 = lean_ctor_get(x_25, 2);
-lean_inc(x_31);
-x_32 = lean_usize_of_nat(x_31);
-lean_dec(x_31);
-x_33 = lean_ctor_get(x_25, 1);
-lean_inc(x_33);
-x_34 = lean_usize_of_nat(x_33);
-lean_dec(x_33);
-x_35 = l_Lean_Meta_casesOnStuckLHS___closed__2;
-x_36 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__5;
+lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_30);
-lean_inc(x_25);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_inc(x_27);
+lean_inc(x_22);
 lean_inc(x_20);
-lean_inc(x_18);
-lean_inc(x_8);
+lean_inc(x_9);
+lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_5);
+lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_2);
-x_37 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_18, x_20, x_25, x_30, x_35, x_25, x_32, x_34, x_36, x_11, x_12, x_13, x_14, x_15);
-if (lean_obj_tag(x_37) == 0)
+x_39 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_1, x_10, x_20, x_22, x_27, x_32, x_2, x_33, x_19, x_33, x_28, x_38, x_13, x_14, x_15, x_16, x_17);
+lean_dec(x_33);
+lean_dec(x_1);
+if (lean_obj_tag(x_39) == 0)
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_38, 1);
-lean_inc(x_39);
-x_40 = lean_ctor_get(x_39, 1);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_40 = lean_ctor_get(x_39, 0);
 lean_inc(x_40);
 x_41 = lean_ctor_get(x_40, 1);
 lean_inc(x_41);
-x_42 = lean_ctor_get(x_37, 1);
+x_42 = lean_ctor_get(x_41, 1);
 lean_inc(x_42);
-lean_dec(x_37);
-x_43 = lean_ctor_get(x_38, 0);
+x_43 = lean_ctor_get(x_42, 1);
 lean_inc(x_43);
-lean_dec(x_38);
-x_44 = lean_ctor_get(x_39, 0);
+x_44 = lean_ctor_get(x_39, 1);
 lean_inc(x_44);
 lean_dec(x_39);
 x_45 = lean_ctor_get(x_40, 0);
@@ -26404,59 +27686,65 @@ lean_dec(x_40);
 x_46 = lean_ctor_get(x_41, 0);
 lean_inc(x_46);
 lean_dec(x_41);
-x_47 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__2___boxed), 20, 14);
-lean_closure_set(x_47, 0, x_18);
-lean_closure_set(x_47, 1, x_20);
-lean_closure_set(x_47, 2, x_30);
-lean_closure_set(x_47, 3, x_10);
-lean_closure_set(x_47, 4, x_5);
-lean_closure_set(x_47, 5, x_8);
-lean_closure_set(x_47, 6, x_25);
-lean_closure_set(x_47, 7, x_2);
-lean_closure_set(x_47, 8, x_43);
-lean_closure_set(x_47, 9, x_4);
-lean_closure_set(x_47, 10, x_6);
-lean_closure_set(x_47, 11, x_46);
-lean_closure_set(x_47, 12, x_45);
-lean_closure_set(x_47, 13, x_3);
-x_48 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts___rarg(x_44, x_47, x_11, x_12, x_13, x_14, x_42);
-return x_48;
+x_47 = lean_ctor_get(x_42, 0);
+lean_inc(x_47);
+lean_dec(x_42);
+x_48 = lean_ctor_get(x_43, 0);
+lean_inc(x_48);
+lean_dec(x_43);
+x_49 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__2___boxed), 20, 14);
+lean_closure_set(x_49, 0, x_20);
+lean_closure_set(x_49, 1, x_22);
+lean_closure_set(x_49, 2, x_32);
+lean_closure_set(x_49, 3, x_12);
+lean_closure_set(x_49, 4, x_6);
+lean_closure_set(x_49, 5, x_9);
+lean_closure_set(x_49, 6, x_27);
+lean_closure_set(x_49, 7, x_3);
+lean_closure_set(x_49, 8, x_47);
+lean_closure_set(x_49, 9, x_45);
+lean_closure_set(x_49, 10, x_5);
+lean_closure_set(x_49, 11, x_7);
+lean_closure_set(x_49, 12, x_48);
+lean_closure_set(x_49, 13, x_4);
+x_50 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_withSplitterAlts___rarg(x_46, x_49, x_13, x_14, x_15, x_16, x_44);
+return x_50;
 }
 else
 {
-uint8_t x_49; 
-lean_dec(x_30);
-lean_dec(x_25);
+uint8_t x_51; 
+lean_dec(x_32);
+lean_dec(x_27);
+lean_dec(x_22);
 lean_dec(x_20);
-lean_dec(x_18);
+lean_dec(x_16);
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_8);
+lean_dec(x_9);
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-x_49 = !lean_is_exclusive(x_37);
-if (x_49 == 0)
+x_51 = !lean_is_exclusive(x_39);
+if (x_51 == 0)
 {
-return x_37;
+return x_39;
 }
 else
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-x_50 = lean_ctor_get(x_37, 0);
-x_51 = lean_ctor_get(x_37, 1);
-lean_inc(x_51);
-lean_inc(x_50);
-lean_dec(x_37);
-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* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_39, 0);
+x_53 = lean_ctor_get(x_39, 1);
+lean_inc(x_53);
+lean_inc(x_52);
+lean_dec(x_39);
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_52);
+lean_ctor_set(x_54, 1, x_53);
+return x_54;
 }
 }
 }
@@ -26495,647 +27783,671 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-uint8_t x_9; 
-x_9 = !lean_is_exclusive(x_4);
-if (x_9 == 0)
+uint8_t x_10; 
+x_10 = !lean_is_exclusive(x_5);
+if (x_10 == 0)
 {
-lean_object* x_10; uint8_t x_11; 
-x_10 = lean_ctor_get(x_4, 0);
-x_11 = !lean_is_exclusive(x_10);
-if (x_11 == 0)
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_ctor_get(x_5, 0);
+x_12 = !lean_is_exclusive(x_11);
+if (x_12 == 0)
 {
-uint8_t x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_12 = 2;
-lean_ctor_set_uint8(x_10, 13, x_12);
-x_13 = lean_st_ref_get(x_7, x_8);
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
+uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_13 = 2;
+lean_ctor_set_uint8(x_11, 13, x_13);
+x_14 = lean_st_ref_get(x_8, x_9);
+x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
-lean_dec(x_13);
-x_16 = lean_ctor_get(x_14, 0);
+x_16 = lean_ctor_get(x_14, 1);
 lean_inc(x_16);
 lean_dec(x_14);
+x_17 = lean_ctor_get(x_15, 0);
+lean_inc(x_17);
+lean_dec(x_15);
 lean_inc(x_1);
-x_17 = l_Lean_mkPrivateName(x_16, x_1);
+x_18 = l_Lean_mkPrivateName(x_17, x_1);
 lean_inc(x_1);
-x_18 = l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(x_1, x_4, x_5, x_6, x_7, x_15);
-if (lean_obj_tag(x_18) == 0)
+x_19 = l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(x_1, x_5, x_6, x_7, x_8, x_16);
+if (lean_obj_tag(x_19) == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_20 = lean_ctor_get(x_19, 0);
 lean_inc(x_20);
-lean_dec(x_18);
-x_21 = l_Lean_ConstantInfo_levelParams(x_19);
-x_22 = lean_box(0);
+x_21 = lean_ctor_get(x_19, 1);
 lean_inc(x_21);
-x_23 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_21, x_22);
-lean_inc(x_1);
-x_24 = l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(x_1, x_4, x_5, x_6, x_7, x_20);
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-if (lean_obj_tag(x_25) == 0)
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-lean_dec(x_23);
-lean_dec(x_21);
 lean_dec(x_19);
-lean_dec(x_17);
-lean_dec(x_2);
-x_26 = lean_ctor_get(x_24, 1);
+x_22 = l_Lean_ConstantInfo_levelParams(x_20);
+x_23 = lean_box(0);
+lean_inc(x_22);
+x_24 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_22, x_23);
+lean_inc(x_1);
+x_25 = l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(x_1, x_5, x_6, x_7, x_8, x_21);
+x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
+if (lean_obj_tag(x_26) == 0)
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
 lean_dec(x_24);
-x_27 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_27, 0, x_1);
-x_28 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
-x_29 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_27);
-x_30 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
-x_31 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_30);
-x_32 = l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(x_31, x_4, x_5, x_6, x_7, x_26);
+lean_dec(x_22);
+lean_dec(x_20);
+lean_dec(x_18);
+lean_dec(x_3);
+lean_dec(x_2);
+x_27 = lean_ctor_get(x_25, 1);
+lean_inc(x_27);
+lean_dec(x_25);
+x_28 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_28, 0, x_1);
+x_29 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
+x_30 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_28);
+x_31 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
+x_32 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+x_33 = l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(x_32, x_5, x_6, x_7, x_8, x_27);
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-lean_dec(x_4);
-x_33 = !lean_is_exclusive(x_32);
-if (x_33 == 0)
+x_34 = !lean_is_exclusive(x_33);
+if (x_34 == 0)
 {
-return x_32;
+return x_33;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_32, 0);
-x_35 = lean_ctor_get(x_32, 1);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_33, 0);
+x_36 = lean_ctor_get(x_33, 1);
+lean_inc(x_36);
 lean_inc(x_35);
-lean_inc(x_34);
-lean_dec(x_32);
-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_dec(x_33);
+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_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_37 = lean_ctor_get(x_24, 1);
-lean_inc(x_37);
-lean_dec(x_24);
-x_38 = lean_ctor_get(x_25, 0);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_38 = lean_ctor_get(x_25, 1);
 lean_inc(x_38);
 lean_dec(x_25);
-x_39 = l_Lean_ConstantInfo_type(x_19);
-x_40 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3), 15, 8);
-lean_closure_set(x_40, 0, x_38);
-lean_closure_set(x_40, 1, x_1);
-lean_closure_set(x_40, 2, x_2);
-lean_closure_set(x_40, 3, x_17);
-lean_closure_set(x_40, 4, x_19);
-lean_closure_set(x_40, 5, x_21);
-lean_closure_set(x_40, 6, x_22);
-lean_closure_set(x_40, 7, x_23);
-x_41 = l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(x_39, x_40, x_4, x_5, x_6, x_7, x_37);
-if (lean_obj_tag(x_41) == 0)
+x_39 = lean_ctor_get(x_26, 0);
+lean_inc(x_39);
+lean_dec(x_26);
+x_40 = lean_ctor_get(x_39, 4);
+lean_inc(x_40);
+x_41 = l_Lean_Meta_Match_getNumEqsFromDiscrInfos(x_40);
+lean_dec(x_40);
+x_42 = l_Lean_ConstantInfo_type(x_20);
+x_43 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___boxed), 17, 10);
+lean_closure_set(x_43, 0, x_39);
+lean_closure_set(x_43, 1, x_2);
+lean_closure_set(x_43, 2, x_1);
+lean_closure_set(x_43, 3, x_3);
+lean_closure_set(x_43, 4, x_18);
+lean_closure_set(x_43, 5, x_20);
+lean_closure_set(x_43, 6, x_22);
+lean_closure_set(x_43, 7, x_23);
+lean_closure_set(x_43, 8, x_24);
+lean_closure_set(x_43, 9, x_41);
+x_44 = l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(x_42, x_43, x_5, x_6, x_7, x_8, x_38);
+if (lean_obj_tag(x_44) == 0)
 {
-uint8_t x_42; 
-x_42 = !lean_is_exclusive(x_41);
-if (x_42 == 0)
+uint8_t x_45; 
+x_45 = !lean_is_exclusive(x_44);
+if (x_45 == 0)
 {
-return x_41;
+return x_44;
 }
 else
 {
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_41, 0);
-x_44 = lean_ctor_get(x_41, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_41);
-x_45 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_45, 0, x_43);
-lean_ctor_set(x_45, 1, x_44);
-return x_45;
-}
-}
-else
-{
-uint8_t x_46; 
-x_46 = !lean_is_exclusive(x_41);
-if (x_46 == 0)
-{
-return x_41;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_47 = lean_ctor_get(x_41, 0);
-x_48 = lean_ctor_get(x_41, 1);
-lean_inc(x_48);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_44, 0);
+x_47 = lean_ctor_get(x_44, 1);
 lean_inc(x_47);
-lean_dec(x_41);
-x_49 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_49, 0, x_47);
-lean_ctor_set(x_49, 1, x_48);
-return x_49;
-}
-}
+lean_inc(x_46);
+lean_dec(x_44);
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
 }
 }
 else
 {
-uint8_t x_50; 
-lean_dec(x_17);
-lean_dec(x_4);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-x_50 = !lean_is_exclusive(x_18);
-if (x_50 == 0)
+uint8_t x_49; 
+x_49 = !lean_is_exclusive(x_44);
+if (x_49 == 0)
 {
-return x_18;
+return x_44;
 }
 else
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_18, 0);
-x_52 = lean_ctor_get(x_18, 1);
-lean_inc(x_52);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_50 = lean_ctor_get(x_44, 0);
+x_51 = lean_ctor_get(x_44, 1);
 lean_inc(x_51);
+lean_inc(x_50);
+lean_dec(x_44);
+x_52 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_52, 0, x_50);
+lean_ctor_set(x_52, 1, x_51);
+return x_52;
+}
+}
+}
+}
+else
+{
+uint8_t x_53; 
 lean_dec(x_18);
-x_53 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_53, 0, x_51);
-lean_ctor_set(x_53, 1, x_52);
-return x_53;
-}
-}
-}
-else
-{
-uint8_t x_54; uint8_t x_55; uint8_t x_56; uint8_t x_57; uint8_t x_58; uint8_t x_59; uint8_t x_60; uint8_t x_61; uint8_t x_62; uint8_t x_63; uint8_t x_64; uint8_t x_65; uint8_t x_66; uint8_t x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_54 = lean_ctor_get_uint8(x_10, 0);
-x_55 = lean_ctor_get_uint8(x_10, 1);
-x_56 = lean_ctor_get_uint8(x_10, 2);
-x_57 = lean_ctor_get_uint8(x_10, 3);
-x_58 = lean_ctor_get_uint8(x_10, 4);
-x_59 = lean_ctor_get_uint8(x_10, 5);
-x_60 = lean_ctor_get_uint8(x_10, 6);
-x_61 = lean_ctor_get_uint8(x_10, 7);
-x_62 = lean_ctor_get_uint8(x_10, 8);
-x_63 = lean_ctor_get_uint8(x_10, 9);
-x_64 = lean_ctor_get_uint8(x_10, 10);
-x_65 = lean_ctor_get_uint8(x_10, 11);
-x_66 = lean_ctor_get_uint8(x_10, 12);
-lean_dec(x_10);
-x_67 = 2;
-x_68 = lean_alloc_ctor(0, 0, 14);
-lean_ctor_set_uint8(x_68, 0, x_54);
-lean_ctor_set_uint8(x_68, 1, x_55);
-lean_ctor_set_uint8(x_68, 2, x_56);
-lean_ctor_set_uint8(x_68, 3, x_57);
-lean_ctor_set_uint8(x_68, 4, x_58);
-lean_ctor_set_uint8(x_68, 5, x_59);
-lean_ctor_set_uint8(x_68, 6, x_60);
-lean_ctor_set_uint8(x_68, 7, x_61);
-lean_ctor_set_uint8(x_68, 8, x_62);
-lean_ctor_set_uint8(x_68, 9, x_63);
-lean_ctor_set_uint8(x_68, 10, x_64);
-lean_ctor_set_uint8(x_68, 11, x_65);
-lean_ctor_set_uint8(x_68, 12, x_66);
-lean_ctor_set_uint8(x_68, 13, x_67);
-lean_ctor_set(x_4, 0, x_68);
-x_69 = lean_st_ref_get(x_7, x_8);
-x_70 = lean_ctor_get(x_69, 0);
-lean_inc(x_70);
-x_71 = lean_ctor_get(x_69, 1);
-lean_inc(x_71);
-lean_dec(x_69);
-x_72 = lean_ctor_get(x_70, 0);
-lean_inc(x_72);
-lean_dec(x_70);
-lean_inc(x_1);
-x_73 = l_Lean_mkPrivateName(x_72, x_1);
-lean_inc(x_1);
-x_74 = l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(x_1, x_4, x_5, x_6, x_7, x_71);
-if (lean_obj_tag(x_74) == 0)
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-lean_dec(x_74);
-x_77 = l_Lean_ConstantInfo_levelParams(x_75);
-x_78 = lean_box(0);
-lean_inc(x_77);
-x_79 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_77, x_78);
-lean_inc(x_1);
-x_80 = l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(x_1, x_4, x_5, x_6, x_7, x_76);
-x_81 = lean_ctor_get(x_80, 0);
-lean_inc(x_81);
-if (lean_obj_tag(x_81) == 0)
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-lean_dec(x_79);
-lean_dec(x_77);
-lean_dec(x_75);
-lean_dec(x_73);
-lean_dec(x_2);
-x_82 = lean_ctor_get(x_80, 1);
-lean_inc(x_82);
-lean_dec(x_80);
-x_83 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_83, 0, x_1);
-x_84 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
-x_85 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_85, 0, x_84);
-lean_ctor_set(x_85, 1, x_83);
-x_86 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
-x_87 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-x_88 = l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(x_87, x_4, x_5, x_6, x_7, x_82);
+lean_dec(x_5);
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-x_89 = lean_ctor_get(x_88, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_88, 1);
-lean_inc(x_90);
-if (lean_is_exclusive(x_88)) {
- lean_ctor_release(x_88, 0);
- lean_ctor_release(x_88, 1);
- x_91 = x_88;
-} else {
- lean_dec_ref(x_88);
- x_91 = lean_box(0);
-}
-if (lean_is_scalar(x_91)) {
- x_92 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_92 = x_91;
-}
-lean_ctor_set(x_92, 0, x_89);
-lean_ctor_set(x_92, 1, x_90);
-return x_92;
-}
-else
-{
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_93 = lean_ctor_get(x_80, 1);
-lean_inc(x_93);
-lean_dec(x_80);
-x_94 = lean_ctor_get(x_81, 0);
-lean_inc(x_94);
-lean_dec(x_81);
-x_95 = l_Lean_ConstantInfo_type(x_75);
-x_96 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3), 15, 8);
-lean_closure_set(x_96, 0, x_94);
-lean_closure_set(x_96, 1, x_1);
-lean_closure_set(x_96, 2, x_2);
-lean_closure_set(x_96, 3, x_73);
-lean_closure_set(x_96, 4, x_75);
-lean_closure_set(x_96, 5, x_77);
-lean_closure_set(x_96, 6, x_78);
-lean_closure_set(x_96, 7, x_79);
-x_97 = l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(x_95, x_96, x_4, x_5, x_6, x_7, x_93);
-if (lean_obj_tag(x_97) == 0)
-{
-lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_98 = lean_ctor_get(x_97, 0);
-lean_inc(x_98);
-x_99 = lean_ctor_get(x_97, 1);
-lean_inc(x_99);
-if (lean_is_exclusive(x_97)) {
- lean_ctor_release(x_97, 0);
- lean_ctor_release(x_97, 1);
- x_100 = x_97;
-} else {
- lean_dec_ref(x_97);
- x_100 = lean_box(0);
-}
-if (lean_is_scalar(x_100)) {
- x_101 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_101 = x_100;
-}
-lean_ctor_set(x_101, 0, x_98);
-lean_ctor_set(x_101, 1, x_99);
-return x_101;
-}
-else
-{
-lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; 
-x_102 = lean_ctor_get(x_97, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_97, 1);
-lean_inc(x_103);
-if (lean_is_exclusive(x_97)) {
- lean_ctor_release(x_97, 0);
- lean_ctor_release(x_97, 1);
- x_104 = x_97;
-} else {
- lean_dec_ref(x_97);
- x_104 = lean_box(0);
-}
-if (lean_is_scalar(x_104)) {
- x_105 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_105 = x_104;
-}
-lean_ctor_set(x_105, 0, x_102);
-lean_ctor_set(x_105, 1, x_103);
-return x_105;
-}
-}
-}
-else
-{
-lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-lean_dec(x_73);
-lean_dec(x_4);
-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_106 = lean_ctor_get(x_74, 0);
-lean_inc(x_106);
-x_107 = lean_ctor_get(x_74, 1);
-lean_inc(x_107);
-if (lean_is_exclusive(x_74)) {
- lean_ctor_release(x_74, 0);
- lean_ctor_release(x_74, 1);
- x_108 = x_74;
-} else {
- lean_dec_ref(x_74);
- x_108 = lean_box(0);
+x_53 = !lean_is_exclusive(x_19);
+if (x_53 == 0)
+{
+return x_19;
 }
-if (lean_is_scalar(x_108)) {
- x_109 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_109 = x_108;
-}
-lean_ctor_set(x_109, 0, x_106);
-lean_ctor_set(x_109, 1, x_107);
-return x_109;
+else
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_54 = lean_ctor_get(x_19, 0);
+x_55 = lean_ctor_get(x_19, 1);
+lean_inc(x_55);
+lean_inc(x_54);
+lean_dec(x_19);
+x_56 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_56, 0, x_54);
+lean_ctor_set(x_56, 1, x_55);
+return x_56;
 }
 }
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; uint8_t x_117; uint8_t x_118; uint8_t x_119; uint8_t x_120; uint8_t x_121; uint8_t x_122; uint8_t x_123; uint8_t x_124; uint8_t x_125; uint8_t x_126; uint8_t x_127; uint8_t x_128; lean_object* x_129; uint8_t 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; 
-x_110 = lean_ctor_get(x_4, 0);
-x_111 = lean_ctor_get(x_4, 1);
-x_112 = lean_ctor_get(x_4, 2);
-x_113 = lean_ctor_get(x_4, 3);
-x_114 = lean_ctor_get(x_4, 4);
-x_115 = lean_ctor_get(x_4, 5);
-lean_inc(x_115);
-lean_inc(x_114);
-lean_inc(x_113);
-lean_inc(x_112);
-lean_inc(x_111);
-lean_inc(x_110);
-lean_dec(x_4);
-x_116 = lean_ctor_get_uint8(x_110, 0);
-x_117 = lean_ctor_get_uint8(x_110, 1);
-x_118 = lean_ctor_get_uint8(x_110, 2);
-x_119 = lean_ctor_get_uint8(x_110, 3);
-x_120 = lean_ctor_get_uint8(x_110, 4);
-x_121 = lean_ctor_get_uint8(x_110, 5);
-x_122 = lean_ctor_get_uint8(x_110, 6);
-x_123 = lean_ctor_get_uint8(x_110, 7);
-x_124 = lean_ctor_get_uint8(x_110, 8);
-x_125 = lean_ctor_get_uint8(x_110, 9);
-x_126 = lean_ctor_get_uint8(x_110, 10);
-x_127 = lean_ctor_get_uint8(x_110, 11);
-x_128 = lean_ctor_get_uint8(x_110, 12);
-if (lean_is_exclusive(x_110)) {
- x_129 = x_110;
-} else {
- lean_dec_ref(x_110);
- x_129 = lean_box(0);
-}
-x_130 = 2;
-if (lean_is_scalar(x_129)) {
- x_131 = lean_alloc_ctor(0, 0, 14);
-} else {
- x_131 = x_129;
-}
-lean_ctor_set_uint8(x_131, 0, x_116);
-lean_ctor_set_uint8(x_131, 1, x_117);
-lean_ctor_set_uint8(x_131, 2, x_118);
-lean_ctor_set_uint8(x_131, 3, x_119);
-lean_ctor_set_uint8(x_131, 4, x_120);
-lean_ctor_set_uint8(x_131, 5, x_121);
-lean_ctor_set_uint8(x_131, 6, x_122);
-lean_ctor_set_uint8(x_131, 7, x_123);
-lean_ctor_set_uint8(x_131, 8, x_124);
-lean_ctor_set_uint8(x_131, 9, x_125);
-lean_ctor_set_uint8(x_131, 10, x_126);
-lean_ctor_set_uint8(x_131, 11, x_127);
-lean_ctor_set_uint8(x_131, 12, x_128);
-lean_ctor_set_uint8(x_131, 13, x_130);
-x_132 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_132, 0, x_131);
-lean_ctor_set(x_132, 1, x_111);
-lean_ctor_set(x_132, 2, x_112);
-lean_ctor_set(x_132, 3, x_113);
-lean_ctor_set(x_132, 4, x_114);
-lean_ctor_set(x_132, 5, x_115);
-x_133 = lean_st_ref_get(x_7, x_8);
-x_134 = lean_ctor_get(x_133, 0);
-lean_inc(x_134);
-x_135 = lean_ctor_get(x_133, 1);
-lean_inc(x_135);
-lean_dec(x_133);
-x_136 = lean_ctor_get(x_134, 0);
-lean_inc(x_136);
-lean_dec(x_134);
+uint8_t x_57; uint8_t x_58; uint8_t x_59; uint8_t x_60; uint8_t x_61; uint8_t x_62; uint8_t x_63; uint8_t x_64; uint8_t x_65; uint8_t x_66; uint8_t x_67; uint8_t x_68; uint8_t x_69; uint8_t x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_57 = lean_ctor_get_uint8(x_11, 0);
+x_58 = lean_ctor_get_uint8(x_11, 1);
+x_59 = lean_ctor_get_uint8(x_11, 2);
+x_60 = lean_ctor_get_uint8(x_11, 3);
+x_61 = lean_ctor_get_uint8(x_11, 4);
+x_62 = lean_ctor_get_uint8(x_11, 5);
+x_63 = lean_ctor_get_uint8(x_11, 6);
+x_64 = lean_ctor_get_uint8(x_11, 7);
+x_65 = lean_ctor_get_uint8(x_11, 8);
+x_66 = lean_ctor_get_uint8(x_11, 9);
+x_67 = lean_ctor_get_uint8(x_11, 10);
+x_68 = lean_ctor_get_uint8(x_11, 11);
+x_69 = lean_ctor_get_uint8(x_11, 12);
+lean_dec(x_11);
+x_70 = 2;
+x_71 = lean_alloc_ctor(0, 0, 14);
+lean_ctor_set_uint8(x_71, 0, x_57);
+lean_ctor_set_uint8(x_71, 1, x_58);
+lean_ctor_set_uint8(x_71, 2, x_59);
+lean_ctor_set_uint8(x_71, 3, x_60);
+lean_ctor_set_uint8(x_71, 4, x_61);
+lean_ctor_set_uint8(x_71, 5, x_62);
+lean_ctor_set_uint8(x_71, 6, x_63);
+lean_ctor_set_uint8(x_71, 7, x_64);
+lean_ctor_set_uint8(x_71, 8, x_65);
+lean_ctor_set_uint8(x_71, 9, x_66);
+lean_ctor_set_uint8(x_71, 10, x_67);
+lean_ctor_set_uint8(x_71, 11, x_68);
+lean_ctor_set_uint8(x_71, 12, x_69);
+lean_ctor_set_uint8(x_71, 13, x_70);
+lean_ctor_set(x_5, 0, x_71);
+x_72 = lean_st_ref_get(x_8, x_9);
+x_73 = lean_ctor_get(x_72, 0);
+lean_inc(x_73);
+x_74 = lean_ctor_get(x_72, 1);
+lean_inc(x_74);
+lean_dec(x_72);
+x_75 = lean_ctor_get(x_73, 0);
+lean_inc(x_75);
+lean_dec(x_73);
 lean_inc(x_1);
-x_137 = l_Lean_mkPrivateName(x_136, x_1);
+x_76 = l_Lean_mkPrivateName(x_75, x_1);
 lean_inc(x_1);
-x_138 = l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(x_1, x_132, x_5, x_6, x_7, x_135);
-if (lean_obj_tag(x_138) == 0)
+x_77 = l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(x_1, x_5, x_6, x_7, x_8, x_74);
+if (lean_obj_tag(x_77) == 0)
 {
-lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+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 = l_Lean_ConstantInfo_levelParams(x_78);
+x_81 = lean_box(0);
+lean_inc(x_80);
+x_82 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_80, x_81);
+lean_inc(x_1);
+x_83 = l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(x_1, x_5, x_6, x_7, x_8, x_79);
+x_84 = lean_ctor_get(x_83, 0);
+lean_inc(x_84);
+if (lean_obj_tag(x_84) == 0)
+{
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+lean_dec(x_82);
+lean_dec(x_80);
+lean_dec(x_78);
+lean_dec(x_76);
+lean_dec(x_3);
+lean_dec(x_2);
+x_85 = lean_ctor_get(x_83, 1);
+lean_inc(x_85);
+lean_dec(x_83);
+x_86 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_86, 0, x_1);
+x_87 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
+x_88 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_88, 0, x_87);
+lean_ctor_set(x_88, 1, x_86);
+x_89 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
+x_90 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+x_91 = l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(x_90, x_5, x_6, x_7, x_8, x_85);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_92 = lean_ctor_get(x_91, 0);
+lean_inc(x_92);
+x_93 = lean_ctor_get(x_91, 1);
+lean_inc(x_93);
+if (lean_is_exclusive(x_91)) {
+ lean_ctor_release(x_91, 0);
+ lean_ctor_release(x_91, 1);
+ x_94 = x_91;
+} else {
+ lean_dec_ref(x_91);
+ x_94 = lean_box(0);
+}
+if (lean_is_scalar(x_94)) {
+ x_95 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_95 = x_94;
+}
+lean_ctor_set(x_95, 0, x_92);
+lean_ctor_set(x_95, 1, x_93);
+return x_95;
+}
+else
+{
+lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_96 = lean_ctor_get(x_83, 1);
+lean_inc(x_96);
+lean_dec(x_83);
+x_97 = lean_ctor_get(x_84, 0);
+lean_inc(x_97);
+lean_dec(x_84);
+x_98 = lean_ctor_get(x_97, 4);
+lean_inc(x_98);
+x_99 = l_Lean_Meta_Match_getNumEqsFromDiscrInfos(x_98);
+lean_dec(x_98);
+x_100 = l_Lean_ConstantInfo_type(x_78);
+x_101 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___boxed), 17, 10);
+lean_closure_set(x_101, 0, x_97);
+lean_closure_set(x_101, 1, x_2);
+lean_closure_set(x_101, 2, x_1);
+lean_closure_set(x_101, 3, x_3);
+lean_closure_set(x_101, 4, x_76);
+lean_closure_set(x_101, 5, x_78);
+lean_closure_set(x_101, 6, x_80);
+lean_closure_set(x_101, 7, x_81);
+lean_closure_set(x_101, 8, x_82);
+lean_closure_set(x_101, 9, x_99);
+x_102 = l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(x_100, x_101, x_5, x_6, x_7, x_8, x_96);
+if (lean_obj_tag(x_102) == 0)
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+x_103 = lean_ctor_get(x_102, 0);
+lean_inc(x_103);
+x_104 = lean_ctor_get(x_102, 1);
+lean_inc(x_104);
+if (lean_is_exclusive(x_102)) {
+ lean_ctor_release(x_102, 0);
+ lean_ctor_release(x_102, 1);
+ x_105 = x_102;
+} else {
+ lean_dec_ref(x_102);
+ x_105 = lean_box(0);
+}
+if (lean_is_scalar(x_105)) {
+ x_106 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_106 = x_105;
+}
+lean_ctor_set(x_106, 0, x_103);
+lean_ctor_set(x_106, 1, x_104);
+return x_106;
+}
+else
+{
+lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_107 = lean_ctor_get(x_102, 0);
+lean_inc(x_107);
+x_108 = lean_ctor_get(x_102, 1);
+lean_inc(x_108);
+if (lean_is_exclusive(x_102)) {
+ lean_ctor_release(x_102, 0);
+ lean_ctor_release(x_102, 1);
+ x_109 = x_102;
+} else {
+ lean_dec_ref(x_102);
+ x_109 = lean_box(0);
+}
+if (lean_is_scalar(x_109)) {
+ x_110 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_110 = x_109;
+}
+lean_ctor_set(x_110, 0, x_107);
+lean_ctor_set(x_110, 1, x_108);
+return x_110;
+}
+}
+}
+else
+{
+lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+lean_dec(x_76);
+lean_dec(x_5);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_111 = lean_ctor_get(x_77, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_77, 1);
+lean_inc(x_112);
+if (lean_is_exclusive(x_77)) {
+ lean_ctor_release(x_77, 0);
+ lean_ctor_release(x_77, 1);
+ x_113 = x_77;
+} else {
+ lean_dec_ref(x_77);
+ x_113 = lean_box(0);
+}
+if (lean_is_scalar(x_113)) {
+ x_114 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_114 = x_113;
+}
+lean_ctor_set(x_114, 0, x_111);
+lean_ctor_set(x_114, 1, x_112);
+return x_114;
+}
+}
+}
+else
+{
+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; uint8_t x_122; uint8_t x_123; uint8_t x_124; uint8_t x_125; uint8_t x_126; uint8_t x_127; uint8_t x_128; uint8_t x_129; uint8_t x_130; uint8_t x_131; uint8_t x_132; uint8_t x_133; lean_object* x_134; uint8_t 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_115 = lean_ctor_get(x_5, 0);
+x_116 = lean_ctor_get(x_5, 1);
+x_117 = lean_ctor_get(x_5, 2);
+x_118 = lean_ctor_get(x_5, 3);
+x_119 = lean_ctor_get(x_5, 4);
+x_120 = lean_ctor_get(x_5, 5);
+lean_inc(x_120);
+lean_inc(x_119);
+lean_inc(x_118);
+lean_inc(x_117);
+lean_inc(x_116);
+lean_inc(x_115);
+lean_dec(x_5);
+x_121 = lean_ctor_get_uint8(x_115, 0);
+x_122 = lean_ctor_get_uint8(x_115, 1);
+x_123 = lean_ctor_get_uint8(x_115, 2);
+x_124 = lean_ctor_get_uint8(x_115, 3);
+x_125 = lean_ctor_get_uint8(x_115, 4);
+x_126 = lean_ctor_get_uint8(x_115, 5);
+x_127 = lean_ctor_get_uint8(x_115, 6);
+x_128 = lean_ctor_get_uint8(x_115, 7);
+x_129 = lean_ctor_get_uint8(x_115, 8);
+x_130 = lean_ctor_get_uint8(x_115, 9);
+x_131 = lean_ctor_get_uint8(x_115, 10);
+x_132 = lean_ctor_get_uint8(x_115, 11);
+x_133 = lean_ctor_get_uint8(x_115, 12);
+if (lean_is_exclusive(x_115)) {
+ x_134 = x_115;
+} else {
+ lean_dec_ref(x_115);
+ x_134 = lean_box(0);
+}
+x_135 = 2;
+if (lean_is_scalar(x_134)) {
+ x_136 = lean_alloc_ctor(0, 0, 14);
+} else {
+ x_136 = x_134;
+}
+lean_ctor_set_uint8(x_136, 0, x_121);
+lean_ctor_set_uint8(x_136, 1, x_122);
+lean_ctor_set_uint8(x_136, 2, x_123);
+lean_ctor_set_uint8(x_136, 3, x_124);
+lean_ctor_set_uint8(x_136, 4, x_125);
+lean_ctor_set_uint8(x_136, 5, x_126);
+lean_ctor_set_uint8(x_136, 6, x_127);
+lean_ctor_set_uint8(x_136, 7, x_128);
+lean_ctor_set_uint8(x_136, 8, x_129);
+lean_ctor_set_uint8(x_136, 9, x_130);
+lean_ctor_set_uint8(x_136, 10, x_131);
+lean_ctor_set_uint8(x_136, 11, x_132);
+lean_ctor_set_uint8(x_136, 12, x_133);
+lean_ctor_set_uint8(x_136, 13, x_135);
+x_137 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_137, 0, x_136);
+lean_ctor_set(x_137, 1, x_116);
+lean_ctor_set(x_137, 2, x_117);
+lean_ctor_set(x_137, 3, x_118);
+lean_ctor_set(x_137, 4, x_119);
+lean_ctor_set(x_137, 5, x_120);
+x_138 = lean_st_ref_get(x_8, x_9);
 x_139 = lean_ctor_get(x_138, 0);
 lean_inc(x_139);
 x_140 = lean_ctor_get(x_138, 1);
 lean_inc(x_140);
 lean_dec(x_138);
-x_141 = l_Lean_ConstantInfo_levelParams(x_139);
-x_142 = lean_box(0);
+x_141 = lean_ctor_get(x_139, 0);
 lean_inc(x_141);
-x_143 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_141, x_142);
-lean_inc(x_1);
-x_144 = l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(x_1, x_132, x_5, x_6, x_7, x_140);
-x_145 = lean_ctor_get(x_144, 0);
-lean_inc(x_145);
-if (lean_obj_tag(x_145) == 0)
-{
-lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 
-lean_dec(x_143);
-lean_dec(x_141);
 lean_dec(x_139);
-lean_dec(x_137);
-lean_dec(x_2);
-x_146 = lean_ctor_get(x_144, 1);
+lean_inc(x_1);
+x_142 = l_Lean_mkPrivateName(x_141, x_1);
+lean_inc(x_1);
+x_143 = l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(x_1, x_137, x_6, x_7, x_8, x_140);
+if (lean_obj_tag(x_143) == 0)
+{
+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; 
+x_144 = lean_ctor_get(x_143, 0);
+lean_inc(x_144);
+x_145 = lean_ctor_get(x_143, 1);
+lean_inc(x_145);
+lean_dec(x_143);
+x_146 = l_Lean_ConstantInfo_levelParams(x_144);
+x_147 = lean_box(0);
 lean_inc(x_146);
+x_148 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_146, x_147);
+lean_inc(x_1);
+x_149 = l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Meta_reduceMatcher_x3f___spec__1(x_1, x_137, x_6, x_7, x_8, x_145);
+x_150 = lean_ctor_get(x_149, 0);
+lean_inc(x_150);
+if (lean_obj_tag(x_150) == 0)
+{
+lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 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_dec(x_148);
+lean_dec(x_146);
 lean_dec(x_144);
-x_147 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_147, 0, x_1);
-x_148 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
-x_149 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_149, 0, x_148);
-lean_ctor_set(x_149, 1, x_147);
-x_150 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
-x_151 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_151, 0, x_149);
-lean_ctor_set(x_151, 1, x_150);
-x_152 = l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(x_151, x_132, x_5, x_6, x_7, x_146);
+lean_dec(x_142);
+lean_dec(x_3);
+lean_dec(x_2);
+x_151 = lean_ctor_get(x_149, 1);
+lean_inc(x_151);
+lean_dec(x_149);
+x_152 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_152, 0, x_1);
+x_153 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
+x_154 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_154, 0, x_153);
+lean_ctor_set(x_154, 1, x_152);
+x_155 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4;
+x_156 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_156, 0, x_154);
+lean_ctor_set(x_156, 1, x_155);
+x_157 = l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1(x_156, x_137, x_6, x_7, x_8, x_151);
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_132);
-x_153 = lean_ctor_get(x_152, 0);
-lean_inc(x_153);
-x_154 = lean_ctor_get(x_152, 1);
-lean_inc(x_154);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_155 = x_152;
-} else {
- lean_dec_ref(x_152);
- x_155 = lean_box(0);
-}
-if (lean_is_scalar(x_155)) {
- x_156 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_156 = x_155;
-}
-lean_ctor_set(x_156, 0, x_153);
-lean_ctor_set(x_156, 1, x_154);
-return x_156;
-}
-else
-{
-lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
-x_157 = lean_ctor_get(x_144, 1);
-lean_inc(x_157);
-lean_dec(x_144);
-x_158 = lean_ctor_get(x_145, 0);
-lean_inc(x_158);
-lean_dec(x_145);
-x_159 = l_Lean_ConstantInfo_type(x_139);
-x_160 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3), 15, 8);
-lean_closure_set(x_160, 0, x_158);
-lean_closure_set(x_160, 1, x_1);
-lean_closure_set(x_160, 2, x_2);
-lean_closure_set(x_160, 3, x_137);
-lean_closure_set(x_160, 4, x_139);
-lean_closure_set(x_160, 5, x_141);
-lean_closure_set(x_160, 6, x_142);
-lean_closure_set(x_160, 7, x_143);
-x_161 = l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(x_159, x_160, x_132, x_5, x_6, x_7, x_157);
-if (lean_obj_tag(x_161) == 0)
-{
-lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
-x_162 = lean_ctor_get(x_161, 0);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_161, 1);
-lean_inc(x_163);
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- lean_ctor_release(x_161, 1);
- x_164 = x_161;
-} else {
- lean_dec_ref(x_161);
- x_164 = lean_box(0);
-}
-if (lean_is_scalar(x_164)) {
- x_165 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_165 = x_164;
-}
-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);
-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);
-return x_169;
-}
-}
-}
-else
-{
-lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; 
 lean_dec(x_137);
-lean_dec(x_132);
+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(1, 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; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
+x_162 = lean_ctor_get(x_149, 1);
+lean_inc(x_162);
+lean_dec(x_149);
+x_163 = lean_ctor_get(x_150, 0);
+lean_inc(x_163);
+lean_dec(x_150);
+x_164 = lean_ctor_get(x_163, 4);
+lean_inc(x_164);
+x_165 = l_Lean_Meta_Match_getNumEqsFromDiscrInfos(x_164);
+lean_dec(x_164);
+x_166 = l_Lean_ConstantInfo_type(x_144);
+x_167 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___boxed), 17, 10);
+lean_closure_set(x_167, 0, x_163);
+lean_closure_set(x_167, 1, x_2);
+lean_closure_set(x_167, 2, x_1);
+lean_closure_set(x_167, 3, x_3);
+lean_closure_set(x_167, 4, x_142);
+lean_closure_set(x_167, 5, x_144);
+lean_closure_set(x_167, 6, x_146);
+lean_closure_set(x_167, 7, x_147);
+lean_closure_set(x_167, 8, x_148);
+lean_closure_set(x_167, 9, x_165);
+x_168 = l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(x_166, x_167, x_137, x_6, x_7, x_8, x_162);
+if (lean_obj_tag(x_168) == 0)
+{
+lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 
+x_169 = lean_ctor_get(x_168, 0);
+lean_inc(x_169);
+x_170 = lean_ctor_get(x_168, 1);
+lean_inc(x_170);
+if (lean_is_exclusive(x_168)) {
+ lean_ctor_release(x_168, 0);
+ lean_ctor_release(x_168, 1);
+ x_171 = x_168;
+} else {
+ lean_dec_ref(x_168);
+ x_171 = lean_box(0);
+}
+if (lean_is_scalar(x_171)) {
+ x_172 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_172 = x_171;
+}
+lean_ctor_set(x_172, 0, x_169);
+lean_ctor_set(x_172, 1, x_170);
+return x_172;
+}
+else
+{
+lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; 
+x_173 = lean_ctor_get(x_168, 0);
+lean_inc(x_173);
+x_174 = lean_ctor_get(x_168, 1);
+lean_inc(x_174);
+if (lean_is_exclusive(x_168)) {
+ lean_ctor_release(x_168, 0);
+ lean_ctor_release(x_168, 1);
+ x_175 = x_168;
+} else {
+ lean_dec_ref(x_168);
+ x_175 = lean_box(0);
+}
+if (lean_is_scalar(x_175)) {
+ x_176 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_176 = x_175;
+}
+lean_ctor_set(x_176, 0, x_173);
+lean_ctor_set(x_176, 1, x_174);
+return x_176;
+}
+}
+}
+else
+{
+lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
+lean_dec(x_142);
+lean_dec(x_137);
+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_170 = lean_ctor_get(x_138, 0);
-lean_inc(x_170);
-x_171 = lean_ctor_get(x_138, 1);
-lean_inc(x_171);
-if (lean_is_exclusive(x_138)) {
- lean_ctor_release(x_138, 0);
- lean_ctor_release(x_138, 1);
- x_172 = x_138;
+x_177 = lean_ctor_get(x_143, 0);
+lean_inc(x_177);
+x_178 = lean_ctor_get(x_143, 1);
+lean_inc(x_178);
+if (lean_is_exclusive(x_143)) {
+ lean_ctor_release(x_143, 0);
+ lean_ctor_release(x_143, 1);
+ x_179 = x_143;
 } else {
- lean_dec_ref(x_138);
- x_172 = lean_box(0);
+ lean_dec_ref(x_143);
+ x_179 = lean_box(0);
 }
-if (lean_is_scalar(x_172)) {
- x_173 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_179)) {
+ x_180 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_173 = x_172;
+ x_180 = x_179;
 }
-lean_ctor_set(x_173, 0, x_170);
-lean_ctor_set(x_173, 1, x_171);
-return x_173;
+lean_ctor_set(x_180, 0, x_177);
+lean_ctor_set(x_180, 1, x_178);
+return x_180;
 }
 }
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__1() {
+static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -27143,92 +28455,108 @@ x_1 = lean_mk_string("mkEquationsFor '");
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__2() {
+static lean_object* _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__1;
+x_1 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__1;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_23 = lean_st_ref_get(x_7, x_8);
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_24, 3);
+lean_inc(x_25);
+lean_dec(x_24);
+x_26 = lean_ctor_get_uint8(x_25, sizeof(void*)*1);
+lean_dec(x_25);
+if (x_26 == 0)
+{
+lean_object* x_27; uint8_t x_28; 
+x_27 = lean_ctor_get(x_23, 1);
+lean_inc(x_27);
+lean_dec(x_23);
+x_28 = 0;
+x_9 = x_28;
+x_10 = x_27;
+goto block_22;
+}
+else
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
+x_29 = lean_ctor_get(x_23, 1);
+lean_inc(x_29);
+lean_dec(x_23);
+lean_inc(x_3);
+x_30 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_3, x_4, x_5, x_6, x_7, x_29);
+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_33 = lean_unbox(x_31);
+lean_dec(x_31);
+x_9 = x_33;
+x_10 = x_32;
+goto block_22;
+}
+block_22:
+{
+if (x_9 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_box(0);
+x_12 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(x_1, x_2, x_3, x_11, x_4, x_5, x_6, x_7, x_10);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+lean_inc(x_1);
+x_13 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_13, 0, x_1);
+x_14 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__2;
+x_15 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_13);
+x_16 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
+x_17 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set(x_17, 1, x_16);
+lean_inc(x_3);
+x_18 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_3, x_17, x_4, x_5, x_6, x_7, x_10);
+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___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(x_1, x_2, x_3, x_19, x_4, x_5, x_6, x_7, x_20);
+lean_dec(x_19);
+return x_21;
+}
+}
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-lean_object* x_7; uint8_t x_8; lean_object* x_9; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_7 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__6;
-x_22 = lean_st_ref_get(x_5, x_6);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_23, 3);
-lean_inc(x_24);
-lean_dec(x_23);
-x_25 = lean_ctor_get_uint8(x_24, sizeof(void*)*1);
-lean_dec(x_24);
-if (x_25 == 0)
-{
-lean_object* x_26; uint8_t x_27; 
-x_26 = lean_ctor_get(x_22, 1);
-lean_inc(x_26);
-lean_dec(x_22);
-x_27 = 0;
-x_8 = x_27;
-x_9 = x_26;
-goto block_21;
-}
-else
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
-x_28 = lean_ctor_get(x_22, 1);
-lean_inc(x_28);
-lean_dec(x_22);
-x_29 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_2, x_3, x_4, x_5, x_28);
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
-lean_inc(x_31);
-lean_dec(x_29);
-x_32 = lean_unbox(x_30);
-lean_dec(x_30);
-x_8 = x_32;
-x_9 = x_31;
-goto block_21;
-}
-block_21:
-{
-if (x_8 == 0)
-{
-lean_object* x_10; lean_object* x_11; 
-x_10 = lean_box(0);
-x_11 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(x_1, x_7, x_10, x_2, x_3, x_4, x_5, x_9);
+x_8 = l_Lean_Meta_casesOnStuckLHS___closed__2;
+x_9 = lean_alloc_closure((void*)(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5), 8, 3);
+lean_closure_set(x_9, 0, x_1);
+lean_closure_set(x_9, 1, x_8);
+lean_closure_set(x_9, 2, x_7);
+x_10 = l_Lean_Meta_Match_proveCondEqThm___closed__7;
+x_11 = l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(x_10, x_8, x_9, x_2, x_3, x_4, x_5, x_6);
 return x_11;
 }
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-lean_inc(x_1);
-x_12 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_12, 0, x_1);
-x_13 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__2;
-x_14 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_12);
-x_15 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2;
-x_16 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_16, x_2, x_3, x_4, x_5, x_9);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
-lean_inc(x_19);
-lean_dec(x_17);
-x_20 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(x_1, x_7, x_18, x_2, x_3, x_4, x_5, x_19);
-lean_dec(x_18);
-return x_20;
-}
-}
-}
 }
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
@@ -27286,7 +28614,7 @@ lean_dec(x_1);
 return x_12;
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1___boxed(lean_object** _args) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1___boxed(lean_object** _args) {
 lean_object* x_1 = _args[0];
 lean_object* x_2 = _args[1];
 lean_object* x_3 = _args[2];
@@ -27314,16 +28642,17 @@ lean_object* x_24 = _args[23];
 _start:
 {
 size_t x_25; lean_object* x_26; 
-x_25 = lean_unbox_usize(x_6);
-lean_dec(x_6);
-x_26 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(x_1, x_2, x_3, x_4, x_5, x_25, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22, x_23, x_24);
-lean_dec(x_19);
-lean_dec(x_7);
+x_25 = lean_unbox_usize(x_18);
+lean_dec(x_18);
+x_26 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_25, x_19, x_20, x_21, x_22, x_23, x_24);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_2);
 lean_dec(x_1);
 return x_26;
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___boxed(lean_object** _args) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___boxed(lean_object** _args) {
 lean_object* x_1 = _args[0];
 lean_object* x_2 = _args[1];
 lean_object* x_3 = _args[2];
@@ -27347,28 +28676,21 @@ lean_object* x_20 = _args[19];
 lean_object* x_21 = _args[20];
 lean_object* x_22 = _args[21];
 lean_object* x_23 = _args[22];
+lean_object* x_24 = _args[23];
+lean_object* x_25 = _args[24];
+lean_object* x_26 = _args[25];
 _start:
 {
-lean_object* x_24; 
-x_24 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22, x_23);
-return x_24;
-}
-}
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
-_start:
-{
-lean_object* x_13; 
-x_13 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
+size_t x_27; lean_object* x_28; 
+x_27 = lean_unbox_usize(x_8);
 lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-return x_13;
+x_28 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_27, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22, x_23, x_24, x_25, x_26);
+lean_dec(x_21);
+lean_dec(x_20);
+return x_28;
 }
 }
-LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___boxed(lean_object** _args) {
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___boxed(lean_object** _args) {
 lean_object* x_1 = _args[0];
 lean_object* x_2 = _args[1];
 lean_object* x_3 = _args[2];
@@ -27390,17 +28712,65 @@ lean_object* x_18 = _args[17];
 lean_object* x_19 = _args[18];
 lean_object* x_20 = _args[19];
 lean_object* x_21 = _args[20];
+lean_object* x_22 = _args[21];
+lean_object* x_23 = _args[22];
+lean_object* x_24 = _args[23];
+lean_object* x_25 = _args[24];
 _start:
 {
-size_t x_22; size_t x_23; lean_object* x_24; 
-x_22 = lean_unbox_usize(x_14);
-lean_dec(x_14);
-x_23 = lean_unbox_usize(x_15);
-lean_dec(x_15);
-x_24 = l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_22, x_23, x_16, x_17, x_18, x_19, x_20, x_21);
-lean_dec(x_13);
+lean_object* x_26; 
+x_26 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22, x_23, x_24, x_25);
+return x_26;
+}
+}
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+lean_object* x_13; 
+x_13 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__4(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_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+return x_13;
+}
+}
+LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+lean_object* x_20 = _args[19];
+lean_object* x_21 = _args[20];
+lean_object* x_22 = _args[21];
+lean_object* x_23 = _args[22];
+lean_object* x_24 = _args[23];
+_start:
+{
+lean_object* x_25; 
+x_25 = l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21, x_22, x_23, x_24);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_8);
 lean_dec(x_3);
-return x_24;
+return x_25;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___boxed(lean_object** _args) {
@@ -27428,7 +28798,7 @@ _start:
 lean_object* x_20; 
 x_20 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
 lean_dec(x_14);
-lean_dec(x_9);
+lean_dec(x_10);
 lean_dec(x_1);
 return x_20;
 }
@@ -27461,13 +28831,38 @@ x_21 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___
 return x_21;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
 _start:
 {
-lean_object* x_9; 
-x_9 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec(x_3);
-return x_9;
+lean_object* x_18; 
+x_18 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_4);
+return x_10;
 }
 }
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_Match_getEquationsForImpl___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -27738,7 +29133,7 @@ lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_8122_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_8723_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -27806,14 +29201,14 @@ l_Lean_Meta_Match_unfoldNamedPattern___closed__1 = _init_l_Lean_Meta_Match_unfol
 lean_mark_persistent(l_Lean_Meta_Match_unfoldNamedPattern___closed__1);
 l_Lean_Meta_Match_unfoldNamedPattern___closed__2 = _init_l_Lean_Meta_Match_unfoldNamedPattern___closed__2();
 lean_mark_persistent(l_Lean_Meta_Match_unfoldNamedPattern___closed__2);
-l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__1 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__1);
-l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__2 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__2);
-l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__3 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__3();
-lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__3);
-l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__4 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__4();
-lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__3___closed__4);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__1);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__2 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__2);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__3 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__3();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__3);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__4 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__4();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___lambda__4___closed__4);
 l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__1 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__1);
 l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__2 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__2();
@@ -27830,6 +29225,14 @@ l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__7 = _init_l_Lean_Meta_M
 lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__7);
 l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__8 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__8();
 lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__8);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__9 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__9();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__9);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__10 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__10();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__10);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__11 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__11();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__11);
+l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12 = _init_l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12();
+lean_mark_persistent(l_Lean_Meta_Match_forallAltTelescope_go___rarg___closed__12);
 l_Lean_Meta_Match_SimpH_State_eqsNew___default = _init_l_Lean_Meta_Match_SimpH_State_eqsNew___default();
 lean_mark_persistent(l_Lean_Meta_Match_SimpH_State_eqsNew___default);
 l_panic___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___spec__1___closed__1 = _init_l_panic___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_substRHS___spec__1___closed__1();
@@ -27870,10 +29273,6 @@ l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__7);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__8 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__8();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__8);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__9 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__9();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__9);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___lambda__3___closed__10);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__1 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__1);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__2();
@@ -27888,34 +29287,42 @@ l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2___closed__1);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_substSomeVar___lambda__2___closed__2);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__1 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__1);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__2 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__2);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__3 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__3();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__3);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__4 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__4();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__4);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__5 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__5();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__5);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__6 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__6();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__6);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__7 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__7();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__7);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__8 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__8();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__8);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__9 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__9();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__9);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__10 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__10();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__10);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__11 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__11();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__11);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__12);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__13 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__13();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__13);
+l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__14 = _init_l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__14();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___lambda__2___closed__14);
 l_Lean_Meta_Match_proveCondEqThm_go___closed__1 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__1);
 l_Lean_Meta_Match_proveCondEqThm_go___closed__2 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__2();
 lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__2);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__3 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__3();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__3);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__4 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__4();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__4);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__5 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__5();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__5);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__6 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__6();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__6);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__7 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__7();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__7);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__8 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__8();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__8);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__9 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__9();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__9);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__10 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__10();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__10);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__11 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__11();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__11);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__12 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__12();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__12);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__13 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__13();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__13);
-l_Lean_Meta_Match_proveCondEqThm_go___closed__14 = _init_l_Lean_Meta_Match_proveCondEqThm_go___closed__14();
-lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm_go___closed__14);
+l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__1 = _init_l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__1);
+l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__2 = _init_l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm___lambda__3___closed__2);
 l_Lean_Meta_Match_proveCondEqThm___closed__1 = _init_l_Lean_Meta_Match_proveCondEqThm___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_proveCondEqThm___closed__1);
 l_Lean_Meta_Match_proveCondEqThm___closed__2 = _init_l_Lean_Meta_Match_proveCondEqThm___closed__2();
@@ -28016,18 +29423,18 @@ l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__1);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof___closed__2);
-l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__1 = _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__1();
-lean_mark_persistent(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__1);
-l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__2 = _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__2();
-lean_mark_persistent(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__2___closed__2);
-l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1 = _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1();
-lean_mark_persistent(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1);
-l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2 = _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2();
-lean_mark_persistent(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2);
-l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3 = _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3();
-lean_mark_persistent(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3);
-l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4 = _init_l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4();
-lean_mark_persistent(l_Subarray_forInUnsafe_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4);
+l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__1 = _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__1();
+lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__1);
+l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__2 = _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__2();
+lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___lambda__3___closed__2);
+l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1 = _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1();
+lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__1);
+l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2 = _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2();
+lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__2);
+l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3 = _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3();
+lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__3);
+l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4 = _init_l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4();
+lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___spec__5___closed__4);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__1 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__1);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__1___closed__2();
@@ -28036,16 +29443,6 @@ l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda_
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__2___closed__1);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__2___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__2___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__2___closed__2);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__1 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__1();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__1);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__2();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__2);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__3 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__3();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__3);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__4 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__4();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__4);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__5 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__5();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__3___closed__5);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__1 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__1);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__2();
@@ -28054,15 +29451,15 @@ l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda_
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__3);
 l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4();
 lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__4___closed__4);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__1 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__1();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__1);
-l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__2();
-lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___closed__2);
+l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__1 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__1);
+l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__2 = _init_l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__2();
+lean_mark_persistent(l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkEquationsFor___lambda__5___closed__2);
 l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___closed__1 = _init_l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___closed__1();
 l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___closed__2 = _init_l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___closed__2();
 l_Lean_Meta_Match_getEquationsForImpl___closed__1 = _init_l_Lean_Meta_Match_getEquationsForImpl___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_getEquationsForImpl___closed__1);
-res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_8122_(lean_io_mk_world());
+res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_8723_(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/Match/MatcherInfo.c b/stage0/stdlib/Lean/Meta/Match/MatcherInfo.c
index 3a0c79cad5..c647893a30 100644
--- a/stage0/stdlib/Lean/Meta/Match/MatcherInfo.c
+++ b/stage0/stdlib/Lean/Meta/Match/MatcherInfo.c
@@ -13,6 +13,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__3;
+static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__5;
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_getMatcherInfo_x3f___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__7;
@@ -24,6 +26,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_arity___boxed(lean_object
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_Match_getNumEqsFromDiscrInfos___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcherCore___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcherAppCore_x3f(lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
@@ -48,6 +51,7 @@ size_t lean_usize_shift_right(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_Meta_Match_Extension_State_switch___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_getMatcherInfo_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SMap_insert___at_Lean_Meta_Match_Extension_State_addEntry___spec__1(lean_object*, lean_object*, lean_object*);
+uint8_t lean_usize_dec_lt(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getFirstDiscrPos___boxed(lean_object*);
 extern lean_object* l_Lean_levelZero;
 lean_object* lean_nat_add(lean_object*, lean_object*);
@@ -55,10 +59,10 @@ lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg(lean_object*, le
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getFirstAltPos___boxed(lean_object*);
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 size_t lean_uint64_to_usize(uint64_t);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__2(lean_object*, size_t, size_t, lean_object*);
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SMap_find_x3f___at_Lean_Meta_Match_Extension_getMatcherInfo_x3f___spec__1(lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__3(lean_object*, size_t, size_t, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__3;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
@@ -70,7 +74,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_State_addEntry(lean_object*
 static lean_object* l_Lean_Meta_Match_Extension_instInhabitedState___closed__1;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_isMatcherAppCore(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__1;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -90,14 +93,11 @@ static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__8;
 size_t lean_usize_shift_left(size_t, size_t);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_InfoCacheKey_instHashableInfoCacheKey___boxed(lean_object*);
-static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__2;
-LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr;
-static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__6;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_addMatcherInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
 uint8_t l_Lean_Expr_isConst(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_instInhabitedDiscrInfo;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_addMatcherInfo(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getMotivePos___boxed(lean_object*);
 size_t lean_usize_mul(size_t, size_t);
@@ -111,9 +111,11 @@ LEAN_EXPORT lean_object* l_Lean_Meta_matchMatcherApp_x3f___rarg(lean_object*, le
 lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
 size_t lean_usize_land(size_t, size_t);
 lean_object* l_Lean_SimplePersistentEnvExtension_getState___rarg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__4;
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_getNumEqsFromDiscrInfos(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_addMatcherInfo___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_Match_Extension_State_addEntry___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getNumDiscrEqs___boxed(lean_object*);
 static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__4;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_Match_Extension_getMatcherInfo_x3f___spec__2(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__3;
@@ -124,17 +126,19 @@ LEAN_EXPORT lean_object* l_Lean_Meta_matchMatcherApp_x3f(lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMap_insert___at_Lean_Meta_Match_Extension_State_addEntry___spec__6(lean_object*, lean_object*, lean_object*);
 lean_object* lean_list_to_array(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308_(lean_object*);
 static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__9;
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcherApp___rarg(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__1;
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_Match_getNumEqsFromDiscrInfos___spec__1(lean_object*, size_t, size_t, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t lean_usize_dec_le(size_t, size_t);
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 static size_t l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__2;
 static size_t l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_getNumEqsFromDiscrInfos___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_toExpr(lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____lambda__1(lean_object*);
+static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__4;
 LEAN_EXPORT lean_object* l_Lean_Meta_getMatcherInfoCore_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_instInhabitedState;
 LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at_Lean_Meta_Match_Extension_State_addEntry___spec__8(lean_object*, lean_object*);
@@ -145,10 +149,10 @@ lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__6;
-static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__3;
 static lean_object* l_Lean_Meta_Match_addMatcherInfo___closed__5;
 lean_object* l_instHashableProd___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_arity(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getNumDiscrEqs(lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcherAppCore___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_instBEqExpr;
@@ -157,24 +161,45 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getFirstAltPos(lean_objec
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_Match_Extension_State_map___default___spec__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Meta_Match_Extension_getMatcherInfo_x3f___spec__6(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Extension_State_map___default___closed__3;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_DiscrInfo_hName_x3f___default;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_Extension_getMatcherInfo_x3f___spec__3(lean_object*, size_t, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__2(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcherApp___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__2;
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____lambda__1(lean_object*);
 lean_object* l_Lean_Expr_getAppFn(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_numAlts(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_getMatcherInfo_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Meta_Match_Extension_State_addEntry___spec__10(lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__6;
 lean_object* l_Lean_Expr_constName_x21(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__1(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__5;
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Meta_Match_Extension_getMatcherInfo_x3f___spec__6___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_Match_Extension_getMatcherInfo_x3f___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__3(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcher___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+static lean_object* _init_l_Lean_Meta_Match_DiscrInfo_hName_x3f___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Match_instInhabitedDiscrInfo() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_numAlts(lean_object* x_1) {
 _start:
 {
@@ -278,6 +303,96 @@ lean_dec(x_1);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_Match_getNumEqsFromDiscrInfos___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 = lean_usize_dec_lt(x_3, x_2);
+if (x_5 == 0)
+{
+return x_4;
+}
+else
+{
+lean_object* x_6; 
+x_6 = lean_array_uget(x_1, x_3);
+if (lean_obj_tag(x_6) == 0)
+{
+size_t x_7; size_t x_8; 
+x_7 = 1;
+x_8 = lean_usize_add(x_3, x_7);
+x_3 = x_8;
+goto _start;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; size_t x_12; size_t x_13; 
+lean_dec(x_6);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_4, x_10);
+lean_dec(x_4);
+x_12 = 1;
+x_13 = lean_usize_add(x_3, x_12);
+x_3 = x_13;
+x_4 = x_11;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_getNumEqsFromDiscrInfos(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; size_t x_3; size_t x_4; lean_object* x_5; lean_object* x_6; 
+x_2 = lean_array_get_size(x_1);
+x_3 = lean_usize_of_nat(x_2);
+lean_dec(x_2);
+x_4 = 0;
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Array_forInUnsafe_loop___at_Lean_Meta_Match_getNumEqsFromDiscrInfos___spec__1(x_1, x_3, x_4, x_5);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_Match_getNumEqsFromDiscrInfos___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_forInUnsafe_loop___at_Lean_Meta_Match_getNumEqsFromDiscrInfos___spec__1(x_1, x_5, x_6, x_4);
+lean_dec(x_1);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_getNumEqsFromDiscrInfos___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Meta_Match_getNumEqsFromDiscrInfos(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getNumDiscrEqs(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_ctor_get(x_1, 4);
+x_3 = l_Lean_Meta_Match_getNumEqsFromDiscrInfos(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_MatcherInfo_getNumDiscrEqs___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Meta_Match_MatcherInfo_getNumDiscrEqs(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_Match_Extension_State_map___default___spec__1(lean_object* x_1) {
 _start:
 {
@@ -1416,7 +1531,7 @@ x_2 = l_Lean_SMap_switch___at_Lean_Meta_Match_Extension_State_switch___spec__1(x
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -1438,7 +1553,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -1476,7 +1591,7 @@ size_t x_15; size_t x_16; lean_object* x_17;
 x_15 = 0;
 x_16 = lean_usize_of_nat(x_7);
 lean_dec(x_7);
-x_17 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__2(x_6, x_15, x_16, x_4);
+x_17 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__2(x_6, x_15, x_16, x_4);
 lean_dec(x_6);
 x_2 = x_11;
 x_4 = x_17;
@@ -1490,7 +1605,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -1519,24 +1634,24 @@ size_t x_7; size_t x_8; lean_object* x_9;
 x_7 = 0;
 x_8 = lean_usize_of_nat(x_3);
 lean_dec(x_3);
-x_9 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__3(x_2, x_7, x_8, x_1);
+x_9 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__3(x_2, x_7, x_8, x_1);
 lean_dec(x_2);
 return x_9;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____lambda__1(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____lambda__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_2 = l_Lean_Meta_Match_Extension_instInhabitedState___closed__2;
-x_3 = l_Lean_mkStateFromImportedEntries___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__1(x_2, x_1);
+x_3 = l_Lean_mkStateFromImportedEntries___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__1(x_2, x_1);
 x_4 = l_Lean_SMap_switch___at_Lean_Meta_Match_Extension_State_switch___spec__1(x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__1() {
+static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -1544,17 +1659,17 @@ x_1 = lean_mk_string("matcher");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__2() {
+static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__1;
+x_2 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__3() {
+static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -1563,7 +1678,7 @@ lean_closure_set(x_1, 0, lean_box(0));
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__4() {
+static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -1571,22 +1686,22 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Meta_Match_Extension_State_addEntry), 2,
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__5() {
+static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__5() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____lambda__1), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____lambda__1), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__6() {
+static lean_object* _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__2;
-x_2 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__4;
-x_3 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__5;
-x_4 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__3;
+x_1 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__2;
+x_2 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__4;
+x_3 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__5;
+x_4 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__3;
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -1595,16 +1710,16 @@ lean_ctor_set(x_5, 3, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__6;
+x_2 = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__6;
 x_3 = l_Lean_registerSimplePersistentEnvExtension___rarg(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -1612,12 +1727,12 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__2(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__2(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -1625,7 +1740,7 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____spec__3(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____spec__3(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
@@ -2851,6 +2966,10 @@ lean_dec_ref(res);
 res = initialize_Lean_Meta_Basic(builtin, lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Meta_Match_DiscrInfo_hName_x3f___default = _init_l_Lean_Meta_Match_DiscrInfo_hName_x3f___default();
+lean_mark_persistent(l_Lean_Meta_Match_DiscrInfo_hName_x3f___default);
+l_Lean_Meta_Match_instInhabitedDiscrInfo = _init_l_Lean_Meta_Match_instInhabitedDiscrInfo();
+lean_mark_persistent(l_Lean_Meta_Match_instInhabitedDiscrInfo);
 l_Lean_Meta_Match_Extension_State_map___default___closed__1 = _init_l_Lean_Meta_Match_Extension_State_map___default___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_Extension_State_map___default___closed__1);
 l_Lean_Meta_Match_Extension_State_map___default___closed__2 = _init_l_Lean_Meta_Match_Extension_State_map___default___closed__2();
@@ -2869,19 +2988,19 @@ l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry_
 l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__2 = _init_l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__2();
 l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__3 = _init_l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__3();
 lean_mark_persistent(l_Std_PersistentHashMap_insertAux___at_Lean_Meta_Match_Extension_State_addEntry___spec__3___closed__3);
-l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__1 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__1);
-l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__2 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__2);
-l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__3 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__3();
-lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__3);
-l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__4 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__4();
-lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__4);
-l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__5 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__5();
-lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__5);
-l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__6 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__6();
-lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177____closed__6);
-if (builtin) {res = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_177_(lean_io_mk_world());
+l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__1 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__1();
+lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__1);
+l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__2 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__2();
+lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__2);
+l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__3 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__3();
+lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__3);
+l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__4 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__4();
+lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__4);
+l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__5 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__5();
+lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__5);
+l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__6 = _init_l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__6();
+lean_mark_persistent(l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308____closed__6);
+if (builtin) {res = l_Lean_Meta_Match_Extension_initFn____x40_Lean_Meta_Match_MatcherInfo___hyg_308_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Meta_Match_Extension_extension = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Meta_Match_Extension_extension);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
index aa555bd075..da83fad75b 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
@@ -76,7 +76,6 @@ lean_object* lean_environment_find(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_addSimpTheorem(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfo___at_Lean_Meta_mkConstWithFreshMVarLevels___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_SimpTheorem_keys___default___closed__1;
-static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__1;
 LEAN_EXPORT uint8_t l_Lean_Meta_instBEqSimpTheorem(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_SimpTheoremsArray_isDeclToUnfold(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -97,8 +96,6 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__36;
 uint8_t l_Lean_Expr_isApp(lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Meta_addSimpTheoremEntry___spec__12(lean_object*, lean_object*, size_t, size_t);
-static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2;
-static lean_object* l_Lean_Meta_isRflProof___closed__4;
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___closed__2;
 lean_object* l_Lean_Expr_appFn_x21(lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__26;
@@ -122,7 +119,6 @@ static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__17;
 static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Meta_SimpTheoremsArray_isDeclToUnfold___spec__1(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_shift_right(size_t, size_t);
@@ -151,6 +147,7 @@ static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremsFromConst___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremsFromConst___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_erase(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__24;
@@ -163,10 +160,10 @@ LEAN_EXPORT uint8_t l_Std_PersistentHashMap_contains___at_Lean_Meta_SimpTheorems
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__37;
 LEAN_EXPORT lean_object* l_Std_HashMap_insert___at_Lean_Meta_registerSimpAttr___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getAttrParamOptPrio(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_isRflProof___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__3___closed__12;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorem_keys___default;
 lean_object* l_Lean_ConstantInfo_levelParams(lean_object*);
+static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__4;
 static lean_object* l_Lean_Meta_instInhabitedSimpTheorems___closed__1;
 static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__19;
 LEAN_EXPORT lean_object* l_Lean_Meta_isRflTheorem(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -195,9 +192,9 @@ static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems___
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__1___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_createNodes___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Meta_addSimpTheoremEntry___spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_isRflProof___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_add_getName_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___closed__3;
+static lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold___closed__1;
 LEAN_EXPORT uint8_t l_Lean_Meta_SimpTheorems_isLemma(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore___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_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -208,10 +205,8 @@ LEAN_EXPORT lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_addSimp
 LEAN_EXPORT lean_object* l_Lean_Meta_simpExtension;
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore___lambda__2___closed__1;
 static size_t l_Std_PersistentHashMap_findAux___at_Lean_Meta_addSimpTheoremEntry___spec__3___closed__1;
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517____spec__1___boxed(lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__20;
-lean_object* l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_instToFormatSimpTheorem___closed__6;
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore___lambda__2___closed__2;
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_mkSimpTheorems___spec__1(lean_object*, uint8_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -238,7 +233,6 @@ static lean_object* l_Lean_Meta_SimpTheorem_getName___closed__2;
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_mkSimpExt___lambda__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517____spec__1(lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteNameMk(lean_object*);
 extern lean_object* l_Lean_Expr_instHashableExpr;
@@ -247,6 +241,7 @@ static lean_object* l_Lean_Meta_commandRegister__simp__attr_________closed__1;
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__2___closed__2;
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___closed__5;
+static lean_object* l_Lean_Meta_commandRegister__simp__attr_________closed__17;
 lean_object* l_Array_back___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_SimpTheorems_toUnfoldThms___default___closed__1;
 uint8_t l_Lean_ConstantInfo_hasValue(lean_object*);
@@ -259,7 +254,6 @@ static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems___
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_erase___at_Lean_Meta_mkSimpAttr___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__20;
 uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2___closed__1;
 static lean_object* l_Lean_Meta_isRflProofCore___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_isPerm___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_isRflProofCore___closed__2;
@@ -272,17 +266,17 @@ lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_
 uint8_t l_Lean_Expr_isConst(lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 static lean_object* l_Lean_Meta_instToFormatSimpTheorem___closed__5;
+static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__5;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_isDeclToUnfold___boxed(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isConstOf(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpExtension_getTheorems___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524_(lean_object*);
 size_t lean_usize_mul(size_t, size_t);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__23;
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__3___closed__9;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_eraseCore(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isForall(lean_object*);
-static lean_object* l_Lean_Meta_isRflProof___closed__5;
 LEAN_EXPORT lean_object* l_Array_contains___at_Lean_Meta_addSimpTheoremEntry___spec__11___boxed(lean_object*, lean_object*);
 lean_object* lean_whnf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAtAux___at_Lean_Meta_SimpTheorems_erase___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -304,6 +298,7 @@ lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Meta_SimpTheoremsArray_isErased___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__34;
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429____spec__1(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___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* l_Lean_ScopedEnvExtension_getState___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_mkSimpExt(lean_object*, lean_object*);
@@ -322,13 +317,11 @@ LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Meta_Tactic_Simp_SimpTh
 LEAN_EXPORT lean_object* l_Lean_Meta_mkSimpAttr___lambda__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_erased___default;
-lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkTypeIsProp___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__3___closed__4;
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__30;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorem_getValue(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_isRflProof___closed__7;
 lean_object* l_String_intercalate(lean_object*, lean_object*);
 lean_object* l_List_redLength___rarg(lean_object*);
 static lean_object* l_Lean_Meta_commandRegister__simp__attr_________closed__16;
@@ -360,17 +353,14 @@ LEAN_EXPORT lean_object* l_Lean_Meta_registerSimpAttr(lean_object*, lean_object*
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___closed__10;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_isPerm___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorem_name_x3f___default;
-static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__5;
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__2___closed__3;
 static lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___at_Lean_Meta_addSimpTheoremEntry___spec__9___closed__1;
-static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__3;
 static lean_object* l_Lean_Meta_SimpTheorems_pre___default___closed__1;
 static lean_object* l_Lean_Meta_mkSimpExt___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_erase___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__1;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_addSimpTheoremEntry___spec__3(lean_object*, size_t, lean_object*);
-static lean_object* l_Lean_Meta_isRflProof___closed__3;
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__29;
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__2;
 lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_SynthInstance_removeUnusedArguments_x3f___spec__2___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -379,6 +369,7 @@ static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_
 static lean_object* l_Lean_ScopedEnvExtension_add___at_Lean_Meta_addSimpTheorem___spec__1___closed__5;
 static lean_object* l_Lean_Meta_mkSimpExt___closed__2;
 uint8_t l_Lean_Meta_DiscrTree_Key_lt(lean_object*, lean_object*);
+static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_SimpTheoremsArray_eraseTheorem___spec__1(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__3___closed__1;
 lean_object* l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(lean_object*, lean_object*);
@@ -405,6 +396,7 @@ static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__15;
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__45;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_isRflTheorem___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3;
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Meta_SimpTheoremsArray_isDeclToUnfold___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
@@ -412,7 +404,6 @@ static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_
 lean_object* lean_infer_type(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__5;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_isRflProof___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, 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_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_addSimpTheorem___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*);
 static lean_object* l_Lean_Meta_DiscrTree_insertCore___at_Lean_Meta_addSimpTheoremEntry___spec__1___closed__2;
@@ -452,7 +443,6 @@ static lean_object* l_Lean_ScopedEnvExtension_add___at_Lean_Meta_addSimpTheorem_
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_openAbstractMVarsResult___spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__19;
 LEAN_EXPORT uint8_t l_Std_AssocList_contains___at_Lean_Meta_registerSimpAttr___spec__2(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__4;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocessProof___spec__1(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremsFromConst(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
@@ -485,7 +475,6 @@ static lean_object* l_Lean_Meta_registerSimpAttr___closed__1;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_addSimpTheoremEntry___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_SimpTheorem_getValue___closed__3;
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_addSimpTheoremEntry___spec__6___closed__1;
-static lean_object* l_Lean_Meta_isRflProof___closed__6;
 static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__12;
 LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Meta_registerSimpAttr___spec__5(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_mkSimpTheorems___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*);
@@ -495,7 +484,6 @@ uint8_t l_List_isEmpty___rarg(lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__2;
 static lean_object* l_Lean_Meta_commandRegister__simp__attr_________closed__6;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_isRflProof___closed__2;
 static lean_object* l_Lean_Meta_instInhabitedSimpTheorem___closed__3;
 LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_addSimpTheorem___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -511,6 +499,7 @@ lean_object* l_Lean_Meta_isProp(lean_object*, lean_object*, lean_object*, lean_o
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremCore(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
+static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_addSimpTheoremEntry(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ScopedEnvExtension_add___at_Lean_Meta_addSimpTheorem___spec__1(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -541,7 +530,6 @@ static lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_inser
 LEAN_EXPORT lean_object* l_Lean_Meta_instInhabitedSimpEntry;
 static lean_object* l_Lean_Meta_instInhabitedSimpEntry___closed__1;
 static lean_object* l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___closed__4;
-static lean_object* l_Lean_Meta_isRflProof___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Meta_mkSimpAttr___lambda__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instInhabitedTrie(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_shouldPreprocess___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -564,6 +552,7 @@ lean_object* l_Lean_Meta_getFVarLocalDecl(lean_object*, lean_object*, lean_objec
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__38;
 LEAN_EXPORT lean_object* l_Lean_Meta_commandRegister__simp__attr______;
 static lean_object* l_Lean_Meta_mkSimpAttr___lambda__1___closed__3;
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429____spec__1___boxed(lean_object*);
 static lean_object* _init_l_Lean_Meta_SimpTheorem_keys___default___closed__1() {
 _start:
 {
@@ -1221,222 +1210,65 @@ lean_dec(x_2);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_isRflProof___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Meta_isRflProof(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 if (lean_obj_tag(x_1) == 4)
 {
-lean_object* x_8; lean_object* x_9; 
-lean_dec(x_4);
+lean_object* x_7; lean_object* x_8; 
 lean_dec(x_3);
-x_8 = lean_ctor_get(x_1, 0);
-lean_inc(x_8);
+lean_dec(x_2);
+x_7 = lean_ctor_get(x_1, 0);
+lean_inc(x_7);
 lean_dec(x_1);
-x_9 = l_Lean_Meta_isRflTheorem(x_8, x_5, x_6, x_7);
+x_8 = l_Lean_Meta_isRflTheorem(x_7, x_4, x_5, x_6);
+return x_8;
+}
+else
+{
+lean_object* x_9; 
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_1);
+x_9 = lean_infer_type(x_1, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_9) == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
+lean_inc(x_11);
+lean_dec(x_9);
+x_12 = l_Lean_Meta_isRflProofCore(x_10, x_1, x_4, x_5, x_11);
+return x_12;
+}
+else
+{
+uint8_t x_13; 
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_13 = !lean_is_exclusive(x_9);
+if (x_13 == 0)
+{
 return x_9;
 }
 else
 {
-lean_object* x_10; 
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_1);
-x_10 = lean_infer_type(x_1, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_10) == 0)
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = l_Lean_Meta_isRflProofCore(x_11, x_1, x_5, x_6, x_12);
-return x_13;
-}
-else
-{
-uint8_t x_14; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_1);
-x_14 = !lean_is_exclusive(x_10);
-if (x_14 == 0)
-{
-return x_10;
-}
-else
-{
-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_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_inc(x_15);
-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;
-}
-}
-}
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("Meta");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Meta_isRflProof___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__3() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("debug");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_isRflProof___closed__2;
-x_2 = l_Lean_Meta_isRflProof___closed__3;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__5() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("isRflProof: ");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_isRflProof___closed__5;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__7() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_isRflProof___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_isRflProof___closed__7;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_isRflProof(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; uint8_t x_8; lean_object* x_9; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_7 = l_Lean_Meta_isRflProof___closed__4;
-x_22 = lean_st_ref_get(x_5, x_6);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_23, 3);
-lean_inc(x_24);
-lean_dec(x_23);
-x_25 = lean_ctor_get_uint8(x_24, sizeof(void*)*1);
-lean_dec(x_24);
-if (x_25 == 0)
-{
-lean_object* x_26; uint8_t x_27; 
-x_26 = lean_ctor_get(x_22, 1);
-lean_inc(x_26);
-lean_dec(x_22);
-x_27 = 0;
-x_8 = x_27;
-x_9 = x_26;
-goto block_21;
-}
-else
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
-x_28 = lean_ctor_get(x_22, 1);
-lean_inc(x_28);
-lean_dec(x_22);
-x_29 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_Basic_0__Lean_Meta_processPostponedStep___spec__14(x_7, x_2, x_3, x_4, x_5, x_28);
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
-lean_inc(x_31);
-lean_dec(x_29);
-x_32 = lean_unbox(x_30);
-lean_dec(x_30);
-x_8 = x_32;
-x_9 = x_31;
-goto block_21;
-}
-block_21:
-{
-if (x_8 == 0)
-{
-lean_object* x_10; lean_object* x_11; 
-x_10 = lean_box(0);
-x_11 = l_Lean_Meta_isRflProof___lambda__1(x_1, x_10, x_2, x_3, x_4, x_5, x_9);
-return x_11;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-lean_inc(x_1);
-x_12 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_12, 0, x_1);
-x_13 = l_Lean_Meta_isRflProof___closed__6;
-x_14 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_12);
-x_15 = l_Lean_Meta_isRflProof___closed__8;
-x_16 = lean_alloc_ctor(10, 2, 0);
+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);
-x_17 = l_Lean_addTrace___at_Lean_Meta_processPostponed_loop___spec__1(x_7, x_16, x_2, x_3, x_4, x_5, x_9);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
-lean_inc(x_19);
-lean_dec(x_17);
-x_20 = l_Lean_Meta_isRflProof___lambda__1(x_1, x_18, x_2, x_3, x_4, x_5, x_19);
-lean_dec(x_18);
-return x_20;
+return x_16;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_isRflProof___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; 
-x_8 = l_Lean_Meta_isRflProof___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_2);
-return x_8;
-}
 }
 static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__1() {
 _start:
@@ -1459,14 +1291,22 @@ return x_2;
 static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__3() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string("");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__4() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_isRflProof___closed__7;
+x_1 = l_Lean_Meta_instToFormatSimpTheorem___closed__3;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__4() {
+static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -1474,11 +1314,11 @@ x_1 = lean_mk_string(":perm");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__5() {
+static lean_object* _init_l_Lean_Meta_instToFormatSimpTheorem___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_instToFormatSimpTheorem___closed__4;
+x_1 = l_Lean_Meta_instToFormatSimpTheorem___closed__5;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -1504,7 +1344,7 @@ x_10 = l_Lean_Meta_instToFormatSimpTheorem___closed__2;
 x_11 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_11, 0, x_10);
 lean_ctor_set(x_11, 1, x_9);
-x_12 = l_Lean_Meta_instToFormatSimpTheorem___closed__3;
+x_12 = l_Lean_Meta_instToFormatSimpTheorem___closed__4;
 x_13 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_13, 0, x_11);
 lean_ctor_set(x_13, 1, x_12);
@@ -1522,7 +1362,7 @@ return x_15;
 else
 {
 lean_object* x_16; lean_object* x_17; 
-x_16 = l_Lean_Meta_instToFormatSimpTheorem___closed__5;
+x_16 = l_Lean_Meta_instToFormatSimpTheorem___closed__6;
 x_17 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_17, 0, x_14);
 lean_ctor_set(x_17, 1, x_16);
@@ -1550,7 +1390,7 @@ x_10 = l_Lean_Meta_instToFormatSimpTheorem___closed__2;
 x_11 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_11, 0, x_10);
 lean_ctor_set(x_11, 1, x_9);
-x_12 = l_Lean_Meta_instToFormatSimpTheorem___closed__3;
+x_12 = l_Lean_Meta_instToFormatSimpTheorem___closed__4;
 x_13 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_13, 0, x_11);
 lean_ctor_set(x_13, 1, x_12);
@@ -1570,7 +1410,7 @@ return x_16;
 else
 {
 lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_17 = l_Lean_Meta_instToFormatSimpTheorem___closed__5;
+x_17 = l_Lean_Meta_instToFormatSimpTheorem___closed__6;
 x_18 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_18, 0, x_14);
 lean_ctor_set(x_18, 1, x_17);
@@ -4733,6 +4573,15 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_instToFormatSimpTheorem___closed__3;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite(lean_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:
 {
@@ -4805,7 +4654,7 @@ x_21 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewri
 x_22 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_22, 0, x_21);
 lean_ctor_set(x_22, 1, x_20);
-x_23 = l_Lean_Meta_isRflProof___closed__8;
+x_23 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3;
 x_24 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_24, 0, x_22);
 lean_ctor_set(x_24, 1, x_23);
@@ -4909,7 +4758,7 @@ x_42 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewri
 x_43 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_43, 0, x_42);
 lean_ctor_set(x_43, 1, x_41);
-x_44 = l_Lean_Meta_isRflProof___closed__8;
+x_44 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3;
 x_45 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_45, 0, x_43);
 lean_ctor_set(x_45, 1, x_44);
@@ -7797,7 +7646,7 @@ x_12 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkTypeIsPr
 x_13 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_13, 0, x_12);
 lean_ctor_set(x_13, 1, x_11);
-x_14 = l_Lean_Meta_isRflProof___closed__8;
+x_14 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___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);
@@ -8094,7 +7943,7 @@ x_38 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheorem
 x_39 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_39, 0, x_38);
 lean_ctor_set(x_39, 1, x_37);
-x_40 = l_Lean_Meta_isRflProof___closed__8;
+x_40 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3;
 x_41 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_41, 0, x_39);
 lean_ctor_set(x_41, 1, x_40);
@@ -8297,7 +8146,7 @@ x_77 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheorem
 x_78 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_78, 0, x_77);
 lean_ctor_set(x_78, 1, x_76);
-x_79 = l_Lean_Meta_isRflProof___closed__8;
+x_79 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3;
 x_80 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_80, 0, x_78);
 lean_ctor_set(x_80, 1, x_79);
@@ -8601,7 +8450,7 @@ x_144 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheore
 x_145 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_145, 0, x_144);
 lean_ctor_set(x_145, 1, x_143);
-x_146 = l_Lean_Meta_isRflProof___closed__8;
+x_146 = l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3;
 x_147 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_147, 0, x_145);
 lean_ctor_set(x_147, 1, x_146);
@@ -12368,7 +12217,7 @@ x_7 = l_Lean_registerSimpleScopedEnvExtension___rarg(x_6, x_2);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517____spec__1(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429____spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -12376,7 +12225,7 @@ x_2 = l_Std_mkHashMapImp___rarg(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -12403,11 +12252,11 @@ return x_8;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517____spec__1___boxed(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429____spec__1___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517____spec__1(x_1);
+x_2 = l_Std_mkHashMap___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429____spec__1(x_1);
 lean_dec(x_1);
 return x_2;
 }
@@ -12855,7 +12704,7 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__1() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -12863,17 +12712,17 @@ x_1 = lean_mk_string("simp");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__1;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__3() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -12881,17 +12730,17 @@ x_1 = lean_mk_string("Ext");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__4() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2;
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__3;
+x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__3;
 x_3 = lean_name_append_after(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__5() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -12899,13 +12748,13 @@ x_1 = lean_mk_string("simplification theorem");
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2;
-x_3 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__5;
-x_4 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__4;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2;
+x_3 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__5;
+x_4 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__4;
 x_5 = l_Lean_Meta_registerSimpAttr(x_2, x_3, x_4, x_1);
 return x_5;
 }
@@ -14839,7 +14688,7 @@ lean_ctor_set(x_8, 1, x_7);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2___closed__1() {
+static lean_object* _init_l_Lean_Meta_SimpTheorems_addDeclToUnfold___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -14847,7 +14696,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Meta_SimpTheorems_addDeclToUnfold___lamb
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold(lean_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; 
@@ -14856,8 +14705,8 @@ lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_1);
-x_9 = l_Lean_Meta_getEqnsFor_x3f(x_1, x_8, x_3, x_4, x_5, x_6, x_7);
+lean_inc(x_2);
+x_9 = l_Lean_Meta_getEqnsFor_x3f(x_2, x_8, x_3, x_4, x_5, x_6, x_7);
 if (lean_obj_tag(x_9) == 0)
 {
 lean_object* x_10; 
@@ -14876,7 +14725,7 @@ if (x_11 == 0)
 lean_object* x_12; lean_object* x_13; 
 x_12 = lean_ctor_get(x_9, 0);
 lean_dec(x_12);
-x_13 = l_Lean_Meta_SimpTheorems_addDeclToUnfoldCore(x_2, x_1);
+x_13 = l_Lean_Meta_SimpTheorems_addDeclToUnfoldCore(x_1, x_2);
 lean_ctor_set(x_9, 0, x_13);
 return x_9;
 }
@@ -14886,7 +14735,7 @@ lean_object* x_14; lean_object* x_15; lean_object* x_16;
 x_14 = lean_ctor_get(x_9, 1);
 lean_inc(x_14);
 lean_dec(x_9);
-x_15 = l_Lean_Meta_SimpTheorems_addDeclToUnfoldCore(x_2, x_1);
+x_15 = l_Lean_Meta_SimpTheorems_addDeclToUnfoldCore(x_1, x_2);
 x_16 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_16, 0, x_15);
 lean_ctor_set(x_16, 1, x_14);
@@ -14910,7 +14759,7 @@ lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_22 = l_Array_forInUnsafe_loop___at_Lean_Meta_SimpTheorems_addDeclToUnfold___spec__1(x_18, x_20, x_21, x_2, x_3, x_4, x_5, x_6, x_17);
+x_22 = l_Array_forInUnsafe_loop___at_Lean_Meta_SimpTheorems_addDeclToUnfold___spec__1(x_18, x_20, x_21, x_1, x_3, x_4, x_5, x_6, x_17);
 lean_dec(x_18);
 if (lean_obj_tag(x_22) == 0)
 {
@@ -14929,13 +14778,13 @@ lean_dec(x_25);
 x_28 = lean_ctor_get(x_26, 0);
 lean_inc(x_28);
 lean_dec(x_26);
-x_29 = l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2___closed__1;
-lean_inc(x_1);
-x_30 = l_Lean_Meta_hasSmartUnfoldingDecl(x_28, x_1);
+x_29 = l_Lean_Meta_SimpTheorems_addDeclToUnfold___closed__1;
+lean_inc(x_2);
+x_30 = l_Lean_Meta_hasSmartUnfoldingDecl(x_28, x_2);
 if (x_30 == 0)
 {
 lean_object* x_31; lean_object* x_32; 
-lean_dec(x_1);
+lean_dec(x_2);
 x_31 = lean_box(0);
 x_32 = lean_apply_7(x_29, x_23, x_31, x_3, x_4, x_5, x_6, x_27);
 return x_32;
@@ -14943,7 +14792,7 @@ return x_32;
 else
 {
 lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = l_Lean_Meta_SimpTheorems_addDeclToUnfoldCore(x_23, x_1);
+x_33 = l_Lean_Meta_SimpTheorems_addDeclToUnfoldCore(x_23, x_2);
 x_34 = lean_box(0);
 x_35 = lean_apply_7(x_29, x_33, x_34, x_3, x_4, x_5, x_6, x_27);
 return x_35;
@@ -14956,7 +14805,7 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_1);
+lean_dec(x_2);
 x_36 = !lean_is_exclusive(x_22);
 if (x_36 == 0)
 {
@@ -15008,19 +14857,6 @@ return x_43;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorems_addDeclToUnfold(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_8 = lean_alloc_closure((void*)(l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2), 7, 2);
-lean_closure_set(x_8, 0, x_2);
-lean_closure_set(x_8, 1, x_1);
-x_9 = l_Lean_Meta_mkSimpAttr___lambda__1___closed__6;
-x_10 = l_Lean_Meta_SimpTheorem_keys___default___closed__1;
-x_11 = l_Lean_Meta_withLCtx___at___private_Lean_Meta_Basic_0__Lean_Meta_mkLeveErrorMessageCore___spec__1___rarg(x_9, x_10, x_8, x_3, x_4, x_5, x_6, x_7);
-return x_11;
-}
-}
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_SimpTheorems_addDeclToUnfold___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) {
 _start:
 {
@@ -15459,14 +15295,22 @@ return x_4;
 static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__1() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string("Meta");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__2() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Meta_mkSimpAttr___lambda__1___closed__14;
-x_2 = l_Lean_Meta_isRflProof___closed__1;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__2() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -15474,17 +15318,17 @@ x_1 = lean_mk_string("commandRegister_simp_attr___");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__3() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__1;
-x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__2;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__2;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__4() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -15492,17 +15336,17 @@ x_1 = lean_mk_string("andthen");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__5() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__4;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__5;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__6() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -15510,17 +15354,17 @@ x_1 = lean_mk_string("register_simp_attr");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__7() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__6;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__7;
 x_2 = lean_alloc_ctor(5, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__8() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__9() {
 _start:
 {
 lean_object* x_1; 
@@ -15528,33 +15372,33 @@ x_1 = lean_mk_string("ident");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__9() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__8;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__9;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__10() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__9;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__11() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__10;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__12() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__5;
-x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__7;
-x_3 = l_Lean_Meta_commandRegister__simp__attr_________closed__10;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__6;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__8;
+x_3 = l_Lean_Meta_commandRegister__simp__attr_________closed__11;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -15562,7 +15406,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__12() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__13() {
 _start:
 {
 lean_object* x_1; 
@@ -15570,33 +15414,33 @@ x_1 = lean_mk_string("str");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__13() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__12;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__13;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__14() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__13;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__15() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__14;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__16() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__5;
-x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__11;
-x_3 = l_Lean_Meta_commandRegister__simp__attr_________closed__14;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__6;
+x_2 = l_Lean_Meta_commandRegister__simp__attr_________closed__12;
+x_3 = l_Lean_Meta_commandRegister__simp__attr_________closed__15;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -15604,13 +15448,13 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__16() {
+static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr_________closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__3;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__4;
 x_2 = lean_unsigned_to_nat(1022u);
-x_3 = l_Lean_Meta_commandRegister__simp__attr_________closed__15;
+x_3 = l_Lean_Meta_commandRegister__simp__attr_________closed__16;
 x_4 = lean_alloc_ctor(3, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -15622,7 +15466,7 @@ static lean_object* _init_l_Lean_Meta_commandRegister__simp__attr______() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__16;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__17;
 return x_1;
 }
 }
@@ -15816,7 +15660,7 @@ static lean_object* _init_l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheor
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__1;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__2;
 x_2 = l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__16;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -15989,7 +15833,7 @@ static lean_object* _init_l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheor
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__1;
+x_1 = l_Lean_Meta_commandRegister__simp__attr_________closed__2;
 x_2 = l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__34;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -16076,7 +15920,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheore
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
-x_4 = l_Lean_Meta_commandRegister__simp__attr_________closed__3;
+x_4 = l_Lean_Meta_commandRegister__simp__attr_________closed__4;
 lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
@@ -16596,22 +16440,6 @@ l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___closed__3 = _init_l_
 lean_mark_persistent(l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___closed__3);
 l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___closed__4 = _init_l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___closed__4();
 lean_mark_persistent(l_Lean_getConstInfo___at_Lean_Meta_isRflTheorem___spec__1___closed__4);
-l_Lean_Meta_isRflProof___closed__1 = _init_l_Lean_Meta_isRflProof___closed__1();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__1);
-l_Lean_Meta_isRflProof___closed__2 = _init_l_Lean_Meta_isRflProof___closed__2();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__2);
-l_Lean_Meta_isRflProof___closed__3 = _init_l_Lean_Meta_isRflProof___closed__3();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__3);
-l_Lean_Meta_isRflProof___closed__4 = _init_l_Lean_Meta_isRflProof___closed__4();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__4);
-l_Lean_Meta_isRflProof___closed__5 = _init_l_Lean_Meta_isRflProof___closed__5();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__5);
-l_Lean_Meta_isRflProof___closed__6 = _init_l_Lean_Meta_isRflProof___closed__6();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__6);
-l_Lean_Meta_isRflProof___closed__7 = _init_l_Lean_Meta_isRflProof___closed__7();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__7);
-l_Lean_Meta_isRflProof___closed__8 = _init_l_Lean_Meta_isRflProof___closed__8();
-lean_mark_persistent(l_Lean_Meta_isRflProof___closed__8);
 l_Lean_Meta_instToFormatSimpTheorem___closed__1 = _init_l_Lean_Meta_instToFormatSimpTheorem___closed__1();
 lean_mark_persistent(l_Lean_Meta_instToFormatSimpTheorem___closed__1);
 l_Lean_Meta_instToFormatSimpTheorem___closed__2 = _init_l_Lean_Meta_instToFormatSimpTheorem___closed__2();
@@ -16622,6 +16450,8 @@ l_Lean_Meta_instToFormatSimpTheorem___closed__4 = _init_l_Lean_Meta_instToFormat
 lean_mark_persistent(l_Lean_Meta_instToFormatSimpTheorem___closed__4);
 l_Lean_Meta_instToFormatSimpTheorem___closed__5 = _init_l_Lean_Meta_instToFormatSimpTheorem___closed__5();
 lean_mark_persistent(l_Lean_Meta_instToFormatSimpTheorem___closed__5);
+l_Lean_Meta_instToFormatSimpTheorem___closed__6 = _init_l_Lean_Meta_instToFormatSimpTheorem___closed__6();
+lean_mark_persistent(l_Lean_Meta_instToFormatSimpTheorem___closed__6);
 l_Lean_Meta_SimpTheorems_pre___default___closed__1 = _init_l_Lean_Meta_SimpTheorems_pre___default___closed__1();
 lean_mark_persistent(l_Lean_Meta_SimpTheorems_pre___default___closed__1);
 l_Lean_Meta_SimpTheorems_pre___default = _init_l_Lean_Meta_SimpTheorems_pre___default();
@@ -16676,6 +16506,8 @@ l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___cl
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__1);
 l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__2 = _init_l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__2);
+l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3 = _init_l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_checkBadRewrite___closed__3);
 l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_shouldPreprocess___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_shouldPreprocess___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_shouldPreprocess___closed__1);
 l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__1___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_preprocess_go___lambda__1___closed__1();
@@ -16816,24 +16648,24 @@ l_Lean_Meta_mkSimpExt___closed__2 = _init_l_Lean_Meta_mkSimpExt___closed__2();
 lean_mark_persistent(l_Lean_Meta_mkSimpExt___closed__2);
 l_Lean_Meta_mkSimpExt___closed__3 = _init_l_Lean_Meta_mkSimpExt___closed__3();
 lean_mark_persistent(l_Lean_Meta_mkSimpExt___closed__3);
-if (builtin) {res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4517_(lean_io_mk_world());
+if (builtin) {res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4429_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Meta_simpExtensionMapRef = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Meta_simpExtensionMapRef);
 lean_dec_ref(res);
 }l_Lean_Meta_registerSimpAttr___closed__1 = _init_l_Lean_Meta_registerSimpAttr___closed__1();
 lean_mark_persistent(l_Lean_Meta_registerSimpAttr___closed__1);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__1 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__1();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__1);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__2);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__3 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__3();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__3);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__4 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__4();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__4);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__5 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__5();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612____closed__5);
-if (builtin) {res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4612_(lean_io_mk_world());
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__1 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__1();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__1);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__2);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__3 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__3();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__3);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__4 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__4();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__4);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__5 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__5();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524____closed__5);
+if (builtin) {res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_4524_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Meta_simpExtension = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Meta_simpExtension);
@@ -16848,8 +16680,8 @@ l_Lean_Meta_SimpTheorem_getValue___closed__3 = _init_l_Lean_Meta_SimpTheorem_get
 lean_mark_persistent(l_Lean_Meta_SimpTheorem_getValue___closed__3);
 l_Lean_Meta_SimpTheorem_getValue___closed__4 = _init_l_Lean_Meta_SimpTheorem_getValue___closed__4();
 lean_mark_persistent(l_Lean_Meta_SimpTheorem_getValue___closed__4);
-l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2___closed__1 = _init_l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2___closed__1();
-lean_mark_persistent(l_Lean_Meta_SimpTheorems_addDeclToUnfold___lambda__2___closed__1);
+l_Lean_Meta_SimpTheorems_addDeclToUnfold___closed__1 = _init_l_Lean_Meta_SimpTheorems_addDeclToUnfold___closed__1();
+lean_mark_persistent(l_Lean_Meta_SimpTheorems_addDeclToUnfold___closed__1);
 l_Lean_Meta_commandRegister__simp__attr_________closed__1 = _init_l_Lean_Meta_commandRegister__simp__attr_________closed__1();
 lean_mark_persistent(l_Lean_Meta_commandRegister__simp__attr_________closed__1);
 l_Lean_Meta_commandRegister__simp__attr_________closed__2 = _init_l_Lean_Meta_commandRegister__simp__attr_________closed__2();
@@ -16882,6 +16714,8 @@ l_Lean_Meta_commandRegister__simp__attr_________closed__15 = _init_l_Lean_Meta_c
 lean_mark_persistent(l_Lean_Meta_commandRegister__simp__attr_________closed__15);
 l_Lean_Meta_commandRegister__simp__attr_________closed__16 = _init_l_Lean_Meta_commandRegister__simp__attr_________closed__16();
 lean_mark_persistent(l_Lean_Meta_commandRegister__simp__attr_________closed__16);
+l_Lean_Meta_commandRegister__simp__attr_________closed__17 = _init_l_Lean_Meta_commandRegister__simp__attr_________closed__17();
+lean_mark_persistent(l_Lean_Meta_commandRegister__simp__attr_________closed__17);
 l_Lean_Meta_commandRegister__simp__attr______ = _init_l_Lean_Meta_commandRegister__simp__attr______();
 lean_mark_persistent(l_Lean_Meta_commandRegister__simp__attr______);
 l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__1 = _init_l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta__commandRegister__simp__attr________1___closed__1();
diff --git a/stage0/stdlib/Lean/Parser/Term.c b/stage0/stdlib/Lean/Parser/Term.c
index e680c35b7e..508f2f95e4 100644
--- a/stage0/stdlib/Lean/Parser/Term.c
+++ b/stage0/stdlib/Lean/Parser/Term.c
@@ -350,7 +350,6 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_attrKind_formatter(lean_object*, lea
 static lean_object* l___regBuiltin_Lean_Parser_Term_local_parenthesizer___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_show;
 static lean_object* l___regBuiltin_Lean_Parser_Term_dbgTrace_declRange___closed__4;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__14;
 static lean_object* l___regBuiltin_Lean_Parser_Term_proj_declRange___closed__5;
 static lean_object* l_Lean_Parser_Term_dynamicQuot___elambda__1___closed__17;
 static lean_object* l_Lean_Parser_Level_quot_parenthesizer___closed__2;
@@ -675,6 +674,7 @@ static lean_object* l_Lean_Parser_Term_binop_parenthesizer___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_panic_parenthesizer(lean_object*);
 static lean_object* l_Lean_Parser_Term_letRecDecl___elambda__1___closed__8;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_fun_declRange(lean_object*);
+static lean_object* l_Lean_Parser_Term_namedPattern___elambda__1___closed__6;
 static lean_object* l_Lean_Parser_Term_subst___closed__4;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_leading__parser_parenthesizer(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_funImplicitBinder___elambda__1(lean_object*, lean_object*);
@@ -912,7 +912,6 @@ static lean_object* l_Lean_Parser_Term_funStrictImplicitBinder___closed__6;
 static lean_object* l_Lean_Parser_Term_arrow___closed__1;
 static lean_object* l_Lean_Parser_Term_forall___closed__3;
 static lean_object* l_Lean_Parser_Term_trailing__parser___closed__6;
-static lean_object* l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__7;
 static lean_object* l___regBuiltin_Lean_Parser_Term_app_declRange___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_scientific;
 static lean_object* l___regBuiltin_Lean_Parser_Term_matchDiscr_formatter___closed__1;
@@ -1015,9 +1014,9 @@ static lean_object* l_Lean_Parser_Term_scoped_formatter___closed__3;
 static lean_object* l_Lean_Parser_Term_structInst_formatter___closed__11;
 static lean_object* l_Lean_Parser_Term_byTactic___elambda__1___closed__11;
 static lean_object* l_Lean_Parser_Term_binop___closed__8;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13;
 static lean_object* l___regBuiltin_Lean_Parser_Term_binrel_declRange___closed__2;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_ensureTypeOf_declRange(lean_object*);
+static lean_object* l_Lean_Parser_Term_optExprPrecedence___closed__7;
 static lean_object* l___regBuiltin_Lean_Parser_Term_basicFun_parenthesizer___closed__2;
 static lean_object* l_Lean_Parser_initFn____x40_Lean_Parser_Term___hyg_3816____closed__36;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Tactic_tacticSeq1Indented_parenthesizer(lean_object*);
@@ -1337,6 +1336,7 @@ static lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__3;
 static lean_object* l_Lean_Parser_Term_hole_parenthesizer___closed__1;
 static lean_object* l_Lean_Parser_Term_forall___closed__7;
 static lean_object* l_Lean_Parser_Term_prop_parenthesizer___closed__2;
+static lean_object* l_Lean_Parser_Term_namedPattern_formatter___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_depArrow___elambda__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_letMVar_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Term_letEqnsDecl___closed__6;
@@ -1959,6 +1959,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_binderDefault;
 static lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__28;
 static lean_object* l_Lean_Parser_Term_assert___closed__5;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_anonymousCtor_parenthesizer(lean_object*);
+static lean_object* l_Lean_Parser_Term_namedPattern___elambda__1___closed__5;
 static lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__9;
 static lean_object* l_Lean_Parser_Term_local___elambda__1___closed__10;
 static lean_object* l___regBuiltin_Lean_Parser_Term_matchAltsWhereDecls_parenthesizer___closed__1;
@@ -2002,7 +2003,6 @@ static lean_object* l_Lean_Parser_Term_let___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_optEllipsis_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Term_panic_parenthesizer___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_noindex_parenthesizer(lean_object*);
-static lean_object* l_Lean_Parser_Term_matchDiscr_formatter___closed__7;
 static lean_object* l___regBuiltin_Lean_Parser_Term_waitIfContainsMVar_declRange___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_typeAscription;
 static lean_object* l___regBuiltin_Lean_Parser_Term_matchAltsWhereDecls_parenthesizer___closed__2;
@@ -2272,6 +2272,7 @@ static lean_object* l_Lean_Parser_Term_attributes___closed__5;
 static lean_object* l_Lean_Parser_Term_leading__parser___elambda__1___closed__16;
 static lean_object* l_Lean_Parser_Term_funBinder_parenthesizer___closed__6;
 static lean_object* l___regBuiltin_Lean_Parser_Term_local_formatter___closed__2;
+static lean_object* l_Lean_Parser_Term_namedPattern___elambda__1___closed__7;
 static lean_object* l___regBuiltin_Lean_Parser_Term_let__delayed_declRange___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_binderTactic;
 static lean_object* l_Lean_Parser_Term_paren___closed__9;
@@ -2472,6 +2473,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_have;
 static lean_object* l_Lean_Parser_Term_forInMacro_x27___elambda__1___closed__7;
 static lean_object* l_Lean_Parser_Term_letIdLhs___closed__3;
 static lean_object* l___regBuiltin_Lean_Parser_Term_let_formatter___closed__2;
+static lean_object* l_Lean_Parser_Term_namedPattern___elambda__1___closed__4;
 static lean_object* l_Lean_Parser_Term_structInstField___elambda__1___closed__14;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_typeSpec;
 static lean_object* l_Lean_Parser_Term_hole_formatter___closed__3;
@@ -2593,6 +2595,7 @@ static lean_object* l_Lean_Parser_Term_strictImplicitLeftBracket_parenthesizer__
 lean_object* l_Lean_PrettyPrinter_Parenthesizer_incQuotDepth_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Parser_Term_panic_parenthesizer___closed__1;
 static lean_object* l_Lean_Parser_Term_byTactic_formatter___closed__3;
+static lean_object* l_Lean_Parser_Term_optExprPrecedence___closed__6;
 static lean_object* l_Lean_Parser_Term_binderTactic_parenthesizer___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_local;
 static lean_object* l_Lean_Parser_Term_matchAlt___closed__12;
@@ -2661,7 +2664,6 @@ static lean_object* l_Lean_Parser_Term_borrowed___elambda__1___closed__11;
 static lean_object* l___regBuiltin_Lean_Parser_Term_binrel_parenthesizer___closed__2;
 static lean_object* l___regBuiltin_Lean_Parser_Term_binop__lazy_declRange___closed__1;
 static lean_object* l_Lean_Parser_Term_fromTerm___elambda__1___closed__3;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__9;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_unreachable(lean_object*);
 static lean_object* l_Lean_Parser_Term_sorry___elambda__1___closed__11;
 static lean_object* l_Lean_Parser_Term_show___closed__4;
@@ -2813,7 +2815,6 @@ static lean_object* l_Lean_Parser_Term_depArrow___closed__4;
 static lean_object* l_Lean_Parser_Term_match___elambda__1___closed__16;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_quotedName_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Term_motive_formatter___closed__6;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__17;
 static lean_object* l_Lean_Parser_Term_byTactic_parenthesizer___closed__2;
 static lean_object* l_Lean_Parser_Term_generalizingParam___elambda__1___closed__4;
 static lean_object* l_Lean_Parser_Term_pipeProj___closed__3;
@@ -3199,6 +3200,7 @@ static lean_object* l_Lean_Parser_Term_defaultOrOfNonempty_parenthesizer___close
 static lean_object* l_Lean_Parser_Term_panic___elambda__1___closed__10;
 static lean_object* l___regBuiltin_Lean_Parser_Term_waitIfTypeContainsMVar_declRange___closed__7;
 static lean_object* l_Lean_Parser_Tactic_tacticSeqBracketed___elambda__1___closed__10;
+static lean_object* l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__3;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_prop_formatter(lean_object*);
 static lean_object* l___regBuiltin_Lean_Parser_Term_arrow_declRange___closed__3;
 uint32_t lean_string_utf8_get(lean_object*, lean_object*);
@@ -3481,7 +3483,6 @@ static lean_object* l_Lean_Parser_Term_let___elambda__1___closed__2;
 static lean_object* l___regBuiltin_Lean_Parser_Term_cdot_formatter___closed__1;
 static lean_object* l___regBuiltin_Lean_Parser_Term_sorry_parenthesizer___closed__1;
 static lean_object* l_Lean_Parser_Term_subst___elambda__1___closed__10;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__11;
 static lean_object* l_Lean_Parser_Term_ensureTypeOf___elambda__1___closed__12;
 static lean_object* l___regBuiltin_Lean_Parser_Term_str_declRange___closed__4;
 static lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__1;
@@ -3581,6 +3582,7 @@ static lean_object* l_Lean_Parser_Term_matchAltsWhereDecls___elambda__1___closed
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_optEllipsis;
 static lean_object* l_Lean_Parser_Term_have_formatter___closed__6;
 static lean_object* l___regBuiltin_Lean_Parser_Term_motive_parenthesizer___closed__2;
+static lean_object* l_Lean_Parser_Term_namedPattern_parenthesizer___closed__7;
 lean_object* l_Lean_Parser_sepBy1_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Term_forall_parenthesizer___closed__7;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_sort_parenthesizer(lean_object*);
@@ -3610,7 +3612,6 @@ static lean_object* l_Lean_Parser_Term_defaultOrOfNonempty___elambda__1___closed
 static lean_object* l_Lean_Parser_Term_matchDiscr_quot___elambda__1___closed__10;
 static lean_object* l_Lean_Parser_Term_cdot_parenthesizer___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_binop_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Parser_Term_matchDiscr_formatter___closed__6;
 static lean_object* l_Lean_Parser_Term_optExprPrecedence___closed__5;
 static lean_object* l_Lean_Parser_Term_haveDecl_parenthesizer___closed__3;
 static lean_object* l_Lean_Parser_Term_matchDiscr_quot___closed__4;
@@ -3724,6 +3725,7 @@ static lean_object* l_Lean_Parser_Level_quot___closed__7;
 static lean_object* l_Lean_Parser_Term_bracketedBinder_quot___elambda__1___closed__1;
 static lean_object* l_Lean_Parser_Term_motive___elambda__1___closed__12;
 static lean_object* l_Lean_Parser_Term_argument_formatter___closed__2;
+static lean_object* l_Lean_Parser_Term_optExprPrecedence___closed__9;
 static lean_object* l_Lean_Parser_Term_letEqnsDecl___elambda__1___closed__8;
 static lean_object* l_Lean_Parser_Term_funImplicitBinder___closed__3;
 static lean_object* l_Lean_Parser_initFn____x40_Lean_Parser_Term___hyg_3816____closed__18;
@@ -4120,6 +4122,7 @@ static lean_object* l___regBuiltin_Lean_Parser_Term_waitIfTypeContainsMVar_paren
 static lean_object* l_Lean_Parser_Term_forall___closed__1;
 static lean_object* l_Lean_Parser_Term_anonymousCtor___elambda__1___closed__10;
 static lean_object* l_Lean_Parser_Term_funBinder_quot___closed__7;
+static lean_object* l_Lean_Parser_Term_namedPattern_parenthesizer___closed__5;
 static lean_object* l_Lean_Parser_Term_binderTactic___closed__8;
 static lean_object* l_Lean_Parser_Term_ensureTypeOf_formatter___closed__4;
 static lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__21;
@@ -4254,6 +4257,7 @@ static lean_object* l_Lean_Parser_Term_haveDecl___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_ident_declRange(lean_object*);
 static lean_object* l_Lean_Parser_Tactic_quot___elambda__1___closed__13;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_bracketedBinder_parenthesizer(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Term_optExprPrecedence___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_type___elambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_haveDecl;
 static lean_object* l_Lean_Parser_Term_haveIdDecl_parenthesizer___closed__2;
@@ -4474,7 +4478,6 @@ static lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__2;
 static lean_object* l_Lean_Parser_Term_structInstLVal_parenthesizer___closed__9;
 static lean_object* l_Lean_Parser_Term_motive___elambda__1___closed__5;
 static lean_object* l_Lean_Parser_Term_forInMacro_formatter___closed__5;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__12;
 static lean_object* l_Lean_Parser_Term_inaccessible___closed__5;
 static lean_object* l_Lean_Parser_Tactic_tacticSeqBracketed___closed__2;
 static lean_object* l___regBuiltin_Lean_Parser_Term_waitIfTypeMVar_declRange___closed__7;
@@ -4768,7 +4771,6 @@ static lean_object* l___regBuiltin_Lean_Parser_Term_suffices_declRange___closed_
 static lean_object* l_Lean_Parser_Term_app___closed__5;
 static lean_object* l_Lean_Parser_Term_ensureTypeOf_parenthesizer___closed__6;
 static lean_object* l___regBuiltin_Lean_Parser_Term_waitIfTypeMVar_declRange___closed__3;
-static lean_object* l_Lean_Parser_Term_matchDiscr_formatter___closed__5;
 static lean_object* l_Lean_Parser_initFn____x40_Lean_Parser_Term___hyg_63____closed__1;
 static lean_object* l_Lean_Parser_Term_binrel__no__prop___closed__1;
 static lean_object* l_Lean_Parser_Term_forall_formatter___closed__3;
@@ -4834,6 +4836,7 @@ static lean_object* l_Lean_Parser_Term_structInstLVal___elambda__1___closed__20;
 static lean_object* l___regBuiltin_Lean_Parser_Term_binop_declRange___closed__7;
 static lean_object* l___regBuiltin_Lean_Parser_Term_assert_declRange___closed__7;
 static lean_object* l_Lean_Parser_Term_attrKind_parenthesizer___closed__3;
+static lean_object* l_Lean_Parser_Term_namedPattern_formatter___closed__4;
 static lean_object* l_Lean_Parser_Term_match___closed__8;
 static lean_object* l_Lean_Parser_Term_basicFun_formatter___closed__8;
 static lean_object* l_Lean_Parser_Term_waitIfTypeMVar_parenthesizer___closed__1;
@@ -5201,6 +5204,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_dotIdent_formatter(lean_object*, lea
 static lean_object* l_Lean_Parser_Term_byTactic___elambda__1___closed__10;
 static lean_object* l___regBuiltin_Lean_Parser_Term_structInst_parenthesizer___closed__1;
 static lean_object* l_Lean_Parser_Term_subst_formatter___closed__3;
+static lean_object* l_Lean_Parser_Term_optExprPrecedence_formatter___closed__3;
 static lean_object* l_Lean_Parser_Term_hole_parenthesizer___closed__3;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_waitIfTypeContainsMVar_formatter(lean_object*);
 static lean_object* l___regBuiltin_Lean_Parser_Term_explicit_declRange___closed__2;
@@ -5275,6 +5279,7 @@ static lean_object* l_Lean_Parser_Term_matchAlt_formatter___closed__4;
 static lean_object* l___regBuiltin_Lean_Parser_Term_borrowed_declRange___closed__1;
 static lean_object* l___regBuiltin_Lean_Parser_Term_cdot_declRange___closed__3;
 static lean_object* l_Lean_Parser_Term_forInMacro___closed__1;
+static lean_object* l_Lean_Parser_Term_namedPattern_parenthesizer___closed__6;
 static lean_object* l_Lean_Parser_Term_macroDollarArg___closed__8;
 static lean_object* l_Lean_Parser_Term_strictImplicitRightBracket_formatter___closed__2;
 static lean_object* l_Lean_Parser_Term_structInstArrayRef___elambda__1___closed__14;
@@ -5446,7 +5451,6 @@ static lean_object* l_Lean_Parser_Term_defaultOrOfNonempty___elambda__1___closed
 static lean_object* l_Lean_Parser_Term_sorry___elambda__1___closed__10;
 static lean_object* l_Lean_Parser_Term_match___elambda__1___closed__20;
 static lean_object* l_Lean_Parser_Term_binrel_parenthesizer___closed__4;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__10;
 static lean_object* l_Lean_Parser_Term_attr_quot___closed__2;
 static lean_object* l___regBuiltin_Lean_Parser_Term_scoped_parenthesizer___closed__2;
 static lean_object* l_Lean_Parser_Term_binop___elambda__1___closed__8;
@@ -5520,6 +5524,7 @@ static lean_object* l_Lean_Parser_Term_motive_formatter___closed__4;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_bracketedBinder_quot_formatter(lean_object*);
 lean_object* l_Lean_Parser_mkAntiquot(lean_object*, lean_object*, uint8_t);
 static lean_object* l_Lean_Parser_Term_funBinder___closed__2;
+static lean_object* l_Lean_Parser_Term_namedPattern_formatter___closed__5;
 static lean_object* l___regBuiltin_Lean_Parser_Term_byTactic___closed__2;
 static lean_object* l_Lean_Parser_Term_basicFun_formatter___closed__1;
 static lean_object* l_Lean_Parser_Term_matchDiscr_quot___elambda__1___closed__11;
@@ -5795,7 +5800,6 @@ static lean_object* l_Lean_Parser_Term_generalizingParam___closed__1;
 static lean_object* l_Lean_Parser_Term_whereDecls_parenthesizer___closed__3;
 static lean_object* l_Lean_Parser_Term_letrec___elambda__1___closed__5;
 static lean_object* l___regBuiltin_Lean_Parser_Term_let__tmp_formatter___closed__1;
-static lean_object* l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_panic_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Parser_Term_withAnonymousAntiquot_parenthesizer___closed__1;
 static lean_object* l_Lean_Parser_Term_funStrictImplicitBinder_formatter___closed__3;
@@ -5915,6 +5919,7 @@ static lean_object* l_Lean_Parser_Term_letIdLhs___elambda__1___closed__7;
 static lean_object* l_Lean_Parser_Level_quot_parenthesizer___closed__1;
 static lean_object* l___regBuiltin_Lean_Parser_Term_char___closed__2;
 static lean_object* l_Lean_Parser_Term_syntheticHole___elambda__1___closed__9;
+static lean_object* l_Lean_Parser_Term_namedPattern___elambda__1___closed__8;
 static lean_object* l_Lean_Parser_Term_macroDollarArg___elambda__1___closed__10;
 static lean_object* l_Lean_Parser_Term_structInstFieldAbbrev___elambda__1___closed__6;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_subst(lean_object*);
@@ -6024,7 +6029,6 @@ static lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__4;
 static lean_object* l_Lean_Parser_Term_trailing__parser___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_bracketedBinder_formatter(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Term_byTactic_x27___closed__5;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__15;
 static lean_object* l_Lean_Parser_Term_binrel_parenthesizer___closed__3;
 static lean_object* l_Lean_Parser_Term_generalizingParam___closed__8;
 static lean_object* l_Lean_Parser_Term_simpleBinder___elambda__1___closed__2;
@@ -6124,7 +6128,6 @@ static lean_object* l_Lean_Parser_Term_structInst___closed__11;
 static lean_object* l_Lean_Parser_Term_sorry___elambda__1___closed__5;
 static lean_object* l_Lean_Parser_Term_forall___elambda__1___closed__8;
 static lean_object* l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__1;
-static lean_object* l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5;
 static lean_object* l___regBuiltin_Lean_Parser_Term_stateRefT_declRange___closed__4;
 static lean_object* l_Lean_Parser_Tactic_quotSeq___closed__2;
 static lean_object* l_Lean_Parser_Term_have_parenthesizer___closed__5;
@@ -6232,7 +6235,6 @@ static lean_object* l___regBuiltin_Lean_Parser_Term_waitIfContainsMVar_formatter
 static lean_object* l_Lean_Parser_Term_doubleQuotedName___elambda__1___closed__8;
 static lean_object* l___regBuiltin_Lean_Parser_Term_nomatch_declRange___closed__7;
 static lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__12;
-static lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1___closed__16;
 static lean_object* l_Lean_Parser_Term_cdot_formatter___closed__5;
 static lean_object* l_Lean_Parser_Term_binderTactic___closed__3;
 static lean_object* l_Lean_Parser_Term_scoped_formatter___closed__2;
@@ -6248,6 +6250,7 @@ static lean_object* l___regBuiltin_Lean_Parser_Term_subst_declRange___closed__5;
 static lean_object* l___regBuiltin_Lean_Parser_Term_forall_formatter___closed__2;
 static lean_object* l_Lean_Parser_Term_fromTerm___elambda__1___closed__10;
 static lean_object* l_Lean_Parser_Term_waitIfContainsMVar___elambda__1___closed__9;
+static lean_object* l_Lean_Parser_Term_namedPattern_formatter___closed__6;
 static lean_object* l_Lean_Parser_Term_pipeProj___closed__1;
 static lean_object* l_Lean_Parser_Term_letIdLhs_formatter___closed__6;
 static lean_object* l_Lean_Parser_Term_sufficesDecl_parenthesizer___closed__8;
@@ -36581,99 +36584,8 @@ return x_4;
 static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__5() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string(":");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__5;
-x_2 = l_String_trim(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__6;
-x_2 = l_Lean_Parser_symbolInfo(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__6;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_Command_docComment___elambda__1___lambda__1___boxed), 3, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__9() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Term_ident;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7;
-x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
-return x_4;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__10() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_ident___closed__2;
-x_2 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8;
-x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__11() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__10;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_atomicFn), 3, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__12() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__9;
-x_2 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__11;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__12;
-x_2 = l_Lean_Parser_optional(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__14() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13;
+x_1 = l_Lean_Parser_Term_optIdent___closed__5;
 x_2 = lean_ctor_get(x_1, 1);
 lean_inc(x_2);
 x_3 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
@@ -36683,23 +36595,23 @@ lean_closure_set(x_4, 1, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__15() {
+static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__2;
-x_2 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__14;
+x_2 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__5;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_nodeFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__16() {
+static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__15;
+x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__6;
 x_2 = l_Lean_Parser_Command_docComment___elambda__1___closed__17;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
@@ -36707,12 +36619,12 @@ lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__17() {
+static lean_object* _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Command_docComment___elambda__1___closed__16;
-x_2 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__16;
+x_2 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -36723,7 +36635,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_matchDiscr___elambda__1(lean_object*
 _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; uint32_t x_10; uint32_t x_11; uint8_t x_12; 
-x_3 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13;
+x_3 = l_Lean_Parser_Term_optIdent___closed__5;
 x_4 = lean_ctor_get(x_3, 1);
 lean_inc(x_4);
 x_5 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__4;
@@ -36825,7 +36737,7 @@ else
 {
 lean_object* x_36; uint8_t x_37; lean_object* x_38; 
 lean_dec(x_4);
-x_36 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__17;
+x_36 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8;
 x_37 = 1;
 x_38 = l_Lean_Parser_orelseFnCore(x_6, x_36, x_37, x_1, x_2);
 return x_38;
@@ -36836,7 +36748,7 @@ static lean_object* _init_l_Lean_Parser_Term_matchDiscr___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13;
+x_1 = l_Lean_Parser_Term_optIdent___closed__5;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
 x_3 = l_Lean_Parser_Term_typeAscription___closed__2;
@@ -39806,8 +39718,8 @@ static lean_object* _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__2()
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__5;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_symbol_formatter), 6, 1);
+x_1 = l_Lean_Parser_Term_optIdent_formatter___closed__2;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_formatter), 6, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
@@ -39816,8 +39728,8 @@ static lean_object* _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__3()
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_syntheticHole_formatter___closed__3;
-x_2 = l_Lean_Parser_Term_matchDiscr_formatter___closed__2;
+x_1 = l_Lean_Parser_Term_matchDiscr_formatter___closed__2;
+x_2 = l_Lean_Parser_Term_tupleTail_formatter___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -39827,42 +39739,10 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr_formatter___closed__3;
-x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_atomic_formatter), 6, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr_formatter___closed__4;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_formatter), 6, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_matchDiscr_formatter___closed__5;
-x_2 = l_Lean_Parser_Term_tupleTail_formatter___closed__3;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__7() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Term_matchDiscr_formatter___closed__6;
+x_3 = l_Lean_Parser_Term_matchDiscr_formatter___closed__3;
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_leadingNode_formatter___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
@@ -39875,7 +39755,7 @@ _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_Parser_Term_matchDiscr_formatter___closed__1;
-x_7 = l_Lean_Parser_Term_matchDiscr_formatter___closed__7;
+x_7 = l_Lean_Parser_Term_matchDiscr_formatter___closed__4;
 x_8 = l_Lean_PrettyPrinter_Formatter_orelse_formatter(x_6, x_7, x_1, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -40743,8 +40623,8 @@ static lean_object* _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__5;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_symbol_parenthesizer), 6, 1);
+x_1 = l_Lean_Parser_Term_optIdent_parenthesizer___closed__2;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_parenthesizer), 6, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
@@ -40753,8 +40633,8 @@ static lean_object* _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_syntheticHole_parenthesizer___closed__3;
-x_2 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__2;
+x_1 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__2;
+x_2 = l_Lean_Parser_Term_tupleTail_parenthesizer___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -40764,42 +40644,10 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__3;
-x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_atomic_parenthesizer), 6, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__4;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_parenthesizer), 6, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5;
-x_2 = l_Lean_Parser_Term_tupleTail_parenthesizer___closed__3;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__7() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__6;
+x_3 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__3;
 x_4 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_leadingNode_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
@@ -40812,7 +40660,7 @@ _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__1;
-x_7 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__7;
+x_7 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__4;
 x_8 = l_Lean_PrettyPrinter_Parenthesizer_orelse_parenthesizer(x_6, x_7, x_1, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -44590,47 +44438,37 @@ return x_6;
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_atomicFn), 3, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_1; 
+x_1 = lean_mk_string(":");
+return x_1;
 }
 }
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Term_explicit___closed__2;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7;
-x_4 = l_Lean_Parser_andthenInfo(x_3, x_2);
-return x_4;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__1;
+x_2 = l_String_trim(x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__3() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__1;
-x_2 = l_Lean_Parser_Term_explicit___elambda__1___closed__8;
-x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__2;
+x_2 = l_Lean_Parser_symbolInfo(x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__2;
-x_2 = l_Lean_Parser_Term_optExprPrecedence___closed__3;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_Command_docComment___elambda__1___lambda__1___boxed), 3, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__5() {
@@ -44638,6 +44476,52 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__4;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_atomicFn), 3, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Parser_Term_explicit___closed__2;
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = l_Lean_Parser_Term_optExprPrecedence___closed__3;
+x_4 = l_Lean_Parser_andthenInfo(x_3, x_2);
+return x_4;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__5;
+x_2 = l_Lean_Parser_Term_explicit___elambda__1___closed__8;
+x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__8() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__6;
+x_2 = l_Lean_Parser_Term_optExprPrecedence___closed__7;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence___closed__9() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__8;
 x_2 = l_Lean_Parser_optional(x_1);
 return x_2;
 }
@@ -44646,7 +44530,7 @@ static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__5;
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__9;
 return x_1;
 }
 }
@@ -45699,8 +45583,8 @@ static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence_formatter___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr_formatter___closed__2;
-x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_atomic_formatter), 6, 1);
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__1;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_symbol_formatter), 6, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
@@ -45708,8 +45592,18 @@ return x_2;
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence_formatter___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Parser_Term_optExprPrecedence_formatter___closed__1;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_atomic_formatter), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence_formatter___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence_formatter___closed__2;
 x_2 = l_Lean_Parser_Term_tupleTail_formatter___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
@@ -45721,7 +45615,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_optExprPrecedence_formatter(lean_obj
 _start:
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Parser_Term_optExprPrecedence_formatter___closed__2;
+x_6 = l_Lean_Parser_Term_optExprPrecedence_formatter___closed__3;
 x_7 = l_Lean_Parser_optional_formatter(x_6, x_1, x_2, x_3, x_4, x_5);
 return x_7;
 }
@@ -45991,8 +45885,8 @@ static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence_parenthesizer___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__2;
-x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_atomic_parenthesizer), 6, 1);
+x_1 = l_Lean_Parser_Term_optExprPrecedence___closed__1;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_symbol_parenthesizer), 6, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
@@ -46000,8 +45894,18 @@ return x_2;
 static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__1;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_atomic_parenthesizer), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__2;
 x_2 = l_Lean_Parser_Term_explicit_parenthesizer___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
 lean_closure_set(x_3, 0, x_1);
@@ -46013,7 +45917,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_optExprPrecedence_parenthesizer(lean
 _start:
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__2;
+x_6 = l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__3;
 x_7 = l_Lean_Parser_optional_parenthesizer(x_6, x_1, x_2, x_3, x_4, x_5);
 return x_7;
 }
@@ -81611,6 +81515,61 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__3() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Parser_Term_ident;
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = l_Lean_Parser_Term_optExprPrecedence___closed__3;
+x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
+return x_4;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_ident___closed__2;
+x_2 = l_Lean_Parser_Term_optExprPrecedence___closed__4;
+x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__4;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_atomicFn), 3, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__3;
+x_2 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__5;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__6;
+x_2 = l_Lean_Parser_optional(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__8() {
+_start:
+{
 lean_object* x_1; 
 x_1 = lean_mk_string("no space before '@'");
 return x_1;
@@ -81620,7 +81579,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Term_namedPattern___elambda__1(lean_objec
 _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; uint8_t x_9; 
-x_3 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13;
+x_3 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__7;
 x_4 = lean_ctor_get(x_3, 1);
 lean_inc(x_4);
 x_5 = lean_unsigned_to_nat(1024u);
@@ -81715,7 +81674,7 @@ goto block_25;
 else
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
-x_29 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__3;
+x_29 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__8;
 x_30 = l_Lean_Parser_checkNoWsBeforeFn(x_29, x_1, x_26);
 x_31 = lean_ctor_get(x_30, 4);
 lean_inc(x_31);
@@ -81837,7 +81796,7 @@ static lean_object* _init_l_Lean_Parser_Term_namedPattern___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13;
+x_1 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__7;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
 x_3 = l_Lean_Parser_Term_explicit___closed__2;
@@ -82064,8 +82023,8 @@ static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__1(
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_explicit_formatter___closed__2;
-x_2 = l_Lean_Parser_Term_matchDiscr_formatter___closed__6;
+x_1 = l_Lean_Parser_Term_syntheticHole_formatter___closed__3;
+x_2 = l_Lean_Parser_Term_optExprPrecedence_formatter___closed__1;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -82075,21 +82034,65 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__2() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_namedPattern_formatter___closed__1;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_atomic_formatter), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_namedPattern_formatter___closed__2;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_formatter), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__4() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_doubleQuotedName_formatter___closed__5;
-x_2 = l_Lean_Parser_Term_namedPattern_formatter___closed__1;
+x_1 = l_Lean_Parser_Term_namedPattern_formatter___closed__3;
+x_2 = l_Lean_Parser_Term_tupleTail_formatter___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__3() {
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_explicit_formatter___closed__2;
+x_2 = l_Lean_Parser_Term_namedPattern_formatter___closed__4;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_doubleQuotedName_formatter___closed__5;
+x_2 = l_Lean_Parser_Term_namedPattern_formatter___closed__5;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_formatter___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Term_explicitUniv_formatter___closed__6;
-x_2 = l_Lean_Parser_Term_namedPattern_formatter___closed__2;
+x_2 = l_Lean_Parser_Term_namedPattern_formatter___closed__6;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -82103,7 +82106,7 @@ lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_obj
 x_6 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__2;
 x_7 = lean_unsigned_to_nat(1024u);
 x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_Lean_Parser_Term_namedPattern_formatter___closed__3;
+x_9 = l_Lean_Parser_Term_namedPattern_formatter___closed__7;
 x_10 = l_Lean_PrettyPrinter_Formatter_trailingNode_formatter(x_6, x_7, x_8, x_9, x_1, x_2, x_3, x_4, x_5);
 return x_10;
 }
@@ -82142,8 +82145,8 @@ static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5;
-x_2 = l_Lean_Parser_Term_explicit_parenthesizer___closed__3;
+x_1 = l_Lean_Parser_Term_syntheticHole_parenthesizer___closed__3;
+x_2 = l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__1;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -82153,33 +82156,65 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_explicit_parenthesizer___closed__2;
-x_2 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__1;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__1;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_atomic_parenthesizer), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__3() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_doubleQuotedName_parenthesizer___closed__5;
-x_2 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__2;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__2;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_parenthesizer), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__3;
+x_2 = l_Lean_Parser_Term_explicit_parenthesizer___closed__3;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_explicit_parenthesizer___closed__2;
+x_2 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__4;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_doubleQuotedName_parenthesizer___closed__5;
+x_2 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__5;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Term_explicitUniv_parenthesizer___closed__7;
-x_2 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__3;
+x_2 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__6;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -82193,7 +82228,7 @@ lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_obj
 x_6 = l_Lean_Parser_Term_namedPattern___elambda__1___closed__2;
 x_7 = lean_unsigned_to_nat(1024u);
 x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__4;
+x_9 = l_Lean_Parser_Term_namedPattern_parenthesizer___closed__7;
 x_10 = l_Lean_PrettyPrinter_Parenthesizer_trailingNode_parenthesizer(x_6, x_7, x_8, x_9, x_1, x_2, x_3, x_4, x_5);
 return x_10;
 }
@@ -101497,24 +101532,6 @@ l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7 = _init_l_Lean_Parser_Ter
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__7);
 l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8();
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__8);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__9 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__9();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__9);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__10 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__10();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__10);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__11 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__11();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__11);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__12 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__12();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__12);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__13);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__14 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__14();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__14);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__15 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__15();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__15);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__16 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__16();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__16);
-l_Lean_Parser_Term_matchDiscr___elambda__1___closed__17 = _init_l_Lean_Parser_Term_matchDiscr___elambda__1___closed__17();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___elambda__1___closed__17);
 l_Lean_Parser_Term_matchDiscr___closed__1 = _init_l_Lean_Parser_Term_matchDiscr___closed__1();
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr___closed__1);
 l_Lean_Parser_Term_matchDiscr___closed__2 = _init_l_Lean_Parser_Term_matchDiscr___closed__2();
@@ -101893,12 +101910,6 @@ l_Lean_Parser_Term_matchDiscr_formatter___closed__3 = _init_l_Lean_Parser_Term_m
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_formatter___closed__3);
 l_Lean_Parser_Term_matchDiscr_formatter___closed__4 = _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__4();
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_formatter___closed__4);
-l_Lean_Parser_Term_matchDiscr_formatter___closed__5 = _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__5();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_formatter___closed__5);
-l_Lean_Parser_Term_matchDiscr_formatter___closed__6 = _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__6();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_formatter___closed__6);
-l_Lean_Parser_Term_matchDiscr_formatter___closed__7 = _init_l_Lean_Parser_Term_matchDiscr_formatter___closed__7();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_formatter___closed__7);
 l___regBuiltin_Lean_Parser_Term_matchDiscr_formatter___closed__1 = _init_l___regBuiltin_Lean_Parser_Term_matchDiscr_formatter___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Parser_Term_matchDiscr_formatter___closed__1);
 l___regBuiltin_Lean_Parser_Term_matchDiscr_formatter___closed__2 = _init_l___regBuiltin_Lean_Parser_Term_matchDiscr_formatter___closed__2();
@@ -102037,12 +102048,6 @@ l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__3 = _init_l_Lean_Parser_Te
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__3);
 l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__4 = _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__4();
 lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__4);
-l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5 = _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__5);
-l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__6 = _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__6();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__6);
-l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__7 = _init_l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__7();
-lean_mark_persistent(l_Lean_Parser_Term_matchDiscr_parenthesizer___closed__7);
 l___regBuiltin_Lean_Parser_Term_matchDiscr_parenthesizer___closed__1 = _init_l___regBuiltin_Lean_Parser_Term_matchDiscr_parenthesizer___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Parser_Term_matchDiscr_parenthesizer___closed__1);
 l___regBuiltin_Lean_Parser_Term_matchDiscr_parenthesizer___closed__2 = _init_l___regBuiltin_Lean_Parser_Term_matchDiscr_parenthesizer___closed__2();
@@ -102603,6 +102608,14 @@ l_Lean_Parser_Term_optExprPrecedence___closed__4 = _init_l_Lean_Parser_Term_optE
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence___closed__4);
 l_Lean_Parser_Term_optExprPrecedence___closed__5 = _init_l_Lean_Parser_Term_optExprPrecedence___closed__5();
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence___closed__5);
+l_Lean_Parser_Term_optExprPrecedence___closed__6 = _init_l_Lean_Parser_Term_optExprPrecedence___closed__6();
+lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence___closed__6);
+l_Lean_Parser_Term_optExprPrecedence___closed__7 = _init_l_Lean_Parser_Term_optExprPrecedence___closed__7();
+lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence___closed__7);
+l_Lean_Parser_Term_optExprPrecedence___closed__8 = _init_l_Lean_Parser_Term_optExprPrecedence___closed__8();
+lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence___closed__8);
+l_Lean_Parser_Term_optExprPrecedence___closed__9 = _init_l_Lean_Parser_Term_optExprPrecedence___closed__9();
+lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence___closed__9);
 l_Lean_Parser_Term_optExprPrecedence = _init_l_Lean_Parser_Term_optExprPrecedence();
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence);
 l_Lean_Parser_Term_withAnonymousAntiquot___elambda__1___closed__1 = _init_l_Lean_Parser_Term_withAnonymousAntiquot___elambda__1___closed__1();
@@ -102731,6 +102744,8 @@ l_Lean_Parser_Term_optExprPrecedence_formatter___closed__1 = _init_l_Lean_Parser
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence_formatter___closed__1);
 l_Lean_Parser_Term_optExprPrecedence_formatter___closed__2 = _init_l_Lean_Parser_Term_optExprPrecedence_formatter___closed__2();
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence_formatter___closed__2);
+l_Lean_Parser_Term_optExprPrecedence_formatter___closed__3 = _init_l_Lean_Parser_Term_optExprPrecedence_formatter___closed__3();
+lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence_formatter___closed__3);
 l_Lean_Parser_Term_withAnonymousAntiquot_formatter___closed__1 = _init_l_Lean_Parser_Term_withAnonymousAntiquot_formatter___closed__1();
 lean_mark_persistent(l_Lean_Parser_Term_withAnonymousAntiquot_formatter___closed__1);
 l_Lean_Parser_Term_withAnonymousAntiquot_formatter___closed__2 = _init_l_Lean_Parser_Term_withAnonymousAntiquot_formatter___closed__2();
@@ -102779,6 +102794,8 @@ l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__1 = _init_l_Lean_Pa
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__1);
 l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__2 = _init_l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__2();
 lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__2);
+l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__3 = _init_l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__3();
+lean_mark_persistent(l_Lean_Parser_Term_optExprPrecedence_parenthesizer___closed__3);
 l_Lean_Parser_Term_withAnonymousAntiquot_parenthesizer___closed__1 = _init_l_Lean_Parser_Term_withAnonymousAntiquot_parenthesizer___closed__1();
 lean_mark_persistent(l_Lean_Parser_Term_withAnonymousAntiquot_parenthesizer___closed__1);
 l_Lean_Parser_Term_withAnonymousAntiquot_parenthesizer___closed__2 = _init_l_Lean_Parser_Term_withAnonymousAntiquot_parenthesizer___closed__2();
@@ -107474,6 +107491,16 @@ l_Lean_Parser_Term_namedPattern___elambda__1___closed__2 = _init_l_Lean_Parser_T
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__2);
 l_Lean_Parser_Term_namedPattern___elambda__1___closed__3 = _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__3();
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__3);
+l_Lean_Parser_Term_namedPattern___elambda__1___closed__4 = _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__4();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__4);
+l_Lean_Parser_Term_namedPattern___elambda__1___closed__5 = _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__5();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__5);
+l_Lean_Parser_Term_namedPattern___elambda__1___closed__6 = _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__6();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__6);
+l_Lean_Parser_Term_namedPattern___elambda__1___closed__7 = _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__7();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__7);
+l_Lean_Parser_Term_namedPattern___elambda__1___closed__8 = _init_l_Lean_Parser_Term_namedPattern___elambda__1___closed__8();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern___elambda__1___closed__8);
 l_Lean_Parser_Term_namedPattern___closed__1 = _init_l_Lean_Parser_Term_namedPattern___closed__1();
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern___closed__1);
 l_Lean_Parser_Term_namedPattern___closed__2 = _init_l_Lean_Parser_Term_namedPattern___closed__2();
@@ -107522,6 +107549,14 @@ l_Lean_Parser_Term_namedPattern_formatter___closed__2 = _init_l_Lean_Parser_Term
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern_formatter___closed__2);
 l_Lean_Parser_Term_namedPattern_formatter___closed__3 = _init_l_Lean_Parser_Term_namedPattern_formatter___closed__3();
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern_formatter___closed__3);
+l_Lean_Parser_Term_namedPattern_formatter___closed__4 = _init_l_Lean_Parser_Term_namedPattern_formatter___closed__4();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_formatter___closed__4);
+l_Lean_Parser_Term_namedPattern_formatter___closed__5 = _init_l_Lean_Parser_Term_namedPattern_formatter___closed__5();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_formatter___closed__5);
+l_Lean_Parser_Term_namedPattern_formatter___closed__6 = _init_l_Lean_Parser_Term_namedPattern_formatter___closed__6();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_formatter___closed__6);
+l_Lean_Parser_Term_namedPattern_formatter___closed__7 = _init_l_Lean_Parser_Term_namedPattern_formatter___closed__7();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_formatter___closed__7);
 l___regBuiltin_Lean_Parser_Term_namedPattern_formatter___closed__1 = _init_l___regBuiltin_Lean_Parser_Term_namedPattern_formatter___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Parser_Term_namedPattern_formatter___closed__1);
 l___regBuiltin_Lean_Parser_Term_namedPattern_formatter___closed__2 = _init_l___regBuiltin_Lean_Parser_Term_namedPattern_formatter___closed__2();
@@ -107537,6 +107572,12 @@ l_Lean_Parser_Term_namedPattern_parenthesizer___closed__3 = _init_l_Lean_Parser_
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern_parenthesizer___closed__3);
 l_Lean_Parser_Term_namedPattern_parenthesizer___closed__4 = _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__4();
 lean_mark_persistent(l_Lean_Parser_Term_namedPattern_parenthesizer___closed__4);
+l_Lean_Parser_Term_namedPattern_parenthesizer___closed__5 = _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__5();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_parenthesizer___closed__5);
+l_Lean_Parser_Term_namedPattern_parenthesizer___closed__6 = _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__6();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_parenthesizer___closed__6);
+l_Lean_Parser_Term_namedPattern_parenthesizer___closed__7 = _init_l_Lean_Parser_Term_namedPattern_parenthesizer___closed__7();
+lean_mark_persistent(l_Lean_Parser_Term_namedPattern_parenthesizer___closed__7);
 l___regBuiltin_Lean_Parser_Term_namedPattern_parenthesizer___closed__1 = _init_l___regBuiltin_Lean_Parser_Term_namedPattern_parenthesizer___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Parser_Term_namedPattern_parenthesizer___closed__1);
 l___regBuiltin_Lean_Parser_Term_namedPattern_parenthesizer___closed__2 = _init_l___regBuiltin_Lean_Parser_Term_namedPattern_parenthesizer___closed__2();
diff --git a/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c b/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c
index ceebc38d8f..837ff38de0 100644
--- a/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c
+++ b/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c
@@ -16,8 +16,6 @@ extern "C" {
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___spec__2___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_getParamKinds(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandCoe___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__17(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Level_dec(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabFVar___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -28,7 +26,6 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___clo
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam___lambda__3___closed__8;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppImplicit___lambda__2___closed__5;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppImplicit___lambda__3___closed__2;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withMDataExpr___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__2(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_skippingBinders_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_isRegularApp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -98,12 +95,12 @@ extern lean_object* l_Lean_nullKind;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabFVar___closed__4;
 uint8_t l_Lean_Expr_isMData(lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__1___closed__1;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_isRegularApp___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandCoe___closed__1;
-static lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabProj___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabConst___closed__2;
+LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__5___closed__4;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabLetE___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabDIte___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -120,7 +117,7 @@ LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Lean_PrettyPrinter_Delab
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam___lambda__3___closed__2;
 lean_object* l_Lean_getPPAnalysisNamedArg___boxed(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__10;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bindingDomain_x21(lean_object*);
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppImplicit___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -140,7 +137,6 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabDoElems___closed__2;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabFVar___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabNameMkNum(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam___lambda__3___closed__1;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__14(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBindingBody___at_Lean_PrettyPrinter_Delaborator_delabLetFun___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__15;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
@@ -150,7 +146,6 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabProjectionApp___closed
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabLetE___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_isRegularApp___lambda__4___closed__4;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__6;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabCond___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabDIte___lambda__1___closed__8;
@@ -189,6 +184,7 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam___lambda__3___clos
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBindingBody___at_Lean_PrettyPrinter_Delaborator_delabLetFun___spec__2___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_tailD___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabConst___spec__1___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_withMDataOptions(lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabFVar___closed__8;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabCond___lambda__1___closed__1;
@@ -231,6 +227,7 @@ static lean_object* l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_u
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabMData___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_reifyName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppImplicit___lambda__2___closed__4;
+static lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_reifyName___closed__1;
 static lean_object* l_List_forIn_loop___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__1___closed__2;
 lean_object* lean_string_append(lean_object*, lean_object*);
@@ -254,7 +251,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_withMDataOptions___rar
 lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getOptParamDefault_x3f(lean_object*);
 lean_object* lean_string_utf8_extract(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabMVar___closed__4;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__7;
@@ -276,6 +273,7 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabDoElems___lambda__3___
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabDo___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabDo___lambda__1___closed__4;
+static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__3;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBindingBody___at_Lean_PrettyPrinter_Delaborator_delabLetFun___spec__2___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabNamedPattern___closed__2;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabConst___spec__1(size_t, size_t, lean_object*);
@@ -284,7 +282,6 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppImplicit___lam
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__2;
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_descend___at___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_delabPatterns_usingNamesAux___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withMDataExpr___at_Lean_PrettyPrinter_Delaborator_delabMData___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabDoElems___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -343,6 +340,7 @@ LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabOfSc
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_PrettyPrinter_Delaborator_hasIdent___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabMVar___closed__3;
 static lean_object* l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_isRegularApp___spec__3___closed__4;
+static lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabDo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabCond(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabOfScientific___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -370,7 +368,6 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabFVar(lean_object*
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabNamedPattern(lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withMDataExpr___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__2___rarg___closed__2;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabOfScientific___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_delabBinders(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -380,7 +377,6 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabOfScientific___lambda_
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__9(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___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_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__17___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_PrettyPrinter_Delaborator_hasIdent___spec__1(lean_object*, lean_object*, size_t, size_t);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__6;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabCond___closed__3;
@@ -404,7 +400,6 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs_
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__12___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_hasIdent___boxed(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabNameMkStr___closed__1;
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_withMDataOptions___spec__8(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabSort___closed__14;
@@ -474,7 +469,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandCoe___lambda__
 lean_object* l_instInhabited___rarg(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_insert___at_Lean_PrettyPrinter_Delaborator_TopDownAnalyze_annotateBoolAt___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__4;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabDoElems___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -509,7 +504,6 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_descend___at_L
 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*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabFVar___closed__4;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__14___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabSigmaCore___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_skippingBinders_loop___rarg___lambda__1___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBindingBody___at___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_shouldGroupWithNext___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -597,6 +591,7 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabSort___closed__9;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabCond___lambda__1___closed__3;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabOfNat___closed__3;
+extern lean_object* l_Lean_Meta_Match_instInhabitedDiscrInfo;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLetFun___lambda__1___closed__5;
 extern lean_object* l_Lean_instInhabitedSyntax;
 uint8_t l_Lean_Expr_isConstOf(lean_object*, lean_object*);
@@ -644,7 +639,6 @@ LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___spec__2___closed__3;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabBVar___closed__2;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabAppImplicit___closed__3;
 uint8_t l_Lean_Expr_isAutoParam(lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabSigma___closed__3;
@@ -655,9 +649,10 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabSigmaCore___lambda__1_
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at_Lean_PrettyPrinter_Delaborator_delabLetE___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabFVar(lean_object*);
 lean_object* l_Lean_PrettyPrinter_Delaborator_withBindingBodyUnusedName___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabLetFun___lambda__1___closed__7;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabLam___closed__3;
+static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabSigma(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__8;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_getParamKinds___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -804,7 +799,6 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_AppMatchState_rhss___d
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabDIte(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_delabBinders___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabMData___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___closed__1;
 lean_object* l_Lean_KVMap_insertCore(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_unresolveNameGlobal_unresolveNameCore___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabMData___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -847,7 +841,6 @@ lean_object* l_Lean_getPPExplicit___boxed(lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabLit___closed__5;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabAppExplicit___closed__5;
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__16___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabOfScientific___lambda__1___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__3;
@@ -932,7 +925,6 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppImplicit(lean_
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabProjectionApp___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Lean_PrettyPrinter_Delaborator_delabForall___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_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___at___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_delabPatterns___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__16(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabBVar___closed__1;
@@ -942,6 +934,7 @@ LEAN_EXPORT lean_object* l_Array_mapIdxM_map___at___private_Lean_PrettyPrinter_D
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_lambdaTelescope___at_Lean_PrettyPrinter_Delaborator_returnsPi___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_PrettyPrinter_Delaborator_delabAppExplicit___spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabDoElems___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabForall___closed__3;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_descend___at_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -983,6 +976,7 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delabora
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabForall___lambda__2___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabConst___closed__7;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabForall___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_delabBinders___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isProp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_Extension_getMatcherInfo_x3f(lean_object*, lean_object*);
@@ -1019,7 +1013,7 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6__
 lean_object* l_Lean_Name_replacePrefix(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___spec__2___closed__4;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabDoElems___lambda__6___closed__1;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabBVar___closed__4;
 lean_object* l_Lean_PrettyPrinter_Delaborator_getPPOption(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getPPPrivateNames___boxed(lean_object*);
@@ -1039,6 +1033,7 @@ static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabMData___c
 static lean_object* l_Lean_PrettyPrinter_Delaborator_isRegularApp___lambda__3___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabConst___closed__9;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabConst___closed__8;
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabForall___closed__5;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabForall___lambda__2___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_unresolveNameGlobal___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -14411,57 +14406,11 @@ static lean_object* _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delabor
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("matchDiscr");
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(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 = lean_usize_dec_lt(x_4, x_3);
-if (x_6 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_5;
-}
-else
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; 
-x_7 = lean_array_uget(x_5, x_4);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_uset(x_5, x_4, x_8);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
-lean_inc(x_1);
-x_11 = lean_name_mk_string(x_1, x_10);
-x_12 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
-lean_inc(x_2);
-x_13 = lean_array_push(x_12, x_2);
-x_14 = lean_array_push(x_13, x_7);
-x_15 = lean_box(2);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_11);
-lean_ctor_set(x_16, 2, x_14);
-x_17 = 1;
-x_18 = lean_usize_add(x_4, x_17);
-x_19 = lean_array_uset(x_9, x_4, x_16);
-x_4 = x_18;
-x_5 = x_19;
-goto _start;
-}
-}
-}
-static lean_object* _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1() {
-_start:
-{
-lean_object* x_1; 
 x_1 = lean_mk_string("matchAlt");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2() {
+static lean_object* _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -14469,7 +14418,7 @@ x_1 = lean_mk_string("|");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3() {
+static lean_object* _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -14477,7 +14426,7 @@ x_1 = lean_mk_string("=>");
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(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_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(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) {
 _start:
 {
 uint8_t x_8; 
@@ -14503,10 +14452,10 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_9, 1);
 lean_inc(x_15);
 lean_dec(x_9);
-x_16 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1;
+x_16 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
 lean_inc(x_2);
 x_17 = lean_name_mk_string(x_2, x_16);
-x_18 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2;
+x_18 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2;
 lean_inc(x_1);
 x_19 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_19, 0, x_1);
@@ -14529,7 +14478,7 @@ x_27 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_27, 0, x_23);
 lean_ctor_set(x_27, 1, x_3);
 lean_ctor_set(x_27, 2, x_26);
-x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 lean_inc(x_1);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_1);
@@ -14550,45 +14499,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(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 = lean_usize_dec_lt(x_4, x_3);
-if (x_6 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_5;
-}
-else
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; 
-x_7 = lean_array_uget(x_5, x_4);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_uset(x_5, x_4, x_8);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
-lean_inc(x_1);
-x_11 = lean_name_mk_string(x_1, x_10);
-x_12 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
-lean_inc(x_2);
-x_13 = lean_array_push(x_12, x_2);
-x_14 = lean_array_push(x_13, x_7);
-x_15 = lean_box(2);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_11);
-lean_ctor_set(x_16, 2, x_14);
-x_17 = 1;
-x_18 = lean_usize_add(x_4, x_17);
-x_19 = lean_array_uset(x_9, x_4, x_16);
-x_4 = x_18;
-x_5 = x_19;
-goto _start;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, size_t x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, size_t x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; 
@@ -14615,10 +14526,10 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_10, 1);
 lean_inc(x_16);
 lean_dec(x_10);
-x_17 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1;
+x_17 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
 lean_inc(x_2);
 x_18 = lean_name_mk_string(x_2, x_17);
-x_19 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2;
+x_19 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2;
 lean_inc(x_1);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_1);
@@ -14641,7 +14552,7 @@ x_27 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_27, 0, x_24);
 lean_ctor_set(x_27, 1, x_3);
 lean_ctor_set(x_27, 2, x_26);
-x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 lean_inc(x_1);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_1);
@@ -14662,7 +14573,7 @@ goto _start;
 }
 }
 }
-static lean_object* _init_l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___closed__1() {
+static lean_object* _init_l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -14674,54 +14585,16 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___closed__1;
+x_2 = l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___closed__1;
 x_3 = lean_panic_fn(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__14(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 = lean_usize_dec_lt(x_4, x_3);
-if (x_6 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_5;
-}
-else
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; 
-x_7 = lean_array_uget(x_5, x_4);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_uset(x_5, x_4, x_8);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
-lean_inc(x_1);
-x_11 = lean_name_mk_string(x_1, x_10);
-x_12 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
-lean_inc(x_2);
-x_13 = lean_array_push(x_12, x_2);
-x_14 = lean_array_push(x_13, x_7);
-x_15 = lean_box(2);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_11);
-lean_ctor_set(x_16, 2, x_14);
-x_17 = 1;
-x_18 = lean_usize_add(x_4, x_17);
-x_19 = lean_array_uset(x_9, x_4, x_16);
-x_4 = x_18;
-x_5 = x_19;
-goto _start;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__15(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_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(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) {
 _start:
 {
 uint8_t x_8; 
@@ -14747,10 +14620,10 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_9, 1);
 lean_inc(x_15);
 lean_dec(x_9);
-x_16 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1;
+x_16 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
 lean_inc(x_2);
 x_17 = lean_name_mk_string(x_2, x_16);
-x_18 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2;
+x_18 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2;
 lean_inc(x_1);
 x_19 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_19, 0, x_1);
@@ -14773,7 +14646,7 @@ x_27 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_27, 0, x_23);
 lean_ctor_set(x_27, 1, x_3);
 lean_ctor_set(x_27, 2, x_26);
-x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 lean_inc(x_1);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_1);
@@ -14794,45 +14667,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__16(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 = lean_usize_dec_lt(x_4, x_3);
-if (x_6 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_5;
-}
-else
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; 
-x_7 = lean_array_uget(x_5, x_4);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_uset(x_5, x_4, x_8);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
-lean_inc(x_1);
-x_11 = lean_name_mk_string(x_1, x_10);
-x_12 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
-lean_inc(x_2);
-x_13 = lean_array_push(x_12, x_2);
-x_14 = lean_array_push(x_13, x_7);
-x_15 = lean_box(2);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_11);
-lean_ctor_set(x_16, 2, x_14);
-x_17 = 1;
-x_18 = lean_usize_add(x_4, x_17);
-x_19 = lean_array_uset(x_9, x_4, x_16);
-x_4 = x_18;
-x_5 = x_19;
-goto _start;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__17(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, size_t x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, size_t x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; 
@@ -14859,10 +14694,10 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_10, 1);
 lean_inc(x_16);
 lean_dec(x_10);
-x_17 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1;
+x_17 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1;
 lean_inc(x_2);
 x_18 = lean_name_mk_string(x_2, x_17);
-x_19 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2;
+x_19 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2;
 lean_inc(x_1);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_1);
@@ -14885,7 +14720,7 @@ x_27 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_27, 0, x_24);
 lean_ctor_set(x_27, 1, x_3);
 lean_ctor_set(x_27, 2, x_26);
-x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_28 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 lean_inc(x_1);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_1);
@@ -15122,6 +14957,34 @@ x_1 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Delaborator_delabAppMatch_
 return x_1;
 }
 }
+static lean_object* _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__3() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("matchDiscr");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
+x_2 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__3;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
+x_2 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
@@ -15515,10 +15378,10 @@ x_90 = lean_ctor_get(x_10, 1);
 lean_inc(x_90);
 x_91 = lean_nat_dec_lt(x_89, x_90);
 lean_dec(x_90);
-lean_dec(x_89);
 if (x_91 == 0)
 {
 lean_object* x_92; lean_object* x_93; lean_object* x_94; uint8_t x_95; 
+lean_dec(x_89);
 x_92 = lean_array_get_size(x_16);
 x_93 = lean_ctor_get(x_10, 2);
 lean_inc(x_93);
@@ -15680,39 +15543,150 @@ return x_128;
 else
 {
 lean_object* x_129; 
+lean_inc(x_7);
+lean_inc(x_6);
 x_129 = l_Lean_PrettyPrinter_Delaborator_delab(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 if (lean_obj_tag(x_129) == 0)
 {
-uint8_t x_130; 
-x_130 = !lean_is_exclusive(x_129);
-if (x_130 == 0)
-{
-lean_object* x_131; lean_object* x_132; 
-x_131 = lean_ctor_get(x_129, 0);
-x_132 = lean_array_push(x_14, x_131);
-lean_ctor_set(x_1, 4, x_132);
-lean_ctor_set(x_129, 0, x_1);
-return x_129;
-}
-else
-{
-lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; 
-x_133 = lean_ctor_get(x_129, 0);
-x_134 = lean_ctor_get(x_129, 1);
-lean_inc(x_134);
-lean_inc(x_133);
+lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+x_130 = lean_ctor_get(x_129, 0);
+lean_inc(x_130);
+x_131 = lean_ctor_get(x_129, 1);
+lean_inc(x_131);
 lean_dec(x_129);
-x_135 = lean_array_push(x_14, x_133);
-lean_ctor_set(x_1, 4, x_135);
-x_136 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_136, 0, x_1);
-lean_ctor_set(x_136, 1, x_134);
-return x_136;
+x_132 = lean_ctor_get(x_10, 4);
+lean_inc(x_132);
+x_133 = l_Lean_Meta_Match_instInhabitedDiscrInfo;
+x_134 = lean_array_get(x_133, x_132, x_89);
+lean_dec(x_89);
+lean_dec(x_132);
+if (lean_obj_tag(x_134) == 0)
+{
+lean_object* x_135; uint8_t x_136; 
+x_135 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_6, x_7, x_131);
+lean_dec(x_7);
+x_136 = !lean_is_exclusive(x_135);
+if (x_136 == 0)
+{
+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_137 = lean_ctor_get(x_135, 0);
+lean_dec(x_137);
+x_138 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5;
+x_139 = lean_array_push(x_138, x_130);
+x_140 = lean_box(2);
+x_141 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
+x_142 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_142, 0, x_140);
+lean_ctor_set(x_142, 1, x_141);
+lean_ctor_set(x_142, 2, x_139);
+x_143 = lean_array_push(x_14, x_142);
+lean_ctor_set(x_1, 4, x_143);
+lean_ctor_set(x_135, 0, x_1);
+return x_135;
+}
+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; lean_object* x_151; 
+x_144 = lean_ctor_get(x_135, 1);
+lean_inc(x_144);
+lean_dec(x_135);
+x_145 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5;
+x_146 = lean_array_push(x_145, x_130);
+x_147 = lean_box(2);
+x_148 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
+x_149 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_149, 0, x_147);
+lean_ctor_set(x_149, 1, x_148);
+lean_ctor_set(x_149, 2, x_146);
+x_150 = lean_array_push(x_14, x_149);
+lean_ctor_set(x_1, 4, x_150);
+x_151 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_151, 0, x_1);
+lean_ctor_set(x_151, 1, x_144);
+return x_151;
 }
 }
 else
 {
-uint8_t x_137; 
+lean_object* x_152; lean_object* x_153; uint8_t x_154; 
+x_152 = lean_ctor_get(x_134, 0);
+lean_inc(x_152);
+lean_dec(x_134);
+x_153 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_6, x_7, x_131);
+lean_dec(x_7);
+x_154 = !lean_is_exclusive(x_153);
+if (x_154 == 0)
+{
+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; 
+x_155 = lean_ctor_get(x_153, 0);
+x_156 = lean_mk_syntax_ident(x_152);
+x_157 = l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__8;
+x_158 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_158, 0, x_155);
+lean_ctor_set(x_158, 1, x_157);
+x_159 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
+x_160 = lean_array_push(x_159, x_156);
+x_161 = lean_array_push(x_160, x_158);
+x_162 = lean_box(2);
+x_163 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
+x_164 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_164, 0, x_162);
+lean_ctor_set(x_164, 1, x_163);
+lean_ctor_set(x_164, 2, x_161);
+x_165 = lean_array_push(x_159, x_164);
+x_166 = lean_array_push(x_165, x_130);
+x_167 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
+x_168 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_168, 0, x_162);
+lean_ctor_set(x_168, 1, x_167);
+lean_ctor_set(x_168, 2, x_166);
+x_169 = lean_array_push(x_14, x_168);
+lean_ctor_set(x_1, 4, x_169);
+lean_ctor_set(x_153, 0, x_1);
+return x_153;
+}
+else
+{
+lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+x_170 = lean_ctor_get(x_153, 0);
+x_171 = lean_ctor_get(x_153, 1);
+lean_inc(x_171);
+lean_inc(x_170);
+lean_dec(x_153);
+x_172 = lean_mk_syntax_ident(x_152);
+x_173 = l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__8;
+x_174 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_174, 0, x_170);
+lean_ctor_set(x_174, 1, x_173);
+x_175 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
+x_176 = lean_array_push(x_175, x_172);
+x_177 = lean_array_push(x_176, x_174);
+x_178 = lean_box(2);
+x_179 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
+x_180 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_180, 0, x_178);
+lean_ctor_set(x_180, 1, x_179);
+lean_ctor_set(x_180, 2, x_177);
+x_181 = lean_array_push(x_175, x_180);
+x_182 = lean_array_push(x_181, x_130);
+x_183 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
+x_184 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_184, 0, x_178);
+lean_ctor_set(x_184, 1, x_183);
+lean_ctor_set(x_184, 2, x_182);
+x_185 = lean_array_push(x_14, x_184);
+lean_ctor_set(x_1, 4, x_185);
+x_186 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_186, 0, x_1);
+lean_ctor_set(x_186, 1, x_171);
+return x_186;
+}
+}
+}
+else
+{
+uint8_t x_187; 
+lean_dec(x_89);
 lean_free_object(x_1);
 lean_dec(x_17);
 lean_dec(x_16);
@@ -15722,23 +15696,25 @@ lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-x_137 = !lean_is_exclusive(x_129);
-if (x_137 == 0)
+lean_dec(x_7);
+lean_dec(x_6);
+x_187 = !lean_is_exclusive(x_129);
+if (x_187 == 0)
 {
 return x_129;
 }
 else
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_129, 0);
-x_139 = lean_ctor_get(x_129, 1);
-lean_inc(x_139);
-lean_inc(x_138);
+lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_188 = lean_ctor_get(x_129, 0);
+x_189 = lean_ctor_get(x_129, 1);
+lean_inc(x_189);
+lean_inc(x_188);
 lean_dec(x_129);
-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;
+x_190 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_190, 0, x_188);
+lean_ctor_set(x_190, 1, x_189);
+return x_190;
 }
 }
 }
@@ -15746,536 +15722,249 @@ return x_140;
 }
 else
 {
-lean_object* x_141; uint8_t x_142; 
-x_141 = l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__1(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_object* x_191; uint8_t x_192; 
+x_191 = l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__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);
-x_142 = !lean_is_exclusive(x_141);
-if (x_142 == 0)
+x_192 = !lean_is_exclusive(x_191);
+if (x_192 == 0)
 {
-lean_object* x_143; lean_object* x_144; 
-x_143 = lean_ctor_get(x_141, 0);
-x_144 = lean_array_push(x_12, x_143);
-lean_ctor_set(x_1, 2, x_144);
-lean_ctor_set(x_141, 0, x_1);
-return x_141;
+lean_object* x_193; lean_object* x_194; 
+x_193 = lean_ctor_get(x_191, 0);
+x_194 = lean_array_push(x_12, x_193);
+lean_ctor_set(x_1, 2, x_194);
+lean_ctor_set(x_191, 0, x_1);
+return x_191;
 }
 else
 {
-lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
-x_145 = lean_ctor_get(x_141, 0);
-x_146 = lean_ctor_get(x_141, 1);
-lean_inc(x_146);
-lean_inc(x_145);
-lean_dec(x_141);
-x_147 = lean_array_push(x_12, x_145);
-lean_ctor_set(x_1, 2, x_147);
-x_148 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_148, 0, x_1);
-lean_ctor_set(x_148, 1, x_146);
-return x_148;
+lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+x_195 = lean_ctor_get(x_191, 0);
+x_196 = lean_ctor_get(x_191, 1);
+lean_inc(x_196);
+lean_inc(x_195);
+lean_dec(x_191);
+x_197 = lean_array_push(x_12, x_195);
+lean_ctor_set(x_1, 2, x_197);
+x_198 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_198, 0, x_1);
+lean_ctor_set(x_198, 1, x_196);
+return x_198;
 }
 }
 }
 else
 {
-lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; uint8_t 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; uint8_t x_160; 
-x_149 = lean_ctor_get(x_1, 0);
-x_150 = lean_ctor_get(x_1, 1);
-x_151 = lean_ctor_get(x_1, 2);
-x_152 = lean_ctor_get(x_1, 3);
-x_153 = lean_ctor_get_uint8(x_1, sizeof(void*)*8);
-x_154 = lean_ctor_get(x_1, 4);
-x_155 = lean_ctor_get(x_1, 5);
-x_156 = lean_ctor_get(x_1, 6);
-x_157 = lean_ctor_get(x_1, 7);
-lean_inc(x_157);
-lean_inc(x_156);
-lean_inc(x_155);
-lean_inc(x_154);
-lean_inc(x_152);
-lean_inc(x_151);
-lean_inc(x_150);
-lean_inc(x_149);
+lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; uint8_t 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; uint8_t x_210; 
+x_199 = lean_ctor_get(x_1, 0);
+x_200 = lean_ctor_get(x_1, 1);
+x_201 = lean_ctor_get(x_1, 2);
+x_202 = lean_ctor_get(x_1, 3);
+x_203 = lean_ctor_get_uint8(x_1, sizeof(void*)*8);
+x_204 = lean_ctor_get(x_1, 4);
+x_205 = lean_ctor_get(x_1, 5);
+x_206 = lean_ctor_get(x_1, 6);
+x_207 = lean_ctor_get(x_1, 7);
+lean_inc(x_207);
+lean_inc(x_206);
+lean_inc(x_205);
+lean_inc(x_204);
+lean_inc(x_202);
+lean_inc(x_201);
+lean_inc(x_200);
+lean_inc(x_199);
 lean_dec(x_1);
-x_158 = lean_array_get_size(x_151);
-x_159 = lean_ctor_get(x_149, 0);
-lean_inc(x_159);
-x_160 = lean_nat_dec_lt(x_158, x_159);
-lean_dec(x_159);
-lean_dec(x_158);
-if (x_160 == 0)
+x_208 = lean_array_get_size(x_201);
+x_209 = lean_ctor_get(x_199, 0);
+lean_inc(x_209);
+x_210 = lean_nat_dec_lt(x_208, x_209);
+lean_dec(x_209);
+lean_dec(x_208);
+if (x_210 == 0)
 {
-if (lean_obj_tag(x_152) == 0)
+if (lean_obj_tag(x_202) == 0)
 {
-lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
-x_161 = l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__1(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-x_162 = lean_ctor_get(x_161, 0);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_161, 1);
-lean_inc(x_163);
-lean_dec(x_161);
-x_164 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__1;
+lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; 
+x_211 = l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__1(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_212 = lean_ctor_get(x_211, 0);
+lean_inc(x_212);
+x_213 = lean_ctor_get(x_211, 1);
+lean_inc(x_213);
+lean_dec(x_211);
+x_214 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__1;
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_162);
-x_165 = l_Lean_Meta_lambdaTelescope___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__4___rarg(x_162, x_164, x_2, x_3, x_4, x_5, x_6, x_7, x_163);
-if (lean_obj_tag(x_165) == 0)
+lean_inc(x_212);
+x_215 = l_Lean_Meta_lambdaTelescope___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__4___rarg(x_212, x_214, x_2, x_3, x_4, x_5, x_6, x_7, x_213);
+if (lean_obj_tag(x_215) == 0)
 {
-lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; uint8_t x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; 
-x_166 = lean_ctor_get(x_2, 4);
-lean_inc(x_166);
-x_167 = lean_ctor_get(x_165, 0);
-lean_inc(x_167);
-x_168 = lean_ctor_get(x_165, 1);
-lean_inc(x_168);
-lean_dec(x_165);
-x_169 = lean_ctor_get(x_2, 0);
-lean_inc(x_169);
-x_170 = lean_ctor_get(x_2, 1);
-lean_inc(x_170);
-x_171 = lean_ctor_get(x_2, 2);
-lean_inc(x_171);
-x_172 = lean_ctor_get(x_2, 3);
-lean_inc(x_172);
-x_173 = lean_ctor_get_uint8(x_2, sizeof(void*)*5);
-x_174 = lean_ctor_get(x_166, 1);
-lean_inc(x_174);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_175 = x_166;
+lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; uint8_t x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; 
+x_216 = lean_ctor_get(x_2, 4);
+lean_inc(x_216);
+x_217 = lean_ctor_get(x_215, 0);
+lean_inc(x_217);
+x_218 = lean_ctor_get(x_215, 1);
+lean_inc(x_218);
+lean_dec(x_215);
+x_219 = lean_ctor_get(x_2, 0);
+lean_inc(x_219);
+x_220 = lean_ctor_get(x_2, 1);
+lean_inc(x_220);
+x_221 = lean_ctor_get(x_2, 2);
+lean_inc(x_221);
+x_222 = lean_ctor_get(x_2, 3);
+lean_inc(x_222);
+x_223 = lean_ctor_get_uint8(x_2, sizeof(void*)*5);
+x_224 = lean_ctor_get(x_216, 1);
+lean_inc(x_224);
+if (lean_is_exclusive(x_216)) {
+ lean_ctor_release(x_216, 0);
+ lean_ctor_release(x_216, 1);
+ x_225 = x_216;
 } else {
- lean_dec_ref(x_166);
- x_175 = lean_box(0);
+ lean_dec_ref(x_216);
+ x_225 = lean_box(0);
 }
-if (lean_is_scalar(x_175)) {
- x_176 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_225)) {
+ x_226 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_176 = x_175;
+ x_226 = x_225;
 }
-lean_ctor_set(x_176, 0, x_167);
-lean_ctor_set(x_176, 1, x_174);
-x_177 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_177, 0, x_169);
-lean_ctor_set(x_177, 1, x_170);
-lean_ctor_set(x_177, 2, x_171);
-lean_ctor_set(x_177, 3, x_172);
-lean_ctor_set(x_177, 4, x_176);
-lean_ctor_set_uint8(x_177, sizeof(void*)*5, x_173);
+lean_ctor_set(x_226, 0, x_217);
+lean_ctor_set(x_226, 1, x_224);
+x_227 = lean_alloc_ctor(0, 5, 1);
+lean_ctor_set(x_227, 0, x_219);
+lean_ctor_set(x_227, 1, x_220);
+lean_ctor_set(x_227, 2, x_221);
+lean_ctor_set(x_227, 3, x_222);
+lean_ctor_set(x_227, 4, x_226);
+lean_ctor_set_uint8(x_227, sizeof(void*)*5, x_223);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_178 = l_Lean_PrettyPrinter_Delaborator_delab(x_177, x_3, x_4, x_5, x_6, x_7, x_168);
-if (lean_obj_tag(x_178) == 0)
+x_228 = l_Lean_PrettyPrinter_Delaborator_delab(x_227, x_3, x_4, x_5, x_6, x_7, x_218);
+if (lean_obj_tag(x_228) == 0)
 {
-lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; 
-x_179 = lean_ctor_get(x_178, 0);
-lean_inc(x_179);
-x_180 = lean_ctor_get(x_178, 1);
-lean_inc(x_180);
-lean_dec(x_178);
-x_181 = l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_isRegularApp___spec__3___closed__1;
-x_182 = l_Lean_PrettyPrinter_Delaborator_getPPOption(x_181, x_2, x_3, x_4, x_5, x_6, x_7, x_180);
-if (lean_obj_tag(x_182) == 0)
-{
-lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; uint8_t x_189; lean_object* x_190; 
-x_183 = lean_ctor_get(x_182, 0);
-lean_inc(x_183);
-x_184 = lean_ctor_get(x_182, 1);
-lean_inc(x_184);
-if (lean_is_exclusive(x_182)) {
- lean_ctor_release(x_182, 0);
- lean_ctor_release(x_182, 1);
- x_185 = x_182;
-} else {
- lean_dec_ref(x_182);
- x_185 = lean_box(0);
-}
-x_186 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_186, 0, x_179);
-lean_ctor_set(x_186, 1, x_162);
-x_187 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_187, 0, x_186);
-x_188 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_188, 0, x_149);
-lean_ctor_set(x_188, 1, x_150);
-lean_ctor_set(x_188, 2, x_151);
-lean_ctor_set(x_188, 3, x_187);
-lean_ctor_set(x_188, 4, x_154);
-lean_ctor_set(x_188, 5, x_155);
-lean_ctor_set(x_188, 6, x_156);
-lean_ctor_set(x_188, 7, x_157);
-x_189 = lean_unbox(x_183);
-lean_dec(x_183);
-lean_ctor_set_uint8(x_188, sizeof(void*)*8, x_189);
-if (lean_is_scalar(x_185)) {
- x_190 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_190 = x_185;
-}
-lean_ctor_set(x_190, 0, x_188);
-lean_ctor_set(x_190, 1, x_184);
-return x_190;
-}
-else
-{
-lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
-lean_dec(x_179);
-lean_dec(x_162);
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_151);
-lean_dec(x_150);
-lean_dec(x_149);
-x_191 = lean_ctor_get(x_182, 0);
-lean_inc(x_191);
-x_192 = lean_ctor_get(x_182, 1);
-lean_inc(x_192);
-if (lean_is_exclusive(x_182)) {
- lean_ctor_release(x_182, 0);
- lean_ctor_release(x_182, 1);
- x_193 = x_182;
-} else {
- lean_dec_ref(x_182);
- x_193 = lean_box(0);
-}
-if (lean_is_scalar(x_193)) {
- x_194 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_194 = x_193;
-}
-lean_ctor_set(x_194, 0, x_191);
-lean_ctor_set(x_194, 1, x_192);
-return x_194;
-}
-}
-else
-{
-lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
-lean_dec(x_162);
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_151);
-lean_dec(x_150);
-lean_dec(x_149);
-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_195 = lean_ctor_get(x_178, 0);
-lean_inc(x_195);
-x_196 = lean_ctor_get(x_178, 1);
-lean_inc(x_196);
-if (lean_is_exclusive(x_178)) {
- lean_ctor_release(x_178, 0);
- lean_ctor_release(x_178, 1);
- x_197 = x_178;
-} else {
- lean_dec_ref(x_178);
- 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;
-}
-}
-else
-{
-lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
-lean_dec(x_162);
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_151);
-lean_dec(x_150);
-lean_dec(x_149);
-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_199 = lean_ctor_get(x_165, 0);
-lean_inc(x_199);
-x_200 = lean_ctor_get(x_165, 1);
-lean_inc(x_200);
-if (lean_is_exclusive(x_165)) {
- lean_ctor_release(x_165, 0);
- lean_ctor_release(x_165, 1);
- x_201 = x_165;
-} else {
- lean_dec_ref(x_165);
- x_201 = lean_box(0);
-}
-if (lean_is_scalar(x_201)) {
- x_202 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_202 = x_201;
-}
-lean_ctor_set(x_202, 0, x_199);
-lean_ctor_set(x_202, 1, x_200);
-return x_202;
-}
-}
-else
-{
-lean_object* x_203; lean_object* x_204; uint8_t x_205; 
-x_203 = lean_array_get_size(x_154);
-x_204 = lean_ctor_get(x_149, 1);
-lean_inc(x_204);
-x_205 = lean_nat_dec_lt(x_203, x_204);
-lean_dec(x_204);
-lean_dec(x_203);
-if (x_205 == 0)
-{
-lean_object* x_206; lean_object* x_207; lean_object* x_208; uint8_t x_209; 
-x_206 = lean_array_get_size(x_156);
-x_207 = lean_ctor_get(x_149, 2);
-lean_inc(x_207);
-x_208 = lean_array_get_size(x_207);
-x_209 = lean_nat_dec_lt(x_206, x_208);
-lean_dec(x_208);
-if (x_209 == 0)
-{
-lean_object* x_210; 
-lean_dec(x_207);
-lean_dec(x_206);
-x_210 = l_Lean_PrettyPrinter_Delaborator_delab(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_210) == 0)
-{
-lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; 
-x_211 = lean_ctor_get(x_210, 0);
-lean_inc(x_211);
-x_212 = lean_ctor_get(x_210, 1);
-lean_inc(x_212);
-if (lean_is_exclusive(x_210)) {
- lean_ctor_release(x_210, 0);
- lean_ctor_release(x_210, 1);
- x_213 = x_210;
-} else {
- lean_dec_ref(x_210);
- x_213 = lean_box(0);
-}
-x_214 = lean_array_push(x_157, x_211);
-x_215 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_215, 0, x_149);
-lean_ctor_set(x_215, 1, x_150);
-lean_ctor_set(x_215, 2, x_151);
-lean_ctor_set(x_215, 3, x_152);
-lean_ctor_set(x_215, 4, x_154);
-lean_ctor_set(x_215, 5, x_155);
-lean_ctor_set(x_215, 6, x_156);
-lean_ctor_set(x_215, 7, x_214);
-lean_ctor_set_uint8(x_215, sizeof(void*)*8, x_153);
-if (lean_is_scalar(x_213)) {
- x_216 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_216 = x_213;
-}
-lean_ctor_set(x_216, 0, x_215);
-lean_ctor_set(x_216, 1, x_212);
-return x_216;
-}
-else
-{
-lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; 
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_152);
-lean_dec(x_151);
-lean_dec(x_150);
-lean_dec(x_149);
-x_217 = lean_ctor_get(x_210, 0);
-lean_inc(x_217);
-x_218 = lean_ctor_get(x_210, 1);
-lean_inc(x_218);
-if (lean_is_exclusive(x_210)) {
- lean_ctor_release(x_210, 0);
- lean_ctor_release(x_210, 1);
- x_219 = x_210;
-} else {
- lean_dec_ref(x_210);
- x_219 = lean_box(0);
-}
-if (lean_is_scalar(x_219)) {
- x_220 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_220 = x_219;
-}
-lean_ctor_set(x_220, 0, x_217);
-lean_ctor_set(x_220, 1, x_218);
-return x_220;
-}
-}
-else
-{
-lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; 
-x_221 = l_instInhabitedNat;
-x_222 = lean_array_get(x_221, x_207, x_206);
-lean_dec(x_206);
-lean_dec(x_207);
-x_223 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__2;
-x_224 = l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_skippingBinders___rarg(x_222, x_223, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(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; 
-x_225 = lean_ctor_get(x_224, 0);
-lean_inc(x_225);
-x_226 = lean_ctor_get(x_224, 1);
-lean_inc(x_226);
-if (lean_is_exclusive(x_224)) {
- lean_ctor_release(x_224, 0);
- lean_ctor_release(x_224, 1);
- x_227 = x_224;
-} else {
- lean_dec_ref(x_224);
- x_227 = lean_box(0);
-}
-x_228 = lean_ctor_get(x_225, 0);
-lean_inc(x_228);
-x_229 = lean_ctor_get(x_225, 1);
+lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; 
+x_229 = lean_ctor_get(x_228, 0);
 lean_inc(x_229);
-lean_dec(x_225);
-x_230 = lean_array_push(x_155, x_228);
-x_231 = lean_array_push(x_156, x_229);
-x_232 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_232, 0, x_149);
-lean_ctor_set(x_232, 1, x_150);
-lean_ctor_set(x_232, 2, x_151);
-lean_ctor_set(x_232, 3, x_152);
-lean_ctor_set(x_232, 4, x_154);
-lean_ctor_set(x_232, 5, x_230);
-lean_ctor_set(x_232, 6, x_231);
-lean_ctor_set(x_232, 7, x_157);
-lean_ctor_set_uint8(x_232, sizeof(void*)*8, x_153);
-if (lean_is_scalar(x_227)) {
- x_233 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_233 = x_227;
-}
-lean_ctor_set(x_233, 0, x_232);
-lean_ctor_set(x_233, 1, x_226);
-return x_233;
-}
-else
+x_230 = lean_ctor_get(x_228, 1);
+lean_inc(x_230);
+lean_dec(x_228);
+x_231 = l_Std_Range_forIn_loop___at_Lean_PrettyPrinter_Delaborator_isRegularApp___spec__3___closed__1;
+x_232 = l_Lean_PrettyPrinter_Delaborator_getPPOption(x_231, x_2, x_3, x_4, x_5, x_6, x_7, x_230);
+if (lean_obj_tag(x_232) == 0)
 {
-lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; 
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_152);
-lean_dec(x_151);
-lean_dec(x_150);
-lean_dec(x_149);
-x_234 = lean_ctor_get(x_224, 0);
+lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; uint8_t x_239; lean_object* x_240; 
+x_233 = lean_ctor_get(x_232, 0);
+lean_inc(x_233);
+x_234 = lean_ctor_get(x_232, 1);
 lean_inc(x_234);
-x_235 = lean_ctor_get(x_224, 1);
-lean_inc(x_235);
-if (lean_is_exclusive(x_224)) {
- lean_ctor_release(x_224, 0);
- lean_ctor_release(x_224, 1);
- x_236 = x_224;
+if (lean_is_exclusive(x_232)) {
+ lean_ctor_release(x_232, 0);
+ lean_ctor_release(x_232, 1);
+ x_235 = x_232;
 } else {
- lean_dec_ref(x_224);
- x_236 = lean_box(0);
+ lean_dec_ref(x_232);
+ x_235 = lean_box(0);
 }
-if (lean_is_scalar(x_236)) {
- x_237 = lean_alloc_ctor(1, 2, 0);
+x_236 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_236, 0, x_229);
+lean_ctor_set(x_236, 1, x_212);
+x_237 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_237, 0, x_236);
+x_238 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_238, 0, x_199);
+lean_ctor_set(x_238, 1, x_200);
+lean_ctor_set(x_238, 2, x_201);
+lean_ctor_set(x_238, 3, x_237);
+lean_ctor_set(x_238, 4, x_204);
+lean_ctor_set(x_238, 5, x_205);
+lean_ctor_set(x_238, 6, x_206);
+lean_ctor_set(x_238, 7, x_207);
+x_239 = lean_unbox(x_233);
+lean_dec(x_233);
+lean_ctor_set_uint8(x_238, sizeof(void*)*8, x_239);
+if (lean_is_scalar(x_235)) {
+ x_240 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_237 = x_236;
-}
-lean_ctor_set(x_237, 0, x_234);
-lean_ctor_set(x_237, 1, x_235);
-return x_237;
-}
+ x_240 = x_235;
 }
+lean_ctor_set(x_240, 0, x_238);
+lean_ctor_set(x_240, 1, x_234);
+return x_240;
 }
 else
 {
-lean_object* x_238; 
-x_238 = l_Lean_PrettyPrinter_Delaborator_delab(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_238) == 0)
-{
-lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; 
-x_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;
+lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; 
+lean_dec(x_229);
+lean_dec(x_212);
+lean_dec(x_207);
+lean_dec(x_206);
+lean_dec(x_205);
+lean_dec(x_204);
+lean_dec(x_201);
+lean_dec(x_200);
+lean_dec(x_199);
+x_241 = lean_ctor_get(x_232, 0);
+lean_inc(x_241);
+x_242 = lean_ctor_get(x_232, 1);
+lean_inc(x_242);
+if (lean_is_exclusive(x_232)) {
+ lean_ctor_release(x_232, 0);
+ lean_ctor_release(x_232, 1);
+ x_243 = x_232;
 } else {
- lean_dec_ref(x_238);
- x_241 = lean_box(0);
+ lean_dec_ref(x_232);
+ x_243 = lean_box(0);
 }
-x_242 = lean_array_push(x_154, x_239);
-x_243 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_243, 0, x_149);
-lean_ctor_set(x_243, 1, x_150);
-lean_ctor_set(x_243, 2, x_151);
-lean_ctor_set(x_243, 3, x_152);
-lean_ctor_set(x_243, 4, x_242);
-lean_ctor_set(x_243, 5, x_155);
-lean_ctor_set(x_243, 6, x_156);
-lean_ctor_set(x_243, 7, x_157);
-lean_ctor_set_uint8(x_243, sizeof(void*)*8, x_153);
-if (lean_is_scalar(x_241)) {
- x_244 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_243)) {
+ x_244 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_244 = x_241;
+ x_244 = x_243;
 }
-lean_ctor_set(x_244, 0, x_243);
-lean_ctor_set(x_244, 1, x_240);
+lean_ctor_set(x_244, 0, x_241);
+lean_ctor_set(x_244, 1, x_242);
 return x_244;
 }
+}
 else
 {
 lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; 
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_152);
-lean_dec(x_151);
-lean_dec(x_150);
-lean_dec(x_149);
-x_245 = lean_ctor_get(x_238, 0);
+lean_dec(x_212);
+lean_dec(x_207);
+lean_dec(x_206);
+lean_dec(x_205);
+lean_dec(x_204);
+lean_dec(x_201);
+lean_dec(x_200);
+lean_dec(x_199);
+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_245 = lean_ctor_get(x_228, 0);
 lean_inc(x_245);
-x_246 = lean_ctor_get(x_238, 1);
+x_246 = lean_ctor_get(x_228, 1);
 lean_inc(x_246);
-if (lean_is_exclusive(x_238)) {
- lean_ctor_release(x_238, 0);
- lean_ctor_release(x_238, 1);
- x_247 = x_238;
+if (lean_is_exclusive(x_228)) {
+ lean_ctor_release(x_228, 0);
+ lean_ctor_release(x_228, 1);
+ x_247 = x_228;
 } else {
- lean_dec_ref(x_238);
+ lean_dec_ref(x_228);
  x_247 = lean_box(0);
 }
 if (lean_is_scalar(x_247)) {
@@ -16288,49 +15977,425 @@ lean_ctor_set(x_248, 1, x_246);
 return x_248;
 }
 }
-}
-}
 else
 {
-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; 
-x_249 = l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__1(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; 
+lean_dec(x_212);
+lean_dec(x_207);
+lean_dec(x_206);
+lean_dec(x_205);
+lean_dec(x_204);
+lean_dec(x_201);
+lean_dec(x_200);
+lean_dec(x_199);
 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_250 = lean_ctor_get(x_249, 0);
+x_249 = lean_ctor_get(x_215, 0);
+lean_inc(x_249);
+x_250 = lean_ctor_get(x_215, 1);
 lean_inc(x_250);
-x_251 = lean_ctor_get(x_249, 1);
-lean_inc(x_251);
-if (lean_is_exclusive(x_249)) {
- lean_ctor_release(x_249, 0);
- lean_ctor_release(x_249, 1);
- x_252 = x_249;
+if (lean_is_exclusive(x_215)) {
+ lean_ctor_release(x_215, 0);
+ lean_ctor_release(x_215, 1);
+ x_251 = x_215;
 } else {
- lean_dec_ref(x_249);
- x_252 = lean_box(0);
+ lean_dec_ref(x_215);
+ x_251 = lean_box(0);
 }
-x_253 = lean_array_push(x_151, x_250);
-x_254 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_254, 0, x_149);
-lean_ctor_set(x_254, 1, x_150);
-lean_ctor_set(x_254, 2, x_253);
-lean_ctor_set(x_254, 3, x_152);
-lean_ctor_set(x_254, 4, x_154);
-lean_ctor_set(x_254, 5, x_155);
-lean_ctor_set(x_254, 6, x_156);
-lean_ctor_set(x_254, 7, x_157);
-lean_ctor_set_uint8(x_254, sizeof(void*)*8, x_153);
-if (lean_is_scalar(x_252)) {
- x_255 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_251)) {
+ x_252 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_255 = x_252;
+ x_252 = x_251;
 }
-lean_ctor_set(x_255, 0, x_254);
-lean_ctor_set(x_255, 1, x_251);
-return x_255;
+lean_ctor_set(x_252, 0, x_249);
+lean_ctor_set(x_252, 1, x_250);
+return x_252;
+}
+}
+else
+{
+lean_object* x_253; lean_object* x_254; uint8_t x_255; 
+x_253 = lean_array_get_size(x_204);
+x_254 = lean_ctor_get(x_199, 1);
+lean_inc(x_254);
+x_255 = lean_nat_dec_lt(x_253, x_254);
+lean_dec(x_254);
+if (x_255 == 0)
+{
+lean_object* x_256; lean_object* x_257; lean_object* x_258; uint8_t x_259; 
+lean_dec(x_253);
+x_256 = lean_array_get_size(x_206);
+x_257 = lean_ctor_get(x_199, 2);
+lean_inc(x_257);
+x_258 = lean_array_get_size(x_257);
+x_259 = lean_nat_dec_lt(x_256, x_258);
+lean_dec(x_258);
+if (x_259 == 0)
+{
+lean_object* x_260; 
+lean_dec(x_257);
+lean_dec(x_256);
+x_260 = l_Lean_PrettyPrinter_Delaborator_delab(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_260) == 0)
+{
+lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; 
+x_261 = lean_ctor_get(x_260, 0);
+lean_inc(x_261);
+x_262 = lean_ctor_get(x_260, 1);
+lean_inc(x_262);
+if (lean_is_exclusive(x_260)) {
+ lean_ctor_release(x_260, 0);
+ lean_ctor_release(x_260, 1);
+ x_263 = x_260;
+} else {
+ lean_dec_ref(x_260);
+ x_263 = lean_box(0);
+}
+x_264 = lean_array_push(x_207, x_261);
+x_265 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_265, 0, x_199);
+lean_ctor_set(x_265, 1, x_200);
+lean_ctor_set(x_265, 2, x_201);
+lean_ctor_set(x_265, 3, x_202);
+lean_ctor_set(x_265, 4, x_204);
+lean_ctor_set(x_265, 5, x_205);
+lean_ctor_set(x_265, 6, x_206);
+lean_ctor_set(x_265, 7, x_264);
+lean_ctor_set_uint8(x_265, sizeof(void*)*8, x_203);
+if (lean_is_scalar(x_263)) {
+ x_266 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_266 = x_263;
+}
+lean_ctor_set(x_266, 0, x_265);
+lean_ctor_set(x_266, 1, x_262);
+return x_266;
+}
+else
+{
+lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; 
+lean_dec(x_207);
+lean_dec(x_206);
+lean_dec(x_205);
+lean_dec(x_204);
+lean_dec(x_202);
+lean_dec(x_201);
+lean_dec(x_200);
+lean_dec(x_199);
+x_267 = lean_ctor_get(x_260, 0);
+lean_inc(x_267);
+x_268 = lean_ctor_get(x_260, 1);
+lean_inc(x_268);
+if (lean_is_exclusive(x_260)) {
+ lean_ctor_release(x_260, 0);
+ lean_ctor_release(x_260, 1);
+ x_269 = x_260;
+} else {
+ lean_dec_ref(x_260);
+ x_269 = lean_box(0);
+}
+if (lean_is_scalar(x_269)) {
+ x_270 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_270 = x_269;
+}
+lean_ctor_set(x_270, 0, x_267);
+lean_ctor_set(x_270, 1, x_268);
+return x_270;
+}
+}
+else
+{
+lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
+x_271 = l_instInhabitedNat;
+x_272 = lean_array_get(x_271, x_257, x_256);
+lean_dec(x_256);
+lean_dec(x_257);
+x_273 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__2;
+x_274 = l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_skippingBinders___rarg(x_272, x_273, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_274) == 0)
+{
+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; 
+x_275 = lean_ctor_get(x_274, 0);
+lean_inc(x_275);
+x_276 = lean_ctor_get(x_274, 1);
+lean_inc(x_276);
+if (lean_is_exclusive(x_274)) {
+ lean_ctor_release(x_274, 0);
+ lean_ctor_release(x_274, 1);
+ x_277 = x_274;
+} else {
+ lean_dec_ref(x_274);
+ x_277 = lean_box(0);
+}
+x_278 = lean_ctor_get(x_275, 0);
+lean_inc(x_278);
+x_279 = lean_ctor_get(x_275, 1);
+lean_inc(x_279);
+lean_dec(x_275);
+x_280 = lean_array_push(x_205, x_278);
+x_281 = lean_array_push(x_206, x_279);
+x_282 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_282, 0, x_199);
+lean_ctor_set(x_282, 1, x_200);
+lean_ctor_set(x_282, 2, x_201);
+lean_ctor_set(x_282, 3, x_202);
+lean_ctor_set(x_282, 4, x_204);
+lean_ctor_set(x_282, 5, x_280);
+lean_ctor_set(x_282, 6, x_281);
+lean_ctor_set(x_282, 7, x_207);
+lean_ctor_set_uint8(x_282, sizeof(void*)*8, x_203);
+if (lean_is_scalar(x_277)) {
+ x_283 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_283 = x_277;
+}
+lean_ctor_set(x_283, 0, x_282);
+lean_ctor_set(x_283, 1, x_276);
+return x_283;
+}
+else
+{
+lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; 
+lean_dec(x_207);
+lean_dec(x_206);
+lean_dec(x_205);
+lean_dec(x_204);
+lean_dec(x_202);
+lean_dec(x_201);
+lean_dec(x_200);
+lean_dec(x_199);
+x_284 = lean_ctor_get(x_274, 0);
+lean_inc(x_284);
+x_285 = lean_ctor_get(x_274, 1);
+lean_inc(x_285);
+if (lean_is_exclusive(x_274)) {
+ lean_ctor_release(x_274, 0);
+ lean_ctor_release(x_274, 1);
+ x_286 = x_274;
+} else {
+ lean_dec_ref(x_274);
+ x_286 = lean_box(0);
+}
+if (lean_is_scalar(x_286)) {
+ x_287 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_287 = x_286;
+}
+lean_ctor_set(x_287, 0, x_284);
+lean_ctor_set(x_287, 1, x_285);
+return x_287;
+}
+}
+}
+else
+{
+lean_object* x_288; 
+lean_inc(x_7);
+lean_inc(x_6);
+x_288 = l_Lean_PrettyPrinter_Delaborator_delab(x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_288) == 0)
+{
+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_288, 0);
+lean_inc(x_289);
+x_290 = lean_ctor_get(x_288, 1);
+lean_inc(x_290);
+lean_dec(x_288);
+x_291 = lean_ctor_get(x_199, 4);
+lean_inc(x_291);
+x_292 = l_Lean_Meta_Match_instInhabitedDiscrInfo;
+x_293 = lean_array_get(x_292, x_291, x_253);
+lean_dec(x_253);
+lean_dec(x_291);
+if (lean_obj_tag(x_293) == 0)
+{
+lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; 
+x_294 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_6, x_7, x_290);
+lean_dec(x_7);
+x_295 = lean_ctor_get(x_294, 1);
+lean_inc(x_295);
+if (lean_is_exclusive(x_294)) {
+ lean_ctor_release(x_294, 0);
+ lean_ctor_release(x_294, 1);
+ x_296 = x_294;
+} else {
+ lean_dec_ref(x_294);
+ x_296 = lean_box(0);
+}
+x_297 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5;
+x_298 = lean_array_push(x_297, x_289);
+x_299 = lean_box(2);
+x_300 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
+x_301 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_301, 0, x_299);
+lean_ctor_set(x_301, 1, x_300);
+lean_ctor_set(x_301, 2, x_298);
+x_302 = lean_array_push(x_204, x_301);
+x_303 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_303, 0, x_199);
+lean_ctor_set(x_303, 1, x_200);
+lean_ctor_set(x_303, 2, x_201);
+lean_ctor_set(x_303, 3, x_202);
+lean_ctor_set(x_303, 4, x_302);
+lean_ctor_set(x_303, 5, x_205);
+lean_ctor_set(x_303, 6, x_206);
+lean_ctor_set(x_303, 7, x_207);
+lean_ctor_set_uint8(x_303, sizeof(void*)*8, x_203);
+if (lean_is_scalar(x_296)) {
+ x_304 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_304 = x_296;
+}
+lean_ctor_set(x_304, 0, x_303);
+lean_ctor_set(x_304, 1, x_295);
+return x_304;
+}
+else
+{
+lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; 
+x_305 = lean_ctor_get(x_293, 0);
+lean_inc(x_305);
+lean_dec(x_293);
+x_306 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_6, x_7, x_290);
+lean_dec(x_7);
+x_307 = lean_ctor_get(x_306, 0);
+lean_inc(x_307);
+x_308 = lean_ctor_get(x_306, 1);
+lean_inc(x_308);
+if (lean_is_exclusive(x_306)) {
+ lean_ctor_release(x_306, 0);
+ lean_ctor_release(x_306, 1);
+ x_309 = x_306;
+} else {
+ lean_dec_ref(x_306);
+ x_309 = lean_box(0);
+}
+x_310 = lean_mk_syntax_ident(x_305);
+x_311 = l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__4___closed__8;
+x_312 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_312, 0, x_307);
+lean_ctor_set(x_312, 1, x_311);
+x_313 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__11;
+x_314 = lean_array_push(x_313, x_310);
+x_315 = lean_array_push(x_314, x_312);
+x_316 = lean_box(2);
+x_317 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
+x_318 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_318, 0, x_316);
+lean_ctor_set(x_318, 1, x_317);
+lean_ctor_set(x_318, 2, x_315);
+x_319 = lean_array_push(x_313, x_318);
+x_320 = lean_array_push(x_319, x_289);
+x_321 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4;
+x_322 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_322, 0, x_316);
+lean_ctor_set(x_322, 1, x_321);
+lean_ctor_set(x_322, 2, x_320);
+x_323 = lean_array_push(x_204, x_322);
+x_324 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_324, 0, x_199);
+lean_ctor_set(x_324, 1, x_200);
+lean_ctor_set(x_324, 2, x_201);
+lean_ctor_set(x_324, 3, x_202);
+lean_ctor_set(x_324, 4, x_323);
+lean_ctor_set(x_324, 5, x_205);
+lean_ctor_set(x_324, 6, x_206);
+lean_ctor_set(x_324, 7, x_207);
+lean_ctor_set_uint8(x_324, sizeof(void*)*8, x_203);
+if (lean_is_scalar(x_309)) {
+ x_325 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_325 = x_309;
+}
+lean_ctor_set(x_325, 0, x_324);
+lean_ctor_set(x_325, 1, x_308);
+return x_325;
+}
+}
+else
+{
+lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; 
+lean_dec(x_253);
+lean_dec(x_207);
+lean_dec(x_206);
+lean_dec(x_205);
+lean_dec(x_204);
+lean_dec(x_202);
+lean_dec(x_201);
+lean_dec(x_200);
+lean_dec(x_199);
+lean_dec(x_7);
+lean_dec(x_6);
+x_326 = lean_ctor_get(x_288, 0);
+lean_inc(x_326);
+x_327 = lean_ctor_get(x_288, 1);
+lean_inc(x_327);
+if (lean_is_exclusive(x_288)) {
+ lean_ctor_release(x_288, 0);
+ lean_ctor_release(x_288, 1);
+ x_328 = x_288;
+} else {
+ lean_dec_ref(x_288);
+ x_328 = lean_box(0);
+}
+if (lean_is_scalar(x_328)) {
+ x_329 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_329 = x_328;
+}
+lean_ctor_set(x_329, 0, x_326);
+lean_ctor_set(x_329, 1, x_327);
+return x_329;
+}
+}
+}
+}
+else
+{
+lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; 
+x_330 = l_Lean_PrettyPrinter_Delaborator_SubExpr_getExpr___at_Lean_PrettyPrinter_Delaborator_getExprKind___spec__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);
+x_331 = lean_ctor_get(x_330, 0);
+lean_inc(x_331);
+x_332 = lean_ctor_get(x_330, 1);
+lean_inc(x_332);
+if (lean_is_exclusive(x_330)) {
+ lean_ctor_release(x_330, 0);
+ lean_ctor_release(x_330, 1);
+ x_333 = x_330;
+} else {
+ lean_dec_ref(x_330);
+ x_333 = lean_box(0);
+}
+x_334 = lean_array_push(x_201, x_331);
+x_335 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_335, 0, x_199);
+lean_ctor_set(x_335, 1, x_200);
+lean_ctor_set(x_335, 2, x_334);
+lean_ctor_set(x_335, 3, x_202);
+lean_ctor_set(x_335, 4, x_204);
+lean_ctor_set(x_335, 5, x_205);
+lean_ctor_set(x_335, 6, x_206);
+lean_ctor_set(x_335, 7, x_207);
+lean_ctor_set_uint8(x_335, sizeof(void*)*8, x_203);
+if (lean_is_scalar(x_333)) {
+ x_336 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_336 = x_333;
+}
+lean_ctor_set(x_336, 0, x_335);
+lean_ctor_set(x_336, 1, x_332);
+return x_336;
 }
 }
 }
@@ -16503,7 +16568,7 @@ if (lean_obj_tag(x_135) == 0)
 {
 lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
 x_136 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__10;
-x_137 = l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(x_136);
+x_137 = l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(x_136);
 x_138 = lean_ctor_get(x_137, 0);
 lean_inc(x_138);
 x_139 = lean_ctor_get(x_137, 1);
@@ -16603,7 +16668,7 @@ block_125:
 {
 if (x_25 == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; size_t x_33; size_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; size_t x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; size_t x_33; size_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; size_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
 lean_dec(x_21);
 lean_inc(x_7);
 x_27 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_7, x_8, x_26);
@@ -16621,54 +16686,54 @@ x_32 = lean_array_get_size(x_11);
 x_33 = lean_usize_of_nat(x_32);
 lean_dec(x_32);
 x_34 = 0;
-x_35 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
-x_36 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
-x_37 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(x_35, x_36, x_33, x_34, x_11);
-x_38 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
-x_39 = l_Lean_mkSepArray(x_37, x_38);
-lean_dec(x_37);
-x_40 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
-x_41 = l_Array_append___rarg(x_40, x_39);
-x_42 = lean_box(2);
-x_43 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
-x_44 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_43);
-lean_ctor_set(x_44, 2, x_41);
-x_45 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
+x_35 = l_Array_mapMUnsafe_map___at___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___spec__3(x_33, x_34, x_11);
+x_36 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
+x_37 = l_Lean_mkSepArray(x_35, x_36);
+lean_dec(x_35);
+x_38 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
+x_39 = l_Array_append___rarg(x_38, x_37);
+x_40 = lean_box(2);
+x_41 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
+x_42 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+lean_ctor_set(x_42, 2, x_39);
+x_43 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
 lean_inc(x_28);
-x_46 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_46, 0, x_28);
-lean_ctor_set(x_46, 1, x_45);
-x_47 = l_Array_zip___rarg(x_19, x_10);
+x_44 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_44, 0, x_28);
+lean_ctor_set(x_44, 1, x_43);
+x_45 = l_Array_zip___rarg(x_19, x_10);
 lean_dec(x_10);
 lean_dec(x_19);
-x_48 = lean_array_get_size(x_47);
-x_49 = lean_usize_of_nat(x_48);
-lean_dec(x_48);
-x_50 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(x_28, x_35, x_43, x_40, x_49, x_34, x_47);
-x_51 = l_Array_append___rarg(x_40, x_50);
-x_52 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_52, 0, x_42);
-lean_ctor_set(x_52, 1, x_43);
-lean_ctor_set(x_52, 2, x_51);
-x_53 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__6;
-x_54 = lean_array_push(x_53, x_52);
-x_55 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
-x_56 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_56, 0, x_42);
-lean_ctor_set(x_56, 1, x_55);
-lean_ctor_set(x_56, 2, x_54);
-x_57 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
-x_58 = lean_array_push(x_57, x_31);
-x_59 = lean_array_push(x_58, x_36);
-x_60 = lean_array_push(x_59, x_36);
-x_61 = lean_array_push(x_60, x_44);
-x_62 = lean_array_push(x_61, x_46);
-x_63 = lean_array_push(x_62, x_56);
+x_46 = lean_array_get_size(x_45);
+x_47 = lean_usize_of_nat(x_46);
+lean_dec(x_46);
+x_48 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
+x_49 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(x_28, x_48, x_41, x_38, x_47, x_34, x_45);
+x_50 = l_Array_append___rarg(x_38, x_49);
+x_51 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_51, 0, x_40);
+lean_ctor_set(x_51, 1, x_41);
+lean_ctor_set(x_51, 2, x_50);
+x_52 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__6;
+x_53 = lean_array_push(x_52, x_51);
+x_54 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
+x_55 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_55, 0, x_40);
+lean_ctor_set(x_55, 1, x_54);
+lean_ctor_set(x_55, 2, x_53);
+x_56 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
+x_57 = lean_array_push(x_56, x_31);
+x_58 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
+x_59 = lean_array_push(x_57, x_58);
+x_60 = lean_array_push(x_59, x_58);
+x_61 = lean_array_push(x_60, x_42);
+x_62 = lean_array_push(x_61, x_44);
+x_63 = lean_array_push(x_62, x_55);
 x_64 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__2;
 x_65 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_65, 0, x_42);
+lean_ctor_set(x_65, 0, x_40);
 lean_ctor_set(x_65, 1, x_64);
 lean_ctor_set(x_65, 2, x_63);
 x_66 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__5(x_1, x_65, x_3, x_4, x_5, x_6, x_7, x_8, x_29);
@@ -16682,7 +16747,7 @@ return x_66;
 }
 else
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; size_t x_94; size_t x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; size_t x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 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_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; size_t x_94; size_t x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; size_t x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
 lean_inc(x_7);
 x_67 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_7, x_8, x_26);
 x_68 = lean_ctor_get(x_67, 0);
@@ -16738,48 +16803,48 @@ x_93 = lean_array_get_size(x_11);
 x_94 = lean_usize_of_nat(x_93);
 lean_dec(x_93);
 x_95 = 0;
-x_96 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
-x_97 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
-x_98 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(x_96, x_97, x_94, x_95, x_11);
-x_99 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
-x_100 = l_Lean_mkSepArray(x_98, x_99);
-lean_dec(x_98);
-x_101 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
-x_102 = l_Array_append___rarg(x_101, x_100);
-x_103 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_103, 0, x_86);
-lean_ctor_set(x_103, 1, x_91);
-lean_ctor_set(x_103, 2, x_102);
-x_104 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
+x_96 = l_Array_mapMUnsafe_map___at___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___spec__3(x_94, x_95, x_11);
+x_97 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
+x_98 = l_Lean_mkSepArray(x_96, x_97);
+lean_dec(x_96);
+x_99 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
+x_100 = l_Array_append___rarg(x_99, x_98);
+x_101 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_101, 0, x_86);
+lean_ctor_set(x_101, 1, x_91);
+lean_ctor_set(x_101, 2, x_100);
+x_102 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
 lean_inc(x_68);
-x_105 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_105, 0, x_68);
-lean_ctor_set(x_105, 1, x_104);
-x_106 = l_Array_zip___rarg(x_19, x_10);
+x_103 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_103, 0, x_68);
+lean_ctor_set(x_103, 1, x_102);
+x_104 = l_Array_zip___rarg(x_19, x_10);
 lean_dec(x_10);
 lean_dec(x_19);
-x_107 = lean_array_get_size(x_106);
-x_108 = lean_usize_of_nat(x_107);
-lean_dec(x_107);
-x_109 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(x_68, x_96, x_91, x_101, x_89, x_108, x_95, x_106);
-x_110 = l_Array_append___rarg(x_101, x_109);
-x_111 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_111, 0, x_86);
-lean_ctor_set(x_111, 1, x_91);
-lean_ctor_set(x_111, 2, x_110);
-x_112 = lean_array_push(x_89, x_111);
-x_113 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
-x_114 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_114, 0, x_86);
-lean_ctor_set(x_114, 1, x_113);
-lean_ctor_set(x_114, 2, x_112);
-x_115 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
-x_116 = lean_array_push(x_115, x_71);
-x_117 = lean_array_push(x_116, x_97);
+x_105 = lean_array_get_size(x_104);
+x_106 = lean_usize_of_nat(x_105);
+lean_dec(x_105);
+x_107 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
+x_108 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(x_68, x_107, x_91, x_99, x_89, x_106, x_95, x_104);
+x_109 = l_Array_append___rarg(x_99, x_108);
+x_110 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_110, 0, x_86);
+lean_ctor_set(x_110, 1, x_91);
+lean_ctor_set(x_110, 2, x_109);
+x_111 = lean_array_push(x_89, x_110);
+x_112 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
+x_113 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_113, 0, x_86);
+lean_ctor_set(x_113, 1, x_112);
+lean_ctor_set(x_113, 2, x_111);
+x_114 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
+x_115 = lean_array_push(x_114, x_71);
+x_116 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
+x_117 = lean_array_push(x_115, x_116);
 x_118 = lean_array_push(x_117, x_92);
-x_119 = lean_array_push(x_118, x_103);
-x_120 = lean_array_push(x_119, x_105);
-x_121 = lean_array_push(x_120, x_114);
+x_119 = lean_array_push(x_118, x_101);
+x_120 = lean_array_push(x_119, x_103);
+x_121 = lean_array_push(x_120, x_113);
 x_122 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__2;
 x_123 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_123, 0, x_86);
@@ -16877,7 +16942,7 @@ if (lean_obj_tag(x_268) == 0)
 {
 lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; 
 x_269 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__10;
-x_270 = l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(x_269);
+x_270 = l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(x_269);
 x_271 = lean_ctor_get(x_270, 0);
 lean_inc(x_271);
 x_272 = lean_ctor_get(x_270, 1);
@@ -16977,7 +17042,7 @@ block_258:
 {
 if (x_158 == 0)
 {
-lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; size_t x_166; size_t x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 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; size_t x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
+lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; size_t x_166; size_t x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; size_t x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
 lean_dec(x_154);
 lean_inc(x_7);
 x_160 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_7, x_8, x_159);
@@ -16995,54 +17060,54 @@ x_165 = lean_array_get_size(x_11);
 x_166 = lean_usize_of_nat(x_165);
 lean_dec(x_165);
 x_167 = 0;
-x_168 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
-x_169 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
-x_170 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__14(x_168, x_169, x_166, x_167, x_11);
-x_171 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
-x_172 = l_Lean_mkSepArray(x_170, x_171);
-lean_dec(x_170);
-x_173 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
-x_174 = l_Array_append___rarg(x_173, x_172);
-x_175 = lean_box(2);
-x_176 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
-x_177 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_177, 0, x_175);
-lean_ctor_set(x_177, 1, x_176);
-lean_ctor_set(x_177, 2, x_174);
-x_178 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
+x_168 = l_Array_mapMUnsafe_map___at___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___spec__3(x_166, x_167, x_11);
+x_169 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
+x_170 = l_Lean_mkSepArray(x_168, x_169);
+lean_dec(x_168);
+x_171 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
+x_172 = l_Array_append___rarg(x_171, x_170);
+x_173 = lean_box(2);
+x_174 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__11;
+x_175 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_175, 0, x_173);
+lean_ctor_set(x_175, 1, x_174);
+lean_ctor_set(x_175, 2, x_172);
+x_176 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
 lean_inc(x_161);
-x_179 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_179, 0, x_161);
-lean_ctor_set(x_179, 1, x_178);
-x_180 = l_Array_zip___rarg(x_152, x_10);
+x_177 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_177, 0, x_161);
+lean_ctor_set(x_177, 1, x_176);
+x_178 = l_Array_zip___rarg(x_152, x_10);
 lean_dec(x_10);
 lean_dec(x_152);
-x_181 = lean_array_get_size(x_180);
-x_182 = lean_usize_of_nat(x_181);
-lean_dec(x_181);
-x_183 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__15(x_161, x_168, x_176, x_173, x_182, x_167, x_180);
-x_184 = l_Array_append___rarg(x_173, x_183);
-x_185 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_185, 0, x_175);
-lean_ctor_set(x_185, 1, x_176);
-lean_ctor_set(x_185, 2, x_184);
-x_186 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__6;
-x_187 = lean_array_push(x_186, x_185);
-x_188 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
-x_189 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_189, 0, x_175);
-lean_ctor_set(x_189, 1, x_188);
-lean_ctor_set(x_189, 2, x_187);
-x_190 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
-x_191 = lean_array_push(x_190, x_164);
-x_192 = lean_array_push(x_191, x_169);
-x_193 = lean_array_push(x_192, x_169);
-x_194 = lean_array_push(x_193, x_177);
-x_195 = lean_array_push(x_194, x_179);
-x_196 = lean_array_push(x_195, x_189);
+x_179 = lean_array_get_size(x_178);
+x_180 = lean_usize_of_nat(x_179);
+lean_dec(x_179);
+x_181 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
+x_182 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(x_161, x_181, x_174, x_171, x_180, x_167, x_178);
+x_183 = l_Array_append___rarg(x_171, x_182);
+x_184 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_184, 0, x_173);
+lean_ctor_set(x_184, 1, x_174);
+lean_ctor_set(x_184, 2, x_183);
+x_185 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__6;
+x_186 = lean_array_push(x_185, x_184);
+x_187 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
+x_188 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_188, 0, x_173);
+lean_ctor_set(x_188, 1, x_187);
+lean_ctor_set(x_188, 2, x_186);
+x_189 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
+x_190 = lean_array_push(x_189, x_164);
+x_191 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
+x_192 = lean_array_push(x_190, x_191);
+x_193 = lean_array_push(x_192, x_191);
+x_194 = lean_array_push(x_193, x_175);
+x_195 = lean_array_push(x_194, x_177);
+x_196 = lean_array_push(x_195, x_188);
 x_197 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__2;
 x_198 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_198, 0, x_175);
+lean_ctor_set(x_198, 0, x_173);
 lean_ctor_set(x_198, 1, x_197);
 lean_ctor_set(x_198, 2, x_196);
 x_199 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__5(x_1, x_198, x_3, x_4, x_5, x_6, x_7, x_8, x_162);
@@ -17056,7 +17121,7 @@ return x_199;
 }
 else
 {
-lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; size_t x_227; size_t 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; size_t x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; 
+lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; size_t x_227; size_t 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; size_t x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; 
 lean_inc(x_7);
 x_200 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_PrettyPrinter_Delaborator_delab___spec__3___rarg(x_7, x_8, x_159);
 x_201 = lean_ctor_get(x_200, 0);
@@ -17112,48 +17177,48 @@ x_226 = lean_array_get_size(x_11);
 x_227 = lean_usize_of_nat(x_226);
 lean_dec(x_226);
 x_228 = 0;
-x_229 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
-x_230 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
-x_231 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__16(x_229, x_230, x_227, x_228, x_11);
-x_232 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
-x_233 = l_Lean_mkSepArray(x_231, x_232);
-lean_dec(x_231);
-x_234 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
-x_235 = l_Array_append___rarg(x_234, x_233);
-x_236 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_236, 0, x_219);
-lean_ctor_set(x_236, 1, x_224);
-lean_ctor_set(x_236, 2, x_235);
-x_237 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
+x_229 = l_Array_mapMUnsafe_map___at___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___spec__3(x_227, x_228, x_11);
+x_230 = l_Lean_PrettyPrinter_Delaborator_delabConst___closed__12;
+x_231 = l_Lean_mkSepArray(x_229, x_230);
+lean_dec(x_229);
+x_232 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__12;
+x_233 = l_Array_append___rarg(x_232, x_231);
+x_234 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_234, 0, x_219);
+lean_ctor_set(x_234, 1, x_224);
+lean_ctor_set(x_234, 2, x_233);
+x_235 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__3;
 lean_inc(x_201);
-x_238 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_238, 0, x_201);
-lean_ctor_set(x_238, 1, x_237);
-x_239 = l_Array_zip___rarg(x_152, x_10);
+x_236 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_236, 0, x_201);
+lean_ctor_set(x_236, 1, x_235);
+x_237 = l_Array_zip___rarg(x_152, x_10);
 lean_dec(x_10);
 lean_dec(x_152);
-x_240 = lean_array_get_size(x_239);
-x_241 = lean_usize_of_nat(x_240);
-lean_dec(x_240);
-x_242 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__17(x_201, x_229, x_224, x_234, x_222, x_241, x_228, x_239);
-x_243 = l_Array_append___rarg(x_234, x_242);
-x_244 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_244, 0, x_219);
-lean_ctor_set(x_244, 1, x_224);
-lean_ctor_set(x_244, 2, x_243);
-x_245 = lean_array_push(x_222, x_244);
-x_246 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
-x_247 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_247, 0, x_219);
-lean_ctor_set(x_247, 1, x_246);
-lean_ctor_set(x_247, 2, x_245);
-x_248 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
-x_249 = lean_array_push(x_248, x_204);
-x_250 = lean_array_push(x_249, x_230);
+x_238 = lean_array_get_size(x_237);
+x_239 = lean_usize_of_nat(x_238);
+lean_dec(x_238);
+x_240 = l_Lean_PrettyPrinter_Delaborator_maybeAddBlockImplicit___closed__7;
+x_241 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(x_201, x_240, x_224, x_232, x_222, x_239, x_228, x_237);
+x_242 = l_Array_append___rarg(x_232, x_241);
+x_243 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_243, 0, x_219);
+lean_ctor_set(x_243, 1, x_224);
+lean_ctor_set(x_243, 2, x_242);
+x_244 = lean_array_push(x_222, x_243);
+x_245 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__5;
+x_246 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_246, 0, x_219);
+lean_ctor_set(x_246, 1, x_245);
+lean_ctor_set(x_246, 2, x_244);
+x_247 = l_Lean_PrettyPrinter_Delaborator_unexpandStructureInstance___lambda__3___closed__13;
+x_248 = lean_array_push(x_247, x_204);
+x_249 = l_Lean_PrettyPrinter_Delaborator_delabSort___closed__13;
+x_250 = lean_array_push(x_248, x_249);
 x_251 = lean_array_push(x_250, x_225);
-x_252 = lean_array_push(x_251, x_236);
-x_253 = lean_array_push(x_252, x_238);
-x_254 = lean_array_push(x_253, x_247);
+x_252 = lean_array_push(x_251, x_234);
+x_253 = lean_array_push(x_252, x_236);
+x_254 = lean_array_push(x_253, x_246);
 x_255 = l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__2;
 x_256 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_256, 0, x_219);
@@ -17492,19 +17557,7 @@ lean_dec(x_2);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___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_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(x_1, x_2, x_6, x_7, x_5);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 size_t x_8; size_t x_9; lean_object* x_10; 
@@ -17512,23 +17565,11 @@ x_8 = lean_unbox_usize(x_5);
 lean_dec(x_5);
 x_9 = lean_unbox_usize(x_6);
 lean_dec(x_6);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(x_1, x_2, x_3, x_4, x_8, x_9, x_7);
+x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9(x_1, x_2, x_3, x_4, x_8, x_9, x_7);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___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_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11(x_1, x_2, x_6, x_7, x_5);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___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* x_8) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 size_t x_9; size_t x_10; lean_object* x_11; 
@@ -17536,23 +17577,11 @@ x_9 = lean_unbox_usize(x_6);
 lean_dec(x_6);
 x_10 = lean_unbox_usize(x_7);
 lean_dec(x_7);
-x_11 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(x_1, x_2, x_3, x_4, x_5, x_9, x_10, x_8);
+x_11 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10(x_1, x_2, x_3, x_4, x_5, x_9, x_10, x_8);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__14___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_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__14(x_1, x_2, x_6, x_7, x_5);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__15___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___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) {
 _start:
 {
 size_t x_8; size_t x_9; lean_object* x_10; 
@@ -17560,23 +17589,11 @@ x_8 = lean_unbox_usize(x_5);
 lean_dec(x_5);
 x_9 = lean_unbox_usize(x_6);
 lean_dec(x_6);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__15(x_1, x_2, x_3, x_4, x_8, x_9, x_7);
+x_10 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__12(x_1, x_2, x_3, x_4, x_8, x_9, x_7);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__16___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_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__16(x_1, x_2, x_6, x_7, x_5);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__17___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___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; 
@@ -17584,7 +17601,7 @@ x_9 = lean_unbox_usize(x_6);
 lean_dec(x_6);
 x_10 = lean_unbox_usize(x_7);
 lean_dec(x_7);
-x_11 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__17(x_1, x_2, x_3, x_4, x_5, x_9, x_10, x_8);
+x_11 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13(x_1, x_2, x_3, x_4, x_5, x_9, x_10, x_8);
 return x_11;
 }
 }
@@ -17764,7 +17781,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_PrettyPrinter_Delaborator_delabFVar___closed__1;
 x_2 = l_Lean_PrettyPrinter_Delaborator_delabLetFun___lambda__1___closed__1;
-x_3 = lean_unsigned_to_nat(435u);
+x_3 = lean_unsigned_to_nat(442u);
 x_4 = lean_unsigned_to_nat(37u);
 x_5 = l_Lean_PrettyPrinter_Delaborator_delabFVar___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -20611,7 +20628,7 @@ x_21 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_21, 0, x_19);
 lean_ctor_set(x_21, 1, x_20);
 lean_ctor_set(x_21, 2, x_18);
-x_22 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_22 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 x_23 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_23, 0, x_14);
 lean_ctor_set(x_23, 1, x_22);
@@ -20655,7 +20672,7 @@ x_42 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_42, 0, x_40);
 lean_ctor_set(x_42, 1, x_41);
 lean_ctor_set(x_42, 2, x_39);
-x_43 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_43 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 x_44 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_44, 0, x_34);
 lean_ctor_set(x_44, 1, x_43);
@@ -20712,7 +20729,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_67);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_66);
-x_70 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_70 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 x_71 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_71, 0, x_62);
 lean_ctor_set(x_71, 1, x_70);
@@ -20755,7 +20772,7 @@ x_89 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_89, 0, x_87);
 lean_ctor_set(x_89, 1, x_88);
 lean_ctor_set(x_89, 2, x_86);
-x_90 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_90 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 x_91 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_91, 0, x_81);
 lean_ctor_set(x_91, 1, x_90);
@@ -20811,7 +20828,7 @@ x_117 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_117, 0, x_115);
 lean_ctor_set(x_117, 1, x_116);
 lean_ctor_set(x_117, 2, x_114);
-x_118 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_118 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 x_119 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_119, 0, x_109);
 lean_ctor_set(x_119, 1, x_118);
@@ -20855,7 +20872,7 @@ x_138 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_138, 0, x_136);
 lean_ctor_set(x_138, 1, x_137);
 lean_ctor_set(x_138, 2, x_135);
-x_139 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3;
+x_139 = l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3;
 x_140 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_140, 0, x_129);
 lean_ctor_set(x_140, 1, x_139);
@@ -23987,7 +24004,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_PrettyPrinter_Delaborator_delabFVar___closed__1;
 x_2 = l_Lean_PrettyPrinter_Delaborator_delabLetE___closed__1;
-x_3 = lean_unsigned_to_nat(593u);
+x_3 = lean_unsigned_to_nat(600u);
 x_4 = lean_unsigned_to_nat(38u);
 x_5 = l_Lean_PrettyPrinter_Delaborator_delabFVar___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -24741,7 +24758,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_PrettyPrinter_Delaborator_delabFVar___closed__1;
 x_2 = l_Lean_PrettyPrinter_Delaborator_delabLit___closed__1;
-x_3 = lean_unsigned_to_nat(606u);
+x_3 = lean_unsigned_to_nat(613u);
 x_4 = lean_unsigned_to_nat(31u);
 x_5 = l_Lean_PrettyPrinter_Delaborator_delabFVar___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -26133,7 +26150,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_PrettyPrinter_Delaborator_delabFVar___closed__1;
 x_2 = l_Lean_PrettyPrinter_Delaborator_delabProj___closed__1;
-x_3 = lean_unsigned_to_nat(645u);
+x_3 = lean_unsigned_to_nat(652u);
 x_4 = lean_unsigned_to_nat(38u);
 x_5 = l_Lean_PrettyPrinter_Delaborator_delabFVar___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -30117,7 +30134,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_PrettyPrinter_Delaborator_delabFVar___closed__1;
 x_2 = l_Lean_PrettyPrinter_Delaborator_delabDoElems___closed__5;
-x_3 = lean_unsigned_to_nat(747u);
+x_3 = lean_unsigned_to_nat(754u);
 x_4 = lean_unsigned_to_nat(40u);
 x_5 = l_Lean_PrettyPrinter_Delaborator_delabFVar___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -32183,18 +32200,22 @@ l_Lean_getConstInfo___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__2_
 lean_mark_persistent(l_Lean_getConstInfo___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__2___closed__4);
 l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1 = _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1();
 lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__1);
-l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1 = _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1();
-lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__1);
-l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2 = _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2();
-lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__2);
-l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3 = _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3();
-lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__10___closed__3);
-l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___closed__1 = _init_l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___closed__1();
-lean_mark_persistent(l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__13___closed__1);
+l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2 = _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2();
+lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__2);
+l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3 = _init_l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3();
+lean_mark_persistent(l_Array_mapMUnsafe_map___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__9___closed__3);
+l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___closed__1 = _init_l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___closed__1();
+lean_mark_persistent(l_panic___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__11___closed__1);
 l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__1 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__1();
 lean_mark_persistent(l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__1);
 l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__2 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__2();
 lean_mark_persistent(l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__2);
+l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__3 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__3();
+lean_mark_persistent(l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__3);
+l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4();
+lean_mark_persistent(l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__4);
+l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5();
+lean_mark_persistent(l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__4___closed__5);
 l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__1 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__1();
 lean_mark_persistent(l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__1);
 l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__2 = _init_l_Lean_PrettyPrinter_Delaborator_delabAppMatch___lambda__6___closed__2();
diff --git a/stage0/stdlib/Lean/PrettyPrinter/Formatter.c b/stage0/stdlib/Lean/PrettyPrinter/Formatter.c
index 9b520f095e..3215ad6c5f 100644
--- a/stage0/stdlib/Lean/PrettyPrinter/Formatter.c
+++ b/stage0/stdlib/Lean/PrettyPrinter/Formatter.c
@@ -24,9 +24,8 @@ uint8_t l_Lean_Syntax_isAntiquotSuffixSplice(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_visitArgs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
 extern lean_object* l_Lean_fieldIdxKind;
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4227_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4272_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkTailWs_formatter___rarg(lean_object*);
-static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__1;
 uint8_t l_Lean_Syntax_isTokenAntiquot(lean_object*);
 uint8_t l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_810____at_Lean_Parser_ParserState_hasError___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
@@ -56,13 +55,11 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_sepByNoAntiquot_formatte
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushLine___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_mkFormatterAttribute___closed__8;
 LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkNoImmediateColon_formatter___rarg(lean_object*);
-static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_visitArgs___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_formatTerm(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_Traverser_up(lean_object*);
@@ -152,7 +149,9 @@ LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_PrettyPrinter_format___spec__
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_throwBacktrack___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_fill(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__3;
 static lean_object* l_Lean_PrettyPrinter_mkFormatterAttribute___closed__9;
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__7;
 lean_object* l_Lean_Parser_registerAliasCore___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_getStack___boxed(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Formatter_checkKind___closed__5;
@@ -224,6 +223,7 @@ static lean_object* l_Lean_PrettyPrinter_Formatter_symbolNoAntiquot_formatter___
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_mkFormatterAttribute___closed__5;
 static lean_object* l_Lean_PrettyPrinter_mkFormatterAttribute___closed__3;
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__5;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_instMonadTraverserFormatterM___lambda__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_node_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -239,7 +239,7 @@ lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_mkFormatterAttribute___lambda__1___closed__4;
 lean_object* l_Lean_Syntax_getId(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_sepBy1NoAntiquot_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_skip_formatter(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at_Lean_PrettyPrinter_format___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_charLitKind;
@@ -258,6 +258,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_errorAtSavedPos_formatte
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkNoWsBefore_formatter___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Formatter_0__Lean_PrettyPrinter_Formatter_getExprPos_x3f___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_instOrElseFormatterM(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_scientificLitNoAntiquot_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Formatter_0__Lean_PrettyPrinter_Formatter_getExprPos_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_formatterAttribute;
@@ -271,6 +272,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkLhsPrec_formatter(l
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkKind___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_mkAntiquot_formatter_x27___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_goUp___at_Lean_PrettyPrinter_Formatter_visitArgs___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__6;
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_reverse___rarg(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Formatter_identNoAntiquot_formatter___closed__2;
@@ -292,8 +294,10 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_goLeft___at_Lean_PrettyPri
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_PrettyPrinter_Formatter_interpolatedStr_formatter___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_forM_loop___at_Lean_PrettyPrinter_Formatter_manyNoAntiquot_formatter___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_formatTactic___closed__2;
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_ite(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__2;
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkLineEq_formatter___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_format(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -367,18 +371,18 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_instMonadTraverserFormat
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_evalInsideQuot_formatter___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_getStackSize___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_errorAtSavedPos_formatter(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_getCur___at_Lean_PrettyPrinter_Formatter_visitArgs___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_withForbidden_formatter___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_instCoeForAllFormatterFormatterAliasValue(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkNoWsBefore_formatter(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___closed__2;
-static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__5;
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_setLhsPrec_formatter(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_withOpen_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushNone_formatter___boxed(lean_object*);
 lean_object* l_Std_Format_getIndent(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Formatter_0__Lean_PrettyPrinter_Formatter_push(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -391,6 +395,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_visitAtom___lambda__1___
 static lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__2___closed__3;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkNoImmediateColon_formatter___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_skip_formatter___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_parseToken(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -413,7 +418,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_withoutInfo_formatter(le
 extern lean_object* l_Std_instInhabitedFormat;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_concat___lambda__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_parserOfStack_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4536_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4581_(lean_object*);
 static lean_object* l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2___closed__7;
 lean_object* lean_int_sub(lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Formatter_symbolNoAntiquot_formatter___closed__6;
@@ -435,7 +440,6 @@ lean_object* lean_simp_macro_scopes(lean_object*);
 static lean_object* l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2___closed__5;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_pushToken___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_mkFormatterAttribute___closed__2;
-static lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_checkColGe_formatter___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_FormatterM_orElse(lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg(lean_object*, lean_object*, lean_object*);
@@ -4812,13 +4816,25 @@ return x_53;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___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; lean_object* x_9; 
+x_7 = l___private_Lean_PrettyPrinter_Formatter_0__Lean_PrettyPrinter_Formatter_push(x_1, x_2, x_3, x_4, x_5, x_6);
+x_8 = lean_ctor_get(x_7, 1);
+lean_inc(x_8);
+lean_dec(x_7);
+x_9 = l_Lean_Syntax_MonadTraverser_goLeft___at_Lean_PrettyPrinter_Formatter_visitArgs___spec__2___rarg(x_3, x_4, x_5, x_8);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
 lean_object* x_7; lean_object* x_8; 
 x_7 = l_Lean_Syntax_getKind(x_1);
 x_8 = l_Lean_PrettyPrinter_Formatter_formatterForKindUnsafe(x_7, x_2, x_3, x_4, x_5, x_6);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__1() {
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -4826,7 +4842,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_categoryFormatte
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__2() {
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -4834,17 +4850,35 @@ x_1 = lean_mk_string("choice");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__3() {
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__2;
+x_2 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__2;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__4() {
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__4() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("rawStx");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__4;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -4852,128 +4886,197 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Syntax_MonadTraverser_getCur___at_Lean_P
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__5() {
+static lean_object* _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__7() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__2), 6, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3), 6, 0);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
-x_9 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__1;
+x_9 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__1;
+lean_inc(x_1);
 x_10 = l_Lean_Syntax_getKind(x_1);
-x_11 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__3;
+x_11 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__3;
 x_12 = lean_name_eq(x_10, x_11);
 if (x_12 == 0)
 {
-uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_13 = 1;
-x_14 = l_Lean_Name_toString(x_2, x_13);
-x_15 = lean_box(0);
-x_16 = lean_box(x_13);
-x_17 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_mkAntiquot_formatter_x27___boxed), 8, 3);
-lean_closure_set(x_17, 0, x_14);
-lean_closure_set(x_17, 1, x_15);
-lean_closure_set(x_17, 2, x_16);
-x_18 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_formatterForKindUnsafe), 6, 1);
-lean_closure_set(x_18, 0, x_10);
+lean_object* x_13; uint8_t x_14; 
+x_13 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__5;
+x_14 = lean_name_eq(x_2, x_13);
+if (x_14 == 0)
+{
+uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+lean_dec(x_1);
+x_15 = 1;
+x_16 = l_Lean_Name_toString(x_2, x_15);
+x_17 = lean_box(0);
+x_18 = lean_box(x_15);
+x_19 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_mkAntiquot_formatter_x27___boxed), 8, 3);
+lean_closure_set(x_19, 0, x_16);
+lean_closure_set(x_19, 1, x_17);
+lean_closure_set(x_19, 2, x_18);
+x_20 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_formatterForKindUnsafe), 6, 1);
+lean_closure_set(x_20, 0, x_10);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_19 = l_Lean_PrettyPrinter_Formatter_orelse_formatter(x_17, x_18, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_19) == 0)
+x_21 = l_Lean_PrettyPrinter_Formatter_orelse_formatter(x_19, x_20, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_21) == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_20 = lean_ctor_get(x_19, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 1);
-lean_inc(x_21);
-lean_dec(x_19);
-x_22 = lean_apply_6(x_9, x_20, x_4, x_5, x_6, x_7, x_21);
-return x_22;
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_21, 0);
+lean_inc(x_22);
+x_23 = lean_ctor_get(x_21, 1);
+lean_inc(x_23);
+lean_dec(x_21);
+x_24 = lean_apply_6(x_9, x_22, x_4, x_5, x_6, x_7, x_23);
+return x_24;
 }
 else
 {
-uint8_t x_23; 
+uint8_t x_25; 
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_23 = !lean_is_exclusive(x_19);
-if (x_23 == 0)
+x_25 = !lean_is_exclusive(x_21);
+if (x_25 == 0)
 {
-return x_19;
+return x_21;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_24 = lean_ctor_get(x_19, 0);
-x_25 = lean_ctor_get(x_19, 1);
-lean_inc(x_25);
-lean_inc(x_24);
-lean_dec(x_19);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_24);
-lean_ctor_set(x_26, 1, x_25);
-return x_26;
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_21, 0);
+x_27 = lean_ctor_get(x_21, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_21);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_26);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
 }
 }
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_dec(x_10);
+x_29 = 1;
+x_30 = l_Lean_Name_toString(x_2, x_29);
+x_31 = lean_box(0);
+x_32 = lean_box(x_29);
+x_33 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_mkAntiquot_formatter_x27___boxed), 8, 3);
+lean_closure_set(x_33, 0, x_30);
+lean_closure_set(x_33, 1, x_31);
+lean_closure_set(x_33, 2, x_32);
+x_34 = 0;
+x_35 = lean_unsigned_to_nat(0u);
+x_36 = l_Lean_Syntax_formatStxAux(x_31, x_34, x_35, x_1);
+x_37 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__2___boxed), 6, 1);
+lean_closure_set(x_37, 0, x_36);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_38 = l_Lean_PrettyPrinter_Formatter_orelse_formatter(x_33, x_37, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_38) == 0)
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+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_apply_6(x_9, x_39, x_4, x_5, x_6, x_7, x_40);
+return x_41;
+}
+else
+{
+uint8_t x_42; 
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_42 = !lean_is_exclusive(x_38);
+if (x_42 == 0)
+{
+return x_38;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_38, 0);
+x_44 = lean_ctor_get(x_38, 1);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_dec(x_38);
+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;
+}
+}
+}
+}
+else
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
 lean_dec(x_10);
 lean_dec(x_2);
-x_27 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__4;
-x_28 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__5;
-x_29 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__1___rarg), 7, 2);
-lean_closure_set(x_29, 0, x_27);
-lean_closure_set(x_29, 1, x_28);
+lean_dec(x_1);
+x_46 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__6;
+x_47 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__7;
+x_48 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__1___rarg), 7, 2);
+lean_closure_set(x_48, 0, x_46);
+lean_closure_set(x_48, 1, x_47);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_30 = l_Lean_PrettyPrinter_Formatter_visitArgs(x_29, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_30) == 0)
+x_49 = l_Lean_PrettyPrinter_Formatter_visitArgs(x_48, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_49) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-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_33 = lean_apply_6(x_9, x_31, x_4, x_5, x_6, x_7, x_32);
-return x_33;
+lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_50 = lean_ctor_get(x_49, 0);
+lean_inc(x_50);
+x_51 = lean_ctor_get(x_49, 1);
+lean_inc(x_51);
+lean_dec(x_49);
+x_52 = lean_apply_6(x_9, x_50, x_4, x_5, x_6, x_7, x_51);
+return x_52;
 }
 else
 {
-uint8_t x_34; 
+uint8_t x_53; 
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_34 = !lean_is_exclusive(x_30);
-if (x_34 == 0)
+x_53 = !lean_is_exclusive(x_49);
+if (x_53 == 0)
 {
-return x_30;
+return x_49;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_35 = lean_ctor_get(x_30, 0);
-x_36 = lean_ctor_get(x_30, 1);
-lean_inc(x_36);
-lean_inc(x_35);
-lean_dec(x_30);
-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;
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_54 = lean_ctor_get(x_49, 0);
+x_55 = lean_ctor_get(x_49, 1);
+lean_inc(x_55);
+lean_inc(x_54);
+lean_dec(x_49);
+x_56 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_56, 0, x_54);
+lean_ctor_set(x_56, 1, x_55);
+return x_56;
 }
 }
 }
@@ -5099,7 +5202,7 @@ if (x_21 == 0)
 {
 lean_object* x_23; lean_object* x_24; 
 x_23 = lean_box(0);
-x_24 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(x_18, x_1, x_23, x_2, x_3, x_4, x_5, x_22);
+x_24 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(x_18, x_1, x_23, x_2, x_3, x_4, x_5, x_22);
 return x_24;
 }
 else
@@ -5126,7 +5229,7 @@ lean_inc(x_35);
 x_36 = lean_ctor_get(x_34, 1);
 lean_inc(x_36);
 lean_dec(x_34);
-x_37 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(x_18, x_1, x_35, x_2, x_3, x_4, x_5, x_36);
+x_37 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(x_18, x_1, x_35, x_2, x_3, x_4, x_5, x_36);
 lean_dec(x_35);
 return x_37;
 }
@@ -5203,7 +5306,7 @@ if (x_61 == 0)
 {
 lean_object* x_63; lean_object* x_64; 
 x_63 = lean_box(0);
-x_64 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(x_58, x_1, x_63, x_2, x_3, x_4, x_5, x_62);
+x_64 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(x_58, x_1, x_63, x_2, x_3, x_4, x_5, x_62);
 return x_64;
 }
 else
@@ -5230,7 +5333,7 @@ lean_inc(x_75);
 x_76 = lean_ctor_get(x_74, 1);
 lean_inc(x_76);
 lean_dec(x_74);
-x_77 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(x_58, x_1, x_75, x_2, x_3, x_4, x_5, x_76);
+x_77 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(x_58, x_1, x_75, x_2, x_3, x_4, x_5, x_76);
 lean_dec(x_75);
 return x_77;
 }
@@ -5275,11 +5378,23 @@ lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___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_7; 
+x_7 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___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);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; 
-x_9 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_9 = l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_3);
 return x_9;
 }
@@ -7776,7 +7891,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_PrettyPrinter_Formatter_symbolNoAntiquot_formatter___closed__5;
 x_2 = l_Lean_PrettyPrinter_Formatter_symbolNoAntiquot_formatter___closed__6;
-x_3 = lean_unsigned_to_nat(369u);
+x_3 = lean_unsigned_to_nat(371u);
 x_4 = lean_unsigned_to_nat(42u);
 x_5 = l_Lean_PrettyPrinter_Formatter_symbolNoAntiquot_formatter___closed__7;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10207,7 +10322,7 @@ x_10 = l_Lean_PrettyPrinter_Formatter_ite___rarg(x_9, x_2, x_3, x_4, x_5, x_6, x
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4227_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Formatter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4272_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
@@ -11005,7 +11120,7 @@ x_6 = l_Lean_PrettyPrinter_formatCategory(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4536_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4581_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -11155,16 +11270,20 @@ l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__
 lean_mark_persistent(l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2___closed__6);
 l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2___closed__7 = _init_l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2___closed__7();
 lean_mark_persistent(l_Lean_addTrace___at_Lean_PrettyPrinter_Formatter_categoryFormatterCore___spec__2___closed__7);
-l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__1 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__1();
-lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__1);
-l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__2 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__2();
-lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__2);
-l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__3 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__3();
-lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__3);
-l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__4 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__4();
-lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__4);
-l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__5 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__5();
-lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__3___closed__5);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__1 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__1();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__1);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__2 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__2();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__2);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__3 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__3();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__3);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__4 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__4();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__4);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__5 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__5();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__5);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__6 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__6();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__6);
+l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__7 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__7();
+lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___lambda__4___closed__7);
 l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___closed__1 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___closed__1();
 lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___closed__1);
 l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___closed__2 = _init_l_Lean_PrettyPrinter_Formatter_categoryFormatterCore___closed__2();
@@ -11243,7 +11362,7 @@ l_Lean_PrettyPrinter_Formatter_identNoAntiquot_formatter___closed__2 = _init_l_L
 lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_identNoAntiquot_formatter___closed__2);
 l_Lean_PrettyPrinter_Formatter_interpolatedStr_formatter___boxed__const__1 = _init_l_Lean_PrettyPrinter_Formatter_interpolatedStr_formatter___boxed__const__1();
 lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_interpolatedStr_formatter___boxed__const__1);
-if (builtin) {res = l_Lean_PrettyPrinter_Formatter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4227_(lean_io_mk_world());
+if (builtin) {res = l_Lean_PrettyPrinter_Formatter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4272_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_PrettyPrinter_Formatter_formatterAliasesRef = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_PrettyPrinter_Formatter_formatterAliasesRef);
@@ -11272,7 +11391,7 @@ l_Lean_PrettyPrinter_formatCommand___closed__1 = _init_l_Lean_PrettyPrinter_form
 lean_mark_persistent(l_Lean_PrettyPrinter_formatCommand___closed__1);
 l_Lean_PrettyPrinter_formatCommand___closed__2 = _init_l_Lean_PrettyPrinter_formatCommand___closed__2();
 lean_mark_persistent(l_Lean_PrettyPrinter_formatCommand___closed__2);
-res = l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4536_(lean_io_mk_world());
+res = l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Formatter___hyg_4581_(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/PrettyPrinter/Parenthesizer.c b/stage0/stdlib/Lean/PrettyPrinter/Parenthesizer.c
index bf29bb4190..ed04a0265a 100644
--- a/stage0/stdlib/Lean/PrettyPrinter/Parenthesizer.c
+++ b/stage0/stdlib/Lean/PrettyPrinter/Parenthesizer.c
@@ -26,6 +26,7 @@ static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_term_parenth
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_parenthesizerForKindUnsafe___closed__3;
 size_t lean_usize_add(size_t, size_t);
 static lean_object* l_Lean_PrettyPrinter_mkCategoryParenthesizerAttribute___lambda__1___closed__1;
+static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__3;
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_term_parenthesizer___lambda__1___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___lambda__4___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_checkNoImmediateColon_parenthesizer___rarg(lean_object*);
@@ -41,6 +42,7 @@ LEAN_EXPORT lean_object* l_List_forM___at_Lean_PrettyPrinter_Parenthesizer_sepBy
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_charLitNoAntiquot_parenthesizer___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_pushNone_parenthesizer(lean_object*);
+static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__5;
 static lean_object* l_Lean_PrettyPrinter_parenthesize___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawIdentNoAntiquot_parenthesizer___boxed(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_mkCategoryParenthesizerAttribute___lambda__1___closed__2;
@@ -87,7 +89,7 @@ lean_object* lean_environment_find(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_goUp___at_Lean_PrettyPrinter_Parenthesizer_visitArgs___spec__4___boxed(lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_4149_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_4170_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___lambda__9___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_setCur___at_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_term_parenthesizer___lambda__1___closed__6;
@@ -143,6 +145,7 @@ lean_object* l_Lean_PrettyPrinter_runForNodeKind___rarg(lean_object*, lean_objec
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawIdentNoAntiquot_parenthesizer___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_numLitNoAntiquot_parenthesizer___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_errorAtSavedPos_parenthesizer___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_instMonadQuotationParenthesizerM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_term_parenthesizer___lambda__1___closed__9;
@@ -240,6 +243,7 @@ static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_level_parent
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_checkWsBefore_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_scientificLitNoAntiquot_parenthesizer___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_withForbidden_parenthesizer(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_term_parenthesizer___lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_pushNone_parenthesizer___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -372,13 +376,14 @@ static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_tactic_paren
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___lambda__10___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_goRight___at_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_decQuotDepth_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__4;
 static lean_object* l_Option_format___at_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___spec__6___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_withAntiquotSuffixSplice_parenthesizer___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_Traverser_down(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_level_parenthesizer(lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_level_parenthesizer___lambda__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_mkCategoryParenthesizerAttribute___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_3867_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_3888_(lean_object*);
 static lean_object* l_Lean_addTrace___at_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___spec__2___closed__8;
 static lean_object* l_Option_format___at_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___spec__6___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_setExpected_parenthesizer(lean_object*);
@@ -404,6 +409,7 @@ extern lean_object* l_Lean_Core_instMonadCoreM;
 uint8_t l_Lean_Parser_isValidSyntaxNodeKind(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_Traverser_right(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_PrettyPrinter_mkParenthesizerAttribute___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__2;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_PrettyPrinter_Parenthesizer_interpolatedStr_parenthesizer___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_visitToken___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_addPrecCheck(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -412,6 +418,7 @@ LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_goLeft___at_Lean_PrettyPri
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_nameLitNoAntiquot_parenthesizer___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Syntax_MonadTraverser_goRight___at_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1;
 LEAN_EXPORT lean_object* l_ReaderT_pure___at_Lean_PrettyPrinter_Parenthesizer_instMonadQuotationParenthesizerM___spec__1(lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_level_parenthesizer___closed__3;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_withForbidden_parenthesizer___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -478,6 +485,7 @@ LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_instCoeParenthesizer
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_parenthesizeCategoryCore___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_PrettyPrinter_mkParenthesizerAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_withAntiquotSuffixSplice_parenthesizer___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_trailingNode_parenthesizer___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_withAntiquotSuffixSplice_parenthesizer(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_checkLineEq_parenthesizer___rarg(lean_object*);
@@ -501,6 +509,7 @@ static lean_object* l_Lean_PrettyPrinter_Parenthesizer_tactic_parenthesizer___cl
 lean_object* lean_nat_mod(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_withForbidden_parenthesizer___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_State_minPrec___default;
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_mkCategoryParenthesizerAttribute___closed__3;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_strLitNoAntiquot_parenthesizer___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_maybeParenthesize___lambda__9(lean_object*, uint8_t, lean_object*, 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*, lean_object*);
@@ -518,6 +527,7 @@ lean_object* l_Nat_min(lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_node_parenthesizer___closed__6;
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_level_parenthesizer___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_PrettyPrinter_backtrackExceptionId;
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer(lean_object*, lean_object*);
 static lean_object* l_Lean_PrettyPrinter_parenthesizeTerm___closed__1;
 static lean_object* l_Lean_PrettyPrinter_Parenthesizer_instMonadQuotationParenthesizerM___closed__3;
 static lean_object* l_Lean_PrettyPrinter_mkParenthesizerAttribute___closed__6;
@@ -7820,6 +7830,101 @@ x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_5, x_1);
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___rarg(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_Syntax_MonadTraverser_goLeft___at_Lean_PrettyPrinter_Parenthesizer_visitArgs___spec__2___rarg(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___rarg___boxed), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___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_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___rarg(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("rawStx");
+return x_1;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_PrettyPrinter_mkParenthesizerAttribute___closed__10;
+x_2 = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__3;
+x_2 = l_Lean_PrettyPrinter_mkParenthesizerAttribute___closed__3;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__5() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___boxed), 2, 0);
+return x_1;
+}
+}
+LEAN_EXPORT lean_object* l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_2 = l_Lean_PrettyPrinter_Parenthesizer_categoryParser_parenthesizer___closed__1;
+x_3 = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__2;
+x_4 = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__4;
+x_5 = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__5;
+x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_5, x_1);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_error_parenthesizer___rarg(lean_object* x_1) {
 _start:
 {
@@ -10333,7 +10438,7 @@ x_10 = l_Lean_PrettyPrinter_Parenthesizer_ite___rarg(x_9, x_2, x_3, x_4, x_5, x_
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_3867_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Parenthesizer_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_3888_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
@@ -11085,7 +11190,7 @@ x_6 = l_Lean_PrettyPrinter_parenthesize(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_4149_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_4170_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -11448,6 +11553,19 @@ lean_mark_persistent(l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_level_paren
 res = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_level_parenthesizer(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1 = _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1();
+lean_mark_persistent(l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__1);
+l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__2 = _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__2();
+lean_mark_persistent(l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__2);
+l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__3 = _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__3();
+lean_mark_persistent(l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__3);
+l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__4 = _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__4();
+lean_mark_persistent(l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__4);
+l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__5 = _init_l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__5();
+lean_mark_persistent(l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer___closed__5);
+res = l___regBuiltin_Lean_PrettyPrinter_Parenthesizer_rawStx_parenthesizer(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 l_Lean_PrettyPrinter_Parenthesizer_node_parenthesizer___closed__1 = _init_l_Lean_PrettyPrinter_Parenthesizer_node_parenthesizer___closed__1();
 lean_mark_persistent(l_Lean_PrettyPrinter_Parenthesizer_node_parenthesizer___closed__1);
 l_Lean_PrettyPrinter_Parenthesizer_node_parenthesizer___closed__2 = _init_l_Lean_PrettyPrinter_Parenthesizer_node_parenthesizer___closed__2();
@@ -11466,7 +11584,7 @@ l_Lean_PrettyPrinter_Parenthesizer_interpolatedStr_parenthesizer___closed__1 = _
 lean_mark_persistent(l_Lean_PrettyPrinter_Parenthesizer_interpolatedStr_parenthesizer___closed__1);
 l_Lean_PrettyPrinter_Parenthesizer_interpolatedStr_parenthesizer___boxed__const__1 = _init_l_Lean_PrettyPrinter_Parenthesizer_interpolatedStr_parenthesizer___boxed__const__1();
 lean_mark_persistent(l_Lean_PrettyPrinter_Parenthesizer_interpolatedStr_parenthesizer___boxed__const__1);
-if (builtin) {res = l_Lean_PrettyPrinter_Parenthesizer_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_3867_(lean_io_mk_world());
+if (builtin) {res = l_Lean_PrettyPrinter_Parenthesizer_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_3888_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_PrettyPrinter_Parenthesizer_parenthesizerAliasesRef = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_PrettyPrinter_Parenthesizer_parenthesizerAliasesRef);
@@ -11491,7 +11609,7 @@ l_Lean_PrettyPrinter_parenthesizeCommand___closed__2 = _init_l_Lean_PrettyPrinte
 lean_mark_persistent(l_Lean_PrettyPrinter_parenthesizeCommand___closed__2);
 l_Lean_PrettyPrinter_parenthesizeCommand___closed__3 = _init_l_Lean_PrettyPrinter_parenthesizeCommand___closed__3();
 lean_mark_persistent(l_Lean_PrettyPrinter_parenthesizeCommand___closed__3);
-res = l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_4149_(lean_io_mk_world());
+res = l_Lean_PrettyPrinter_initFn____x40_Lean_PrettyPrinter_Parenthesizer___hyg_4170_(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));