diff --git a/stage0/src/Init/Data/Array/Basic.lean b/stage0/src/Init/Data/Array/Basic.lean
index ac3046c9ee..303e71a811 100644
--- a/stage0/src/Init/Data/Array/Basic.lean
+++ b/stage0/src/Init/Data/Array/Basic.lean
@@ -192,21 +192,20 @@ iterateM₂Aux a₁ a₂ f 0 b
 @[inline] def foldlM₂ (f : β → α → σ → m β) (b : β) (a₁ : Array α) (a₂ : Array σ): m β :=
 iterateM₂ a₁ a₂ b (fun _ a₁ a₂ b => f b a₁ a₂)
 
--- TODO(Leo): justify termination using wf-rec
-@[specialize] partial def findMAux (a : Array α) (f : α → m (Option β)) : Nat → m (Option β)
+@[specialize] partial def findSomeMAux (a : Array α) (f : α → m (Option β)) : Nat → m (Option β)
 | i =>
   if h : i < a.size then
      let idx : Fin a.size := ⟨i, h⟩;
      do r ← f (a.get idx);
         match r with
         | some v => pure r
-        | none   => findMAux (i+1)
+        | none   => findSomeMAux (i+1)
   else pure none
 
-@[inline] def findM? (a : Array α) (f : α → m (Option β)) : m (Option β) :=
-findMAux a f 0
+@[inline] def findSomeM? (a : Array α) (f : α → m (Option β)) : m (Option β) :=
+findSomeMAux a f 0
 
-@[specialize] partial def findRevMAux (a : Array α) (f : α → m (Option β)) : ∀ (idx : Nat), idx ≤ a.size → m (Option β)
+@[specialize] partial def findSomeRevMAux (a : Array α) (f : α → m (Option β)) : ∀ (idx : Nat), idx ≤ a.size → m (Option β)
 | i, h =>
   if hLt : 0 < i then
     have i - 1 < i from Nat.subLt hLt (Nat.zeroLtSucc 0);
@@ -218,14 +217,46 @@ findMAux a f 0
       | some v => pure r
       | none   =>
         have i - 1 ≤ a.size from Nat.leOfLt this;
-        findRevMAux (i-1) this
+        findSomeRevMAux (i-1) this
   else pure none
 
-@[inline] def findRevM? (a : Array α) (f : α → m (Option β)) : m (Option β) :=
-findRevMAux a f a.size (Nat.leRefl _)
-
+@[inline] def findSomeRevM? (a : Array α) (f : α → m (Option β)) : m (Option β) :=
+findSomeRevMAux a f a.size (Nat.leRefl _)
 end
 
+-- TODO(Leo): justify termination using wf-rec
+@[specialize] partial def findMAux {α : Type} {m : Type → Type} [Monad m] (a : Array α) (p : α → m Bool) : Nat → m (Option α)
+| i =>
+  if h : i < a.size then do
+    let v := a.get ⟨i, h⟩;
+    condM (p v) (pure (some v)) (findMAux (i+1))
+  else pure none
+
+@[inline] def findM? {α : Type} {m : Type → Type} [Monad m] (a : Array α) (p : α → m Bool) : m (Option α) :=
+findMAux a p 0
+
+@[inline] def find? {α : Type} (a : Array α) (p : α → Bool) : Option α :=
+Id.run $ a.findM? p
+
+@[specialize] partial def findRevMAux {α : Type} {m : Type → Type} [Monad m] (a : Array α) (p : α → m Bool) : ∀ (idx : Nat), idx ≤ a.size → m (Option α)
+| i, h =>
+  if hLt : 0 < i then
+    have i - 1 < i from Nat.subLt hLt (Nat.zeroLtSucc 0);
+    have i - 1 < a.size from Nat.ltOfLtOfLe this h;
+    let v := a.get ⟨i - 1, this⟩;
+    do {
+      condM (p v) (pure (some v)) $
+        have i - 1 ≤ a.size from Nat.leOfLt this;
+        findRevMAux (i-1) this
+    }
+  else pure none
+
+@[inline] def findRevM? {α : Type} {m : Type → Type} [Monad m] (a : Array α) (p : α → m Bool) : m (Option α) :=
+findRevMAux a p a.size (Nat.leRefl _)
+
+@[inline] def findRev? {α : Type} (a : Array α) (p : α → Bool) : Option α :=
+Id.run $ a.findRevM? p
+
 section
 variables {β : Type w} {σ : Type u}
 
@@ -247,19 +278,19 @@ Id.run $ iterateM₂Aux a₁ a₂ f 0 b
 @[inline] def foldl₂ (f : β → α → σ → β) (b : β) (a₁ : Array α) (a₂ : Array σ) : β :=
 iterate₂ a₁ a₂ b (fun _ a₁ a₂ b => f b a₁ a₂)
 
-@[inline] def find? (a : Array α) (f : α → Option β) : Option β :=
-Id.run $ findMAux a f 0
+@[inline] def findSome? (a : Array α) (f : α → Option β) : Option β :=
+Id.run $ findSomeMAux a f 0
 
-@[inline] def find! [Inhabited β] (a : Array α) (f : α → Option β) : β :=
-match find? a f with
+@[inline] def findSome! [Inhabited β] (a : Array α) (f : α → Option β) : β :=
+match findSome? a f with
 | some b => b
 | none   => panic! "failed to find element"
 
-@[inline] def findRev? (a : Array α) (f : α → Option β) : Option β :=
-Id.run $ findRevMAux a f a.size (Nat.leRefl _)
+@[inline] def findSomeRev? (a : Array α) (f : α → Option β) : Option β :=
+Id.run $ findSomeRevMAux a f a.size (Nat.leRefl _)
 
-@[inline] def findRev! [Inhabited β] (a : Array α) (f : α → Option β) : β :=
-match findRev? a f with
+@[inline] def findSomeRev! [Inhabited β] (a : Array α) (f : α → Option β) : β :=
+match findSomeRev? a f with
 | some b => b
 | none   => panic! "failed to find element"
 
diff --git a/stage0/src/Init/Data/PersistentArray/Basic.lean b/stage0/src/Init/Data/PersistentArray/Basic.lean
index c9bf7ce43d..6f0f3e0297 100644
--- a/stage0/src/Init/Data/PersistentArray/Basic.lean
+++ b/stage0/src/Init/Data/PersistentArray/Basic.lean
@@ -197,24 +197,24 @@ variable {β : Type v}
 @[specialize] def foldlM (t : PersistentArray α) (f : β → α → m β) (b : β) : m β := do
 b ← foldlMAux f t.root b; t.tail.foldlM f b
 
-@[specialize] partial def findMAux (f : α → m (Option β)) : PersistentArrayNode α → m (Option β)
-| node cs => cs.findM? (fun c => findMAux c)
-| leaf vs => vs.findM? f
+@[specialize] partial def findSomeMAux (f : α → m (Option β)) : PersistentArrayNode α → m (Option β)
+| node cs => cs.findSomeM? (fun c => findSomeMAux c)
+| leaf vs => vs.findSomeM? f
 
-@[specialize] def findM? (t : PersistentArray α) (f : α → m (Option β)) : m (Option β) := do
-b ← findMAux f t.root;
+@[specialize] def findSomeM? (t : PersistentArray α) (f : α → m (Option β)) : m (Option β) := do
+b ← findSomeMAux f t.root;
 match b with
-| none   => t.tail.findM? f
+| none   => t.tail.findSomeM? f
 | some b => pure (some b)
 
-@[specialize] partial def findRevMAux (f : α → m (Option β)) : PersistentArrayNode α → m (Option β)
-| node cs => cs.findRevM? (fun c => findRevMAux c)
-| leaf vs => vs.findRevM? f
+@[specialize] partial def findSomeRevMAux (f : α → m (Option β)) : PersistentArrayNode α → m (Option β)
+| node cs => cs.findSomeRevM? (fun c => findSomeRevMAux c)
+| leaf vs => vs.findSomeRevM? f
 
-@[specialize] def findRevM? (t : PersistentArray α) (f : α → m (Option β)) : m (Option β) := do
-b ← t.tail.findRevM? f;
+@[specialize] def findSomeRevM? (t : PersistentArray α) (f : α → m (Option β)) : m (Option β) := do
+b ← t.tail.findSomeRevM? f;
 match b with
-| none   => findRevMAux f t.root
+| none   => findSomeRevMAux f t.root
 | some b => pure (some b)
 
 partial def foldlFromMAux (f : β → α → m β) : PersistentArrayNode α → USize → USize → β → m β
@@ -252,11 +252,11 @@ else t₂.foldl PersistentArray.push t₁
 
 instance : HasAppend (PersistentArray α) := ⟨append⟩
 
-@[inline] def find? {β} (t : PersistentArray α) (f : α → (Option β)) : Option β :=
-Id.run (t.findM? f)
+@[inline] def findSome? {β} (t : PersistentArray α) (f : α → (Option β)) : Option β :=
+Id.run (t.findSomeM? f)
 
-@[inline] def findRev? {β} (t : PersistentArray α) (f : α → (Option β)) : Option β :=
-Id.run (t.findRevM? f)
+@[inline] def findSomeRev? {β} (t : PersistentArray α) (f : α → (Option β)) : Option β :=
+Id.run (t.findSomeRevM? f)
 
 @[inline] def foldlFrom {β} (t : PersistentArray α) (f : β → α → β) (b : β) (ini : Nat) : β :=
 Id.run (t.foldlFromM f b ini)
diff --git a/stage0/src/Init/Lean/Compiler/IR/CompilerM.lean b/stage0/src/Init/Lean/Compiler/IR/CompilerM.lean
index 038665f49f..a9437865b0 100644
--- a/stage0/src/Init/Lean/Compiler/IR/CompilerM.lean
+++ b/stage0/src/Init/Lean/Compiler/IR/CompilerM.lean
@@ -124,7 +124,7 @@ def addDecls (decls : Array Decl) : CompilerM Unit :=
 decls.forM addDecl
 
 def findEnvDecl' (env : Environment) (n : Name) (decls : Array Decl) : Option Decl :=
-match decls.find? (fun decl => if decl.name == n then some decl else none) with
+match decls.find? (fun decl => decl.name == n) with
 | some decl => some decl
 | none      => (declMapExt.getState env).find? n
 
diff --git a/stage0/src/Init/Lean/Elab/Quotation.lean b/stage0/src/Init/Lean/Elab/Quotation.lean
index f83c31746c..7e259170d2 100644
--- a/stage0/src/Init/Lean/Elab/Quotation.lean
+++ b/stage0/src/Init/Lean/Elab/Quotation.lean
@@ -93,7 +93,7 @@ stx.isOfKind nullKind && stx.getArgs.any isAntiquotSplice
     explicit kinds behave the same at runtime. So we replace `choice` nodes that contain
     at least one implicit antiquotation with that antiquotation. -/
 private partial def elimAntiquotChoices : Syntax → Syntax
-| Syntax.node `choice args => match args.find? (fun arg => if antiquotKind? arg == Name.anonymous then some arg else none) with
+| Syntax.node `choice args => match args.find? (fun arg => antiquotKind? arg == Name.anonymous) with
   | some anti => anti
   | none      => Syntax.node `choice $ args.map elimAntiquotChoices
 | Syntax.node k args       => Syntax.node k $ args.map elimAntiquotChoices
diff --git a/stage0/src/Init/Lean/Elab/Syntax.lean b/stage0/src/Init/Lean/Elab/Syntax.lean
index 1efea57623..c6e486a6c0 100644
--- a/stage0/src/Init/Lean/Elab/Syntax.lean
+++ b/stage0/src/Init/Lean/Elab/Syntax.lean
@@ -180,26 +180,54 @@ fun stx => do
   trace `Elab stx $ fun _ => d;
   withMacroExpansion stx d $ elabCommand d
 
-def getMacroRulesAltKind (alt : Syntax) : CommandElabM SyntaxNodeKind :=
+def elabMacroRulesAux (k : SyntaxNodeKind) (alts : Array Syntax) : CommandElabM Syntax := do
+alts ← alts.mapSepElemsM $ fun alt => do {
+  let lhs := alt.getArg 0;
+  let pat := lhs.getArg 0;
+  match_syntax pat with
+  | `(`($quot)) =>
+     let k' := quot.getKind;
+     if k' == k then
+       pure alt
+     else if k' == choiceKind then do
+        match quot.getArgs.find? $ fun quotAlt => quotAlt.getKind == k with
+        | none      => throwError alt ("invalid macro_rules alternative, expected syntax node kind '" ++ k ++ "'")
+        | some quot => do
+          pat ← `(`($quot));
+          let lhs := lhs.setArg 0 pat;
+          pure $ alt.setArg 0 lhs
+     else
+       throwError alt ("invalid macro_rules alternative, unexpected syntax node kind '" ++ k' ++ "'")
+  | stx => throwUnsupportedSyntax
+};
+`(@[macro $(Lean.mkIdent k)] def myMacro : Macro := fun stx => match_syntax stx with $alts:matchAlt* | _ => throw Lean.Macro.Exception.unsupportedSyntax)
+
+def inferMacroRulesAltKind (alt : Syntax) : CommandElabM SyntaxNodeKind :=
 match_syntax (alt.getArg 0).getArg 0 with
 | `(`($quot)) => pure quot.getKind
 | stx         => throwUnsupportedSyntax
 
-def elabMacroRulesAux (alts : Array Syntax) : CommandElabM Syntax := do
-k ← getMacroRulesAltKind (alts.get! 0);
-altsK    ← alts.filterSepElemsM (fun alt => do k' ← getMacroRulesAltKind alt; pure $ k == k');
-altsNotK ← alts.filterSepElemsM (fun alt => do k' ← getMacroRulesAltKind alt; pure $ k != k');
-altsKDef ← `(@[macro $(Lean.mkIdent k)] def myMacro : Macro := fun stx => match_syntax stx with $altsK:matchAlt* | _ => throw Lean.Macro.Exception.unsupportedSyntax);
-if altsNotK.isEmpty then
-  pure altsKDef
-else
-  `($altsKDef:command macro_rules $altsNotK:matchAlt*)
+def elabNoKindMacroRulesAux (alts : Array Syntax) : CommandElabM Syntax := do
+k ← inferMacroRulesAltKind (alts.get! 0);
+if k == choiceKind then
+  throwError (alts.get! 0)
+    "invalid macro_rules alternative, multiple interpretations for pattern (solution: specify node kind using `macro_rules [<kind>] ...`)"
+else do
+  altsK    ← alts.filterSepElemsM (fun alt => do k' ← inferMacroRulesAltKind alt; pure $ k == k');
+  altsNotK ← alts.filterSepElemsM (fun alt => do k' ← inferMacroRulesAltKind alt; pure $ k != k');
+  defCmd   ← elabMacroRulesAux k altsK;
+  if altsNotK.isEmpty then
+    pure defCmd
+  else
+    `($defCmd:command macro_rules $altsNotK:matchAlt*)
 
 @[builtinCommandElab «macro_rules»] def elabMacroRules : CommandElab :=
 adaptExpander $ fun stx => match_syntax stx with
-| `(macro_rules $alts:matchAlt*)   => elabMacroRulesAux alts
-| `(macro_rules | $alts:matchAlt*) => elabMacroRulesAux alts
-| _                                => throwUnsupportedSyntax
+| `(macro_rules $alts:matchAlt*)           => elabNoKindMacroRulesAux alts
+| `(macro_rules | $alts:matchAlt*)         => elabNoKindMacroRulesAux alts
+| `(macro_rules [$kind] $alts:matchAlt*)   => elabMacroRulesAux kind.getId alts
+| `(macro_rules [$kind] | $alts:matchAlt*) => elabMacroRulesAux kind.getId alts
+| _                                        => throwUnsupportedSyntax
 
 /- We just ignore Lean3 notation declaration commands. -/
 @[builtinCommandElab «mixfix»] def elabMixfix : CommandElab := fun _ => pure ()
diff --git a/stage0/src/Init/Lean/Elab/TermApp.lean b/stage0/src/Init/Lean/Elab/TermApp.lean
index c75c76754a..2e4a90693b 100644
--- a/stage0/src/Init/Lean/Elab/TermApp.lean
+++ b/stage0/src/Init/Lean/Elab/TermApp.lean
@@ -342,8 +342,10 @@ private partial def elabAppFn (ref : Syntax) : Syntax → List LVal → Array Na
     us ← if us.isEmpty then pure [] else elabExplicitUniv (us.get! 0);
     elabAppFnId ref id us lvals namedArgs args expectedType? explicit acc
   | _ => do
-    f ← elabTerm f none;
-    s ← observing $ elabAppLVals ref f lvals namedArgs args expectedType? explicit;
+    s ← observing $ do {
+      f ← elabTerm f none;
+      elabAppLVals ref f lvals namedArgs args expectedType? explicit
+    };
     pure $ acc.push s
 
 private def getSuccess (candidates : Array TermElabResult) : Array TermElabResult :=
diff --git a/stage0/src/Init/Lean/LocalContext.lean b/stage0/src/Init/Lean/LocalContext.lean
index ac0a285efb..60e22f460d 100644
--- a/stage0/src/Init/Lean/LocalContext.lean
+++ b/stage0/src/Init/Lean/LocalContext.lean
@@ -141,7 +141,7 @@ match lctx with
 
 @[export lean_local_ctx_find_from_user_name]
 def findFromUserName? (lctx : LocalContext) (userName : Name) : Option LocalDecl :=
-lctx.decls.findRev? (fun decl =>
+lctx.decls.findSomeRev? (fun decl =>
   match decl with
   | none      => none
   | some decl => if decl.userName == userName then some decl else none)
@@ -202,12 +202,12 @@ lctx.decls.forM $ fun decl => match decl with
   | some decl => f decl *> pure PUnit.unit
 
 @[specialize] def findDeclM? (lctx : LocalContext) (f : LocalDecl → m (Option β)) : m (Option β) :=
-lctx.decls.findM? $ fun decl => match decl with
+lctx.decls.findSomeM? $ fun decl => match decl with
   | none      => pure none
   | some decl => f decl
 
 @[specialize] def findDeclRevM? (lctx : LocalContext) (f : LocalDecl → m (Option β)) : m (Option β) :=
-lctx.decls.findRevM? $ fun decl => match decl with
+lctx.decls.findSomeRevM? $ fun decl => match decl with
   | none      => pure none
   | some decl => f decl
 
diff --git a/stage0/src/Init/Lean/Parser/Parser.lean b/stage0/src/Init/Lean/Parser/Parser.lean
index c1ffa238bd..401a231bb8 100644
--- a/stage0/src/Init/Lean/Parser/Parser.lean
+++ b/stage0/src/Init/Lean/Parser/Parser.lean
@@ -988,7 +988,7 @@ match prev.getTailInfo with
 | none      => false
 
 private def pickNonNone (stack : Array Syntax) : Syntax :=
-match stack.findRev? $ fun stx => if stx.isNone then none else some stx with
+match stack.findRev? $ fun stx => !stx.isNone with
 | none => Syntax.missing
 | some stx => stx
 
diff --git a/stage0/src/Init/Lean/Structure.lean b/stage0/src/Init/Lean/Structure.lean
index c168ffb144..dd72de090c 100644
--- a/stage0/src/Init/Lean/Structure.lean
+++ b/stage0/src/Init/Lean/Structure.lean
@@ -84,7 +84,7 @@ partial def findField? (env : Environment) : Name → Name → Option Name
   if (getStructureFields env structName).contains fieldName then
     some structName
   else
-    (getParentStructures env structName).find? $ fun parentStructName => findField? parentStructName fieldName
+    (getParentStructures env structName).findSome? $ fun parentStructName => findField? parentStructName fieldName
 
 private partial def getStructureFieldsFlattenedAux (env : Environment) : Name → Array Name → Array Name
 | structName, fullNames =>
@@ -127,7 +127,7 @@ partial def getPathToBaseStructureAux (env : Environment) (baseStructName : Name
     some path.reverse
   else
     let fieldNames := getStructureFields env structName;
-    fieldNames.find? $ fun fieldName =>
+    fieldNames.findSome? $ fun fieldName =>
       match isSubobjectField? env structName fieldName with
       | none                  => none
       | some parentStructName => getPathToBaseStructureAux parentStructName ((structName ++ fieldName) :: path)
diff --git a/stage0/src/Init/Lean/Syntax.lean b/stage0/src/Init/Lean/Syntax.lean
index ee5aa54ec8..852466bba3 100644
--- a/stage0/src/Init/Lean/Syntax.lean
+++ b/stage0/src/Init/Lean/Syntax.lean
@@ -191,13 +191,13 @@ SourceInfo.pos <$> stx.getHeadInfo
 partial def getTailWithInfo : Syntax → Option Syntax
 | stx@(atom (some _) _)      => some stx
 | stx@(ident (some _) _ _ _) => some stx
-| node _ args                => args.findRev? getTailWithInfo
+| node _ args                => args.findSomeRev? getTailWithInfo
 | _                          => none
 
 partial def getTailInfo : Syntax → Option SourceInfo
 | atom info _      => info
 | ident info _ _ _ => info
-| node _ args      => args.findRev? getTailInfo
+| node _ args      => args.findSomeRev? getTailInfo
 | _                => none
 
 @[specialize] private partial def updateLast {α} [Inhabited α] (a : Array α) (f : α → Option α) : Nat → Option (Array α)
diff --git a/stage0/src/Init/LeanInit.lean b/stage0/src/Init/LeanInit.lean
index e3f0ce566c..5820bac15e 100644
--- a/stage0/src/Init/LeanInit.lean
+++ b/stage0/src/Init/LeanInit.lean
@@ -245,7 +245,7 @@ match stx with
 partial def getHeadInfo : Syntax → Option SourceInfo
 | atom info _      => info
 | ident info _ _ _ => info
-| node _ args      => args.find? getHeadInfo
+| node _ args      => args.findSome? getHeadInfo
 | _                => none
 
 end Syntax
@@ -782,4 +782,22 @@ filterSepElemsMAux a p 0 #[]
 def filterSepElems (a : Array Syntax) (p : Syntax → Bool) : Array Syntax :=
 Id.run $ a.filterSepElemsM p
 
+private partial def mapSepElemsMAux {m : Type → Type} [Monad m] (a : Array Syntax) (f : Syntax → m Syntax) : Nat → Array Syntax → m (Array Syntax)
+| i, acc =>
+  if h : i < a.size then do
+    let stx := a.get ⟨i, h⟩;
+    if i % 2 == 0 then do
+      stx ← f stx;
+      mapSepElemsMAux (i+1) (acc.push stx)
+    else
+      mapSepElemsMAux (i+1) (acc.push stx)
+  else
+    pure acc
+
+def mapSepElemsM {m : Type → Type} [Monad m] (a : Array Syntax) (f : Syntax → m Syntax) : m (Array Syntax) :=
+mapSepElemsMAux a f 0 #[]
+
+def mapSepElems (a : Array Syntax) (f : Syntax → Syntax) : Array Syntax :=
+Id.run $ a.mapSepElemsM f
+
 end Array
diff --git a/stage0/stdlib/Init/Data/Array/Basic.c b/stage0/stdlib/Init/Data/Array/Basic.c
index 82911954f9..a3d50da601 100644
--- a/stage0/stdlib/Init/Data/Array/Basic.c
+++ b/stage0/stdlib/Init/Data/Array/Basic.c
@@ -13,6 +13,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_getD(lean_object*);
 lean_object* l_Array_forM(lean_object*);
 lean_object* l_Array_foldlM_u2082___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -25,6 +26,7 @@ lean_object* l_Array_iterateM_u2082Aux___main(lean_object*, lean_object*);
 lean_object* l_Array_iterate_u2082(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_extractAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_HasBeq(lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_elem___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyFrom___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStep(lean_object*, lean_object*);
@@ -42,9 +44,11 @@ lean_object* l_Array_forM___rarg(lean_object*, lean_object*, lean_object*, lean_
 lean_object* l_Array_foldrRange___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_div(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_iterateFrom___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_mkArray___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__2(lean_object*, lean_object*);
+lean_object* l_Array_findSome_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_mapIdxM(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_mapM___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyRange___spec__2(lean_object*);
@@ -70,6 +74,7 @@ lean_object* l_Array_uset___boxed(lean_object*, lean_object*, lean_object*, lean
 lean_object* l_Array_iterateM_u2082(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Array_allRange___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_extractAux(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_HasToString___rarg(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyFrom___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -82,6 +87,7 @@ lean_object* l_Array_iterateMAux___main___at_Array_foldlFromM___spec__1___rarg(l
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___at_Array_foldrRange___spec__2(lean_object*, lean_object*);
 lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Array_umapM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filter(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Array_foldr___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3;
@@ -105,9 +111,13 @@ lean_object* l_Array_allRange(lean_object*);
 lean_object* l_Array_isEqvAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepM(lean_object*, lean_object*);
 lean_object* l_Array_all___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyM(lean_object*, lean_object*);
 lean_object* l_Array_reverseAux___main___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeM_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_Array_all(lean_object*);
+lean_object* l_Array_findSomeRev_x21___rarg___closed__1;
+lean_object* l_Array_findSomeRev_x21___rarg___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Array_all___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_reverseAux(lean_object*);
 lean_object* l_Array_foldl_u2082___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -118,9 +128,12 @@ lean_object* l_Array_findIdxAux___main___rarg(lean_object*, lean_object*, lean_o
 lean_object* l_Array_foldlStepMAux___main___at_Array_getEvenElems___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+lean_object* l_Array_findSomeRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Array_getEvenElems___rarg___boxed(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_umapM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_map___rarg(lean_object*, lean_object*);
 lean_object* l_Array_findRevMAux(lean_object*, lean_object*);
@@ -137,22 +150,26 @@ lean_object* l_Array_findIdx_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_find_x3f___rarg(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Array_allRange___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_back(lean_object*);
-lean_object* l_Array_findM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findM_x3f___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateM_u2082Aux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlFromM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toArray___rarg(lean_object*);
 lean_object* l_Array_modifyM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRange___spec__2(lean_object*);
 uint8_t l_Array_allRange___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_singleton(lean_object*);
-lean_object* l_Array_find_x3f(lean_object*, lean_object*);
+lean_object* l_Array_find_x3f(lean_object*);
 lean_object* l_Array_foldlM_u2082(lean_object*, lean_object*);
 lean_object* l_Array_foldlFrom___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapM(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___boxed(lean_object*, lean_object*);
 uint8_t l_Array_isEqvAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRange___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyFrom___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -174,7 +191,7 @@ lean_object* l_Array_anyRange(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_contains___spec__1(lean_object*);
 lean_object* l_Array_mapIdx___rarg(lean_object*, lean_object*);
 lean_object* l_Array_swap___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_get_x21___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_swap_x21___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -183,10 +200,11 @@ lean_object* l_Array_foldrM(lean_object*, lean_object*);
 lean_object* l_Array_extractAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterate_u2082___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRev_x3f(lean_object*, lean_object*);
 lean_object* l_Array_filterMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdxAux___main___rarg(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Array_foldr___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSome_x21___rarg___closed__2;
 lean_object* l_Array_mapIdx(lean_object*, lean_object*);
 lean_object* l_Array_indexOfAux___main(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldlFrom___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -206,7 +224,6 @@ lean_object* l_Array_HasRepr___rarg___boxed(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Array_HasToString___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapIdxM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Array_mapIdx___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Array_iterateRev___spec__1(lean_object*, lean_object*);
@@ -230,13 +247,12 @@ lean_object* l_Array_iterateMAux___main___at_Array_mapM___spec__1___boxed(lean_o
 lean_object* l_Array_mapM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlM_u2082___boxed(lean_object*, lean_object*);
 lean_object* l_Array_shrink___main___rarg(lean_object*, lean_object*);
-lean_object* l_Array_findRev_x3f(lean_object*, lean_object*);
+lean_object* l_Array_findRev_x3f(lean_object*);
 lean_object* l_Array_indexOfAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_indexOf(lean_object*);
-lean_object* l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrRangeM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux(lean_object*, lean_object*);
 lean_object* l_Array_iterateFrom___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_any___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -281,12 +297,14 @@ lean_object* l_Array_iterateMAux___main___rarg(lean_object*, lean_object*, lean_
 lean_object* l_Array_mapM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_forRevMAux___main___boxed(lean_object*);
 lean_object* l_Array_mkEmpty___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyRange___spec__1(lean_object*);
 lean_object* l_Array_iterateM(lean_object*, lean_object*);
 lean_object* l_Array_iterateM_u2082Aux___main___at_Array_iterate_u2082___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateM_u2082Aux___main___at_Array_foldlM_u2082___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_back___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyRange___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlFromM___boxed(lean_object*, lean_object*);
@@ -303,6 +321,7 @@ lean_object* l_Array_getOp(lean_object*);
 lean_object* l_Array_modify___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toString___rarg(lean_object*, lean_object*);
 lean_object* l_Array_findRevMAux___main(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevM_x3f(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allM___spec__1___rarg___lambda__1(lean_object*, uint8_t);
 lean_object* l_Array_iterateRevM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_iterate___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -311,7 +330,8 @@ lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Arr
 lean_object* l_Array_iterateM_u2082Aux___main___at_Array_foldl_u2082___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_append(lean_object*);
 lean_object* l_Array_umapIdxM(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Array_find_x21___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_umapM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_forMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -319,16 +339,18 @@ lean_object* l_Array_foldrRangeM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_findRevM_x3f(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldl___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_toList___rarg___boxed(lean_object*);
+lean_object* l_Array_findSomeRevM_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_Array_reverse___rarg(lean_object*);
 lean_object* l_Array_findRev_x3f___rarg___boxed(lean_object*, lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 lean_object* l_Array_any(lean_object*);
 lean_object* l_Array_eraseIdxSzAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findRevM_x3f___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_HasBeq___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_swapAt___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_HasEmptyc(lean_object*);
+lean_object* l_Array_findSomeMAux(lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___main(lean_object*);
 lean_object* l_Array_foldlStepMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -338,7 +360,6 @@ lean_object* l_Array_iterateM_u2082Aux___main___at_Array_foldl_u2082___spec__1__
 lean_object* l_Array_umapMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findIdxAux___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldr___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_find_x21___rarg___closed__2;
 lean_object* l_Array_mapIdxM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forRevMAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -350,11 +371,12 @@ lean_object* l_Array_allM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_foldlFromM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateFrom___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSome_x21___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateM_u2082___boxed(lean_object*, lean_object*);
 lean_object* l_List_toArrayAux(lean_object*);
 lean_object* l_Array_umapMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSome_x21___rarg___closed__1;
 lean_object* l_Array_insertAt___rarg___closed__2;
-lean_object* l_Array_findRev_x21(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Array_umapM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_extractAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main(lean_object*, lean_object*);
@@ -364,13 +386,14 @@ uint8_t l_Array_contains___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_find_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_getOp___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_data___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_getD___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___at_Array_foldrRange___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrRangeM(lean_object*, lean_object*);
 lean_object* l_Array_foldlStepM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_foldrRange___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1(lean_object*);
 lean_object* l_Array_foldrM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdxSzAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateRev___rarg(lean_object*, lean_object*, lean_object*);
@@ -380,16 +403,18 @@ lean_object* l_Array_insertAt___rarg___boxed(lean_object*, lean_object*, lean_ob
 lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_insertAt___rarg___closed__1;
 lean_object* l_Array_findMAux___main(lean_object*, lean_object*);
+lean_object* l_Array_findSome_x3f(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__1___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldlFrom___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyFrom___spec__2(lean_object*);
 lean_object* l_Array_eraseIdxAux___main(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldlFromM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_redLength___rarg(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_mapM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_allRangeM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRange___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -413,6 +438,7 @@ lean_object* l_Array_iterateM_u2082Aux___main___rarg(lean_object*, lean_object*,
 lean_object* l_Array_anyRangeMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_allRangeM(lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRev_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_findRevMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_extractAux___main(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldlM___spec__1(lean_object*, lean_object*);
@@ -422,12 +448,13 @@ uint8_t l_Array_HasBeq___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_shrink(lean_object*);
 lean_object* l_Array_foldl_u2082(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_isEmpty(lean_object*);
-lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1(lean_object*);
 lean_object* l_Array_foldlStepM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_any___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Array_map___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_iterateRev___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldr___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlFrom___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -436,19 +463,17 @@ lean_object* l_Array_foldlStep___rarg(lean_object*, lean_object*, lean_object*,
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_List_redLength(lean_object*);
 lean_object* l_Array_findMAux___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findRev_x21___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_insertAtAux___rarg___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_elem___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_find_x21___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlM___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___at_Array_swapAt_x21___spec__1___rarg(lean_object*, lean_object*);
-lean_object* l_Array_find_x21___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdxAux(lean_object*);
 lean_object* l_Array_mapIdxM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_isEmpty___rarg___boxed(lean_object*);
 lean_object* l_Array_iterateRevM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_all___spec__1(lean_object*);
 lean_object* l_Array_findMAux(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterAux___main(lean_object*);
 lean_object* l_Array_Inhabited(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_1__swapAtPanic_x21(lean_object*);
@@ -457,26 +482,23 @@ lean_object* l_Array_forRevMAux___main___rarg___boxed(lean_object*, lean_object*
 lean_object* l_Array_HasToString(lean_object*);
 lean_object* l_Array_anyM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_umapM(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdx_x27___rarg(lean_object*, lean_object*);
 lean_object* l_Array_findIdx_x21(lean_object*);
 lean_object* l_Array_back___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_filterMAux___boxed(lean_object*);
 lean_object* l_Array_iterateMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main(lean_object*);
-lean_object* l_Array_findRev_x21___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_indexOf___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRev_x21___rarg___closed__1;
 lean_object* l_Array_getEvenElems___rarg(lean_object*);
 lean_object* l_Array_findIdxAux(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_foldlFromM___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_eraseIdx___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_mapM___spec__1(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allM___spec__1___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_find_x21___rarg___closed__1;
 lean_object* l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__2;
+lean_object* l_Array_findSomeRev_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeM(lean_object*, lean_object*);
 lean_object* l_Array_forRevM(lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
@@ -485,6 +507,7 @@ lean_object* l_Array_iterateMAux___main___at_Array_iterate___spec__1___rarg(lean
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__2___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_getEvenElems(lean_object*);
 lean_object* l_Array_findIdxAux___main(lean_object*);
+lean_object* l_Array_findSome_x21(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__2___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Array_get_x3f(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Array_foldrM___spec__1(lean_object*, lean_object*);
@@ -496,7 +519,7 @@ lean_object* l_Array_foldlStepMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_findIdx_x3f(lean_object*);
 lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_feraseIdx___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_getOp___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_toList___rarg(lean_object*);
 lean_object* l_Array_swapAt_x21___rarg(lean_object*, lean_object*, lean_object*);
@@ -510,21 +533,23 @@ lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___rarg__
 lean_object* l_Array_reverseAux___rarg(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_anyRange___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main(lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Array_findIdxAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forRevMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterate_u2082___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdxSzAuxInstance(lean_object*);
-lean_object* l_Array_find_x21(lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___at_Array_getEvenElems___spec__1(lean_object*);
 lean_object* l_Array_foldlM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_allRangeM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux(lean_object*, lean_object*);
 lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_HasAppend(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_findIdx_x21___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRev_x21(lean_object*, lean_object*);
 lean_object* l_Array_findIdx_x21___rarg___closed__1;
 lean_object* l_Array_forRevMAux(lean_object*);
 lean_object* l_Array_iterate(lean_object*, lean_object*);
@@ -536,13 +561,18 @@ lean_object* l_Array_contains(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___main___at_Array_foldrRange___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_insertAtAux___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRev_x21___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_all___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_reverseAux___main(lean_object*);
+lean_object* l_Array_findSome_x21___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_swapAt_x21(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_mapIdxM___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_sz___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Array_foldlStep___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterM(lean_object*);
@@ -551,9 +581,11 @@ uint8_t l_Array_anyRangeMAux___main___at_Array_contains___spec__1___rarg(lean_ob
 lean_object* l_Array_filterAux(lean_object*);
 lean_object* l_Array_isEqv___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateM_u2082Aux___main___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSome_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Array_foldrM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_filterMAux___main___boxed(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_4__foldrRangeMAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_isEqvAux___main(lean_object*);
@@ -566,12 +598,16 @@ lean_object* l_Array_HasRepr(lean_object*);
 lean_object* l_Array_mk___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Array_umapMAux___main(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___boxed(lean_object*, lean_object*);
 lean_object* l_Array_insertAt___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_mapIdxM___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Array_contains___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateFrom(lean_object*, lean_object*);
 lean_object* l_Array_eraseIdxAux___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeM_x3f(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Array_umapM___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_iterate___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyFrom(lean_object*);
@@ -589,7 +625,7 @@ lean_object* l_Array_iterateM_u2082___rarg(lean_object*, lean_object*, lean_obje
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_Array_foldr(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allRangeM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findRevMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_indexOfAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldl___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mk___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
@@ -1743,7 +1779,7 @@ lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_findSomeMAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 if (lean_obj_tag(x_5) == 0)
@@ -1751,7 +1787,7 @@ if (lean_obj_tag(x_5) == 0)
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_unsigned_to_nat(1u);
 x_7 = lean_nat_add(x_1, x_6);
-x_8 = l_Array_findMAux___main___rarg(x_2, lean_box(0), x_3, x_4, x_7);
+x_8 = l_Array_findSomeMAux___main___rarg(x_2, lean_box(0), x_3, x_4, x_7);
 return x_8;
 }
 else
@@ -1770,7 +1806,7 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_findSomeMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; uint8_t x_7; 
@@ -1801,7 +1837,7 @@ lean_inc(x_12);
 x_13 = lean_array_fget(x_3, x_5);
 lean_inc(x_4);
 x_14 = lean_apply_1(x_4, x_13);
-x_15 = lean_alloc_closure((void*)(l_Array_findMAux___main___rarg___lambda__1___boxed), 5, 4);
+x_15 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___rarg___lambda__1___boxed), 5, 4);
 lean_closure_set(x_15, 0, x_5);
 lean_closure_set(x_15, 1, x_1);
 lean_closure_set(x_15, 2, x_3);
@@ -1811,90 +1847,90 @@ return x_16;
 }
 }
 }
-lean_object* l_Array_findMAux___main(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___rarg), 5, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___rarg), 5, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___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* l_Array_findSomeMAux___main___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l_Array_findMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Array_findSomeMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_1);
 return x_6;
 }
 }
-lean_object* l_Array_findMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Array_findMAux___main(x_1, x_2);
+x_3 = l_Array_findSomeMAux___main(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_findSomeMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l_Array_findMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5);
+x_6 = l_Array_findSomeMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5);
 return x_6;
 }
 }
-lean_object* l_Array_findMAux(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___rarg), 5, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___rarg), 5, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Array_findMAux(x_1, x_2);
+x_3 = l_Array_findSomeMAux(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findM_x3f___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeM_x3f___rarg(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; 
 x_5 = lean_unsigned_to_nat(0u);
-x_6 = l_Array_findMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5);
+x_6 = l_Array_findSomeMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5);
 return x_6;
 }
 }
-lean_object* l_Array_findM_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeM_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findM_x3f___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeM_x3f___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Array_findM_x3f(x_1, x_2);
+x_3 = l_Array_findSomeM_x3f(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_findSomeRevMAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; 
-x_6 = l_Array_findRevMAux___main___rarg(x_1, lean_box(0), x_2, x_3, x_4, lean_box(0));
+x_6 = l_Array_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_2, x_3, x_4, lean_box(0));
 return x_6;
 }
 else
@@ -1913,7 +1949,7 @@ return x_9;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findSomeRevMAux___main___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; uint8_t x_8; 
@@ -1944,7 +1980,7 @@ lean_inc(x_15);
 x_16 = lean_array_fget(x_3, x_14);
 lean_inc(x_4);
 x_17 = lean_apply_1(x_4, x_16);
-x_18 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___rarg___lambda__1___boxed), 5, 4);
+x_18 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___rarg___lambda__1___boxed), 5, 4);
 lean_closure_set(x_18, 0, x_1);
 lean_closure_set(x_18, 1, x_3);
 lean_closure_set(x_18, 2, x_4);
@@ -1954,32 +1990,442 @@ return x_19;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRevMAux___main(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___rarg___boxed), 6, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___rarg___boxed), 6, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___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* l_Array_findSomeRevMAux___main___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l_Array_findRevMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Array_findSomeRevMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 return x_6;
 }
 }
-lean_object* l_Array_findRevMAux___main___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* l_Array_findSomeRevMAux___main___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_Array_findRevMAux___main___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 return x_7;
 }
 }
+lean_object* l_Array_findSomeRevMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findSomeRevMAux___main(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_findSomeRevMAux___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; 
+x_7 = l_Array_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5, lean_box(0));
+return x_7;
+}
+}
+lean_object* l_Array_findSomeRevMAux(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+lean_object* l_Array_findSomeRevMAux___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_Array_findSomeRevMAux___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
+lean_object* l_Array_findSomeRevMAux___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findSomeRevMAux(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_findSomeRevM_x3f___rarg(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; 
+x_5 = lean_array_get_size(x_3);
+x_6 = l_Array_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5, lean_box(0));
+lean_dec(x_5);
+return x_6;
+}
+}
+lean_object* l_Array_findSomeRevM_x3f(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevM_x3f___rarg), 4, 0);
+return x_3;
+}
+}
+lean_object* l_Array_findSomeRevM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findSomeRevM_x3f(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_findMAux___main___rarg___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) {
+_start:
+{
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_dec(x_5);
+x_7 = lean_unsigned_to_nat(1u);
+x_8 = lean_nat_add(x_1, x_7);
+x_9 = l_Array_findMAux___main___rarg(x_2, x_3, x_4, x_8);
+return x_9;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_dec(x_4);
+lean_dec(x_3);
+x_10 = lean_ctor_get(x_2, 0);
+lean_inc(x_10);
+lean_dec(x_2);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_12, 0, x_5);
+x_13 = lean_apply_2(x_11, lean_box(0), x_12);
+return x_13;
+}
+}
+}
+lean_object* l_Array_findMAux___main___rarg(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_array_get_size(x_2);
+x_6 = lean_nat_dec_lt(x_4, x_5);
+lean_dec(x_5);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_7 = lean_ctor_get(x_1, 0);
+lean_inc(x_7);
+lean_dec(x_1);
+x_8 = lean_ctor_get(x_7, 1);
+lean_inc(x_8);
+lean_dec(x_7);
+x_9 = lean_box(0);
+x_10 = lean_apply_2(x_8, lean_box(0), x_9);
+return x_10;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_11 = lean_array_fget(x_2, x_4);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
+lean_inc(x_3);
+lean_inc(x_11);
+x_13 = lean_apply_1(x_3, x_11);
+x_14 = lean_alloc_closure((void*)(l_Array_findMAux___main___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_14, 0, x_4);
+lean_closure_set(x_14, 1, x_1);
+lean_closure_set(x_14, 2, x_2);
+lean_closure_set(x_14, 3, x_3);
+lean_closure_set(x_14, 4, x_11);
+x_15 = lean_apply_4(x_12, lean_box(0), lean_box(0), x_13, x_14);
+return x_15;
+}
+}
+}
+lean_object* l_Array_findMAux___main(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___rarg), 4, 0);
+return x_3;
+}
+}
+lean_object* l_Array_findMAux___main___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) {
+_start:
+{
+uint8_t x_7; lean_object* x_8; 
+x_7 = lean_unbox(x_6);
+lean_dec(x_6);
+x_8 = l_Array_findMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5, x_7);
+lean_dec(x_1);
+return x_8;
+}
+}
+lean_object* l_Array_findMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findMAux___main(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_findMAux___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_Array_findMAux___main___rarg(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
+lean_object* l_Array_findMAux(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_findMAux___rarg), 4, 0);
+return x_3;
+}
+}
+lean_object* l_Array_findMAux___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findMAux(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_findM_x3f___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = l_Array_findMAux___main___rarg(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
+lean_object* l_Array_findM_x3f(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_findM_x3f___rarg), 3, 0);
+return x_3;
+}
+}
+lean_object* l_Array_findM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findM_x3f(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_array_get_size(x_2);
+x_5 = lean_nat_dec_lt(x_3, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
+{
+lean_object* x_6; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_6 = lean_box(0);
+return x_6;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_array_fget(x_2, x_3);
+lean_inc(x_1);
+lean_inc(x_7);
+x_8 = lean_apply_1(x_1, x_7);
+x_9 = lean_unbox(x_8);
+lean_dec(x_8);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
+lean_dec(x_7);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_3, x_10);
+lean_dec(x_3);
+x_3 = x_11;
+goto _start;
+}
+else
+{
+lean_object* x_13; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_13 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_13, 0, x_7);
+return x_13;
+}
+}
+}
+}
+lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Array_find_x3f___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; 
+x_3 = lean_unsigned_to_nat(0u);
+x_4 = l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(x_2, x_1, x_3);
+return x_4;
+}
+}
+lean_object* l_Array_find_x3f(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_find_x3f___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
+lean_object* l_Array_find_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_find_x3f___rarg(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_Array_findRevMAux___main___rarg___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) {
+_start:
+{
+if (x_6 == 0)
+{
+lean_object* x_7; 
+lean_dec(x_5);
+x_7 = l_Array_findRevMAux___main___rarg(x_1, x_2, x_3, x_4, lean_box(0));
+return x_7;
+}
+else
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_8 = lean_ctor_get(x_1, 0);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_10, 0, x_5);
+x_11 = lean_apply_2(x_9, lean_box(0), x_10);
+return x_11;
+}
+}
+}
+lean_object* l_Array_findRevMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_nat_dec_lt(x_6, x_4);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_8 = lean_ctor_get(x_1, 0);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = lean_box(0);
+x_11 = lean_apply_2(x_9, lean_box(0), x_10);
+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; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_sub(x_4, x_12);
+x_14 = lean_array_fget(x_2, x_13);
+x_15 = lean_ctor_get(x_1, 1);
+lean_inc(x_15);
+lean_inc(x_3);
+lean_inc(x_14);
+x_16 = lean_apply_1(x_3, x_14);
+x_17 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_17, 0, x_1);
+lean_closure_set(x_17, 1, x_2);
+lean_closure_set(x_17, 2, x_3);
+lean_closure_set(x_17, 3, x_13);
+lean_closure_set(x_17, 4, x_14);
+x_18 = lean_apply_4(x_15, lean_box(0), lean_box(0), x_16, x_17);
+return x_18;
+}
+}
+}
+lean_object* l_Array_findRevMAux___main(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___rarg___boxed), 5, 0);
+return x_3;
+}
+}
+lean_object* l_Array_findRevMAux___main___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) {
+_start:
+{
+uint8_t x_7; lean_object* x_8; 
+x_7 = lean_unbox(x_6);
+lean_dec(x_6);
+x_8 = l_Array_findRevMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5, x_7);
+lean_dec(x_4);
+return x_8;
+}
+}
+lean_object* l_Array_findRevMAux___main___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Array_findRevMAux___main___rarg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
+}
+}
 lean_object* l_Array_findRevMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -1989,29 +2435,29 @@ lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findRevMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5, lean_box(0));
-return x_7;
+lean_object* x_6; 
+x_6 = l_Array_findRevMAux___main___rarg(x_1, x_2, x_3, x_4, lean_box(0));
+return x_6;
 }
 }
 lean_object* l_Array_findRevMAux(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___rarg___boxed), 6, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___rarg___boxed), 5, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___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* l_Array_findRevMAux___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Array_findRevMAux___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-return x_7;
+lean_object* x_6; 
+x_6 = l_Array_findRevMAux___rarg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
 }
 }
 lean_object* l_Array_findRevMAux___boxed(lean_object* x_1, lean_object* x_2) {
@@ -2023,21 +2469,21 @@ lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findRevM_x3f___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findRevM_x3f___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; 
-x_5 = lean_array_get_size(x_3);
-x_6 = l_Array_findRevMAux___main___rarg(x_1, lean_box(0), x_3, x_4, x_5, lean_box(0));
-lean_dec(x_5);
-return x_6;
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_array_get_size(x_2);
+x_5 = l_Array_findRevMAux___main___rarg(x_1, x_2, x_3, x_4, lean_box(0));
+lean_dec(x_4);
+return x_5;
 }
 }
 lean_object* l_Array_findRevM_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevM_x3f___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findRevM_x3f___rarg), 3, 0);
 return x_3;
 }
 }
@@ -2050,6 +2496,94 @@ lean_dec(x_2);
 return x_3;
 }
 }
+lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(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_lt(x_5, x_3);
+if (x_6 == 0)
+{
+lean_object* x_7; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_7 = lean_box(0);
+return x_7;
+}
+else
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+x_8 = lean_unsigned_to_nat(1u);
+x_9 = lean_nat_sub(x_3, x_8);
+lean_dec(x_3);
+x_10 = lean_array_fget(x_2, x_9);
+lean_inc(x_1);
+lean_inc(x_10);
+x_11 = lean_apply_1(x_1, x_10);
+x_12 = lean_unbox(x_11);
+lean_dec(x_11);
+if (x_12 == 0)
+{
+lean_dec(x_10);
+x_3 = x_9;
+x_4 = lean_box(0);
+goto _start;
+}
+else
+{
+lean_object* x_14; 
+lean_dec(x_9);
+lean_dec(x_1);
+x_14 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_14, 0, x_10);
+return x_14;
+}
+}
+}
+}
+lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg___boxed), 4, 0);
+return x_2;
+}
+}
+lean_object* l_Array_findRev_x3f___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; 
+x_3 = lean_array_get_size(x_1);
+x_4 = l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(x_2, x_1, x_3, lean_box(0));
+return x_4;
+}
+}
+lean_object* l_Array_findRev_x3f(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_findRev_x3f___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(x_1, x_2, x_3, x_4);
+lean_dec(x_2);
+return x_5;
+}
+}
+lean_object* l_Array_findRev_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_findRev_x3f___rarg(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
 lean_object* l_Array_iterateMAux___main___at_Array_iterate___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2515,7 +3049,7 @@ lean_dec(x_3);
 return x_5;
 }
 }
-lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2554,50 +3088,50 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* l_Array_find_x3f___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSome_x3f___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_unsigned_to_nat(0u);
-x_4 = l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(x_2, x_1, x_3);
+x_4 = l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg(x_2, x_1, x_3);
 return x_4;
 }
 }
-lean_object* l_Array_find_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSome_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_find_x3f___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSome_x3f___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_Array_find_x3f___spec__1___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_Array_findSome_x3f___spec__1___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_find_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSome_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Array_find_x3f___rarg(x_1, x_2);
+x_3 = l_Array_findSome_x3f___rarg(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2636,15 +3170,15 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Array_find_x21___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* _init_l_Array_find_x21___rarg___closed__1() {
+lean_object* _init_l_Array_findSome_x21___rarg___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2652,28 +3186,28 @@ x_1 = lean_mk_string("failed to find element");
 return x_1;
 }
 }
-lean_object* _init_l_Array_find_x21___rarg___closed__2() {
+lean_object* _init_l_Array_findSome_x21___rarg___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3;
-x_2 = lean_unsigned_to_nat(256u);
+x_2 = lean_unsigned_to_nat(287u);
 x_3 = lean_unsigned_to_nat(12u);
-x_4 = l_Array_find_x21___rarg___closed__1;
+x_4 = l_Array_findSome_x21___rarg___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
-lean_object* l_Array_find_x21___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSome_x21___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; 
 x_4 = lean_unsigned_to_nat(0u);
-x_5 = l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg(x_3, x_2, x_4);
+x_5 = l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg(x_3, x_2, x_4);
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Array_find_x21___rarg___closed__2;
+x_6 = l_Array_findSome_x21___rarg___closed__2;
 x_7 = lean_panic_fn(x_1, x_6);
 return x_7;
 }
@@ -2688,33 +3222,33 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_find_x21(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSome_x21(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_find_x21___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSome_x21___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_Array_find_x21___spec__1___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_Array_findSome_x21___spec__1___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_find_x21___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSome_x21___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_find_x21___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSome_x21___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg(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; 
@@ -2752,50 +3286,50 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg___boxed), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg___boxed), 4, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRev_x3f___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRev_x3f___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_array_get_size(x_1);
-x_4 = l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(x_2, x_1, x_3, lean_box(0));
+x_4 = l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg(x_2, x_1, x_3, lean_box(0));
 return x_4;
 }
 }
-lean_object* l_Array_findRev_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRev_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRev_x3f___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRev_x3f___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Array_findRev_x3f___spec__1___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x3f___spec__1___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_findRev_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRev_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Array_findRev_x3f___rarg(x_1, x_2);
+x_3 = l_Array_findSomeRev_x3f___rarg(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg(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; 
@@ -2833,36 +3367,36 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg___boxed), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg___boxed), 4, 0);
 return x_3;
 }
 }
-lean_object* _init_l_Array_findRev_x21___rarg___closed__1() {
+lean_object* _init_l_Array_findSomeRev_x21___rarg___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___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3;
-x_2 = lean_unsigned_to_nat(264u);
+x_2 = lean_unsigned_to_nat(295u);
 x_3 = lean_unsigned_to_nat(12u);
-x_4 = l_Array_find_x21___rarg___closed__1;
+x_4 = l_Array_findSome_x21___rarg___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
-lean_object* l_Array_findRev_x21___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeRev_x21___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; 
 x_4 = lean_array_get_size(x_2);
-x_5 = l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg(x_3, x_2, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg(x_3, x_2, x_4, lean_box(0));
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Array_findRev_x21___rarg___closed__1;
+x_6 = l_Array_findSomeRev_x21___rarg___closed__1;
 x_7 = lean_panic_fn(x_1, x_6);
 return x_7;
 }
@@ -2877,28 +3411,28 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findRev_x21(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRev_x21(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRev_x21___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRev_x21___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Array_findRev_x21___spec__1___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Array_findSomeRev_x21___spec__1___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_findRev_x21___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeRev_x21___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findRev_x21___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeRev_x21___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
@@ -3019,9 +3553,9 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3;
-x_2 = lean_unsigned_to_nat(280u);
+x_2 = lean_unsigned_to_nat(311u);
 x_3 = lean_unsigned_to_nat(12u);
-x_4 = l_Array_find_x21___rarg___closed__1;
+x_4 = l_Array_findSome_x21___rarg___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
 return x_5;
 }
@@ -7815,7 +8349,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3;
-x_2 = lean_unsigned_to_nat(638u);
+x_2 = lean_unsigned_to_nat(669u);
 x_3 = lean_unsigned_to_nat(20u);
 x_4 = l_Array_insertAt___rarg___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -8035,12 +8569,12 @@ l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__2 = _init_
 lean_mark_persistent(l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__2);
 l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3 = _init_l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_1__swapAtPanic_x21___rarg___closed__3);
-l_Array_find_x21___rarg___closed__1 = _init_l_Array_find_x21___rarg___closed__1();
-lean_mark_persistent(l_Array_find_x21___rarg___closed__1);
-l_Array_find_x21___rarg___closed__2 = _init_l_Array_find_x21___rarg___closed__2();
-lean_mark_persistent(l_Array_find_x21___rarg___closed__2);
-l_Array_findRev_x21___rarg___closed__1 = _init_l_Array_findRev_x21___rarg___closed__1();
-lean_mark_persistent(l_Array_findRev_x21___rarg___closed__1);
+l_Array_findSome_x21___rarg___closed__1 = _init_l_Array_findSome_x21___rarg___closed__1();
+lean_mark_persistent(l_Array_findSome_x21___rarg___closed__1);
+l_Array_findSome_x21___rarg___closed__2 = _init_l_Array_findSome_x21___rarg___closed__2();
+lean_mark_persistent(l_Array_findSome_x21___rarg___closed__2);
+l_Array_findSomeRev_x21___rarg___closed__1 = _init_l_Array_findSomeRev_x21___rarg___closed__1();
+lean_mark_persistent(l_Array_findSomeRev_x21___rarg___closed__1);
 l_Array_findIdx_x21___rarg___closed__1 = _init_l_Array_findIdx_x21___rarg___closed__1();
 lean_mark_persistent(l_Array_findIdx_x21___rarg___closed__1);
 l_Array_HasRepr___rarg___closed__1 = _init_l_Array_HasRepr___rarg___closed__1();
diff --git a/stage0/stdlib/Init/Data/PersistentArray/Basic.c b/stage0/stdlib/Init/Data/PersistentArray/Basic.c
index b93119215a..69ff25f267 100644
--- a/stage0/stdlib/Init/Data/PersistentArray/Basic.c
+++ b/stage0/stdlib/Init/Data/PersistentArray/Basic.c
@@ -15,7 +15,6 @@ extern "C" {
 #endif
 lean_object* l_List_reverse___rarg(lean_object*);
 lean_object* l_PersistentArray_forM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__4(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__3___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
@@ -25,12 +24,14 @@ size_t l_USize_add(size_t, size_t);
 lean_object* l_PersistentArray_foldlM___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_modifyAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toPersistentArrayAux___rarg(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_popLeaf(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromM___spec__1(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSome_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldl___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2(lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_append___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_empty___closed__2;
@@ -39,6 +40,7 @@ lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__4___r
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_toList___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__7___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_insertNewLeaf___rarg(lean_object*, size_t, size_t, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_List_toPersistentArrayAux___main___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_HasAppend(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__5(lean_object*);
@@ -46,27 +48,25 @@ lean_object* l_PersistentArray_forMAux(lean_object*, lean_object*);
 uint8_t l_PersistentArrayNode_isNode___rarg(lean_object*);
 uint8_t l_USize_decEq(size_t, size_t);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_allM___spec__1(lean_object*, lean_object*);
-lean_object* l_PersistentArray_find_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_toList___spec__2(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__5(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__3(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toArray___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___boxed(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mul2Shift___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_insertNewLeaf(lean_object*);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_append___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_empty(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5(lean_object*, lean_object*);
 lean_object* l_PersistentArray_setAux___rarg(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromMAux___main___spec__1___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_append___spec__2___rarg(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_PersistentArray_toList___rarg___boxed(lean_object*);
 lean_object* l_PersistentArray_mapMAux___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___boxed(lean_object*, lean_object*);
@@ -75,89 +75,85 @@ lean_object* l_PersistentArray_mkNewTail(lean_object*);
 size_t l_USize_sub(size_t, size_t);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_toArray___spec__1(lean_object*);
 extern lean_object* l_Array_empty___closed__1;
+lean_object* l_PersistentArray_findSomeRevMAux(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_PersistentArray_all___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___rarg___closed__2;
 lean_object* l_PersistentArray_insertNewLeaf___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_modifyAux___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__6(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_foldl___spec__2(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mkNewPath___rarg(size_t, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_toList___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_modify___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_any___spec__1(lean_object*);
+lean_object* l_PersistentArray_findSomeRev_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__4(lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_forM(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_allM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_all___rarg___boxed(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArrayNode_Inhabited(lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux(lean_object*, lean_object*);
 lean_object* l_PersistentArray_popLeaf___main(lean_object*);
-lean_object* l_PersistentArray_findM_x3f(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___boxed(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_PersistentArray_empty___closed__1;
 lean_object* lean_string_append(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Nat_max(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromMAux___main___spec__1(lean_object*, lean_object*);
 lean_object* l_PersistentArray_push___rarg(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromM___spec__2(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__3___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFrom___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_toPersistentArray___rarg(lean_object*);
-lean_object* l_PersistentArray_findRev_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mkNewPath___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_forMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_USize_decLt(size_t, size_t);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_insertNewLeaf___main___rarg(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_append___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_PersistentArray_popLeaf___main___rarg(lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_append___spec__4(lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_allM___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_PersistentArray_mkNewTail___rarg(lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mod2Shift___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_setAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_allM___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromM___spec__2___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_foldl___spec__1(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_toList___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_append___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_PersistentArray_map___spec__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_getAux___main___rarg___closed__1;
+lean_object* l_PersistentArray_findSomeRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_PersistentArray_any___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_collectStats(lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___rarg___lambda__4___boxed(lean_object*, lean_object*, lean_object*);
@@ -168,20 +164,20 @@ lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__9
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromMAux___main___spec__2(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__5___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Array_anyRangeMAux___main___at_Array_allM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*);
 uint8_t l_PersistentArray_any___rarg(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSome_x3f(lean_object*, lean_object*);
 lean_object* l_List_toPersistentArrayAux___main(lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___rarg___closed__1;
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toArray___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_foldl___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__4(lean_object*, lean_object*);
 lean_object* l_PersistentArray_isEmpty(lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_PersistentArray_forMAux___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_toArray___rarg___boxed(lean_object*);
 lean_object* l_PersistentArray_Inhabited(lean_object*);
 size_t l_PersistentArray_mod2Shift(size_t, size_t);
@@ -196,19 +192,20 @@ lean_object* l_PersistentArray_foldlFromMAux(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_PersistentArray_map___spec__5___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___at_PersistentArray_foldlFrom___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__3(lean_object*, lean_object*);
 lean_object* l_PersistentArray_getOp___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_map___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___at_PersistentArray_map___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArrayNode_Inhabited___closed__1;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_collectStats___main(lean_object*);
 lean_object* l_PersistentArray_append___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__5(lean_object*);
-lean_object* l_PersistentArray_findRevMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -219,19 +216,17 @@ lean_object* l___private_Init_Data_PersistentArray_Basic_1__emptyArray(lean_obje
 lean_object* l_PersistentArray_popLeaf___rarg(lean_object*);
 lean_object* l_mkPArray(lean_object*);
 lean_object* l_PersistentArray_forM___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_append___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_HasToString;
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_append___spec__2___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux(lean_object*, lean_object*);
 lean_object* l_PersistentArray_modifyAux___main___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Nat_repr(lean_object*);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_append___spec__1(lean_object*);
-lean_object* l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__9___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_PersistentArray_map___spec__3___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromMAux___main___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__8___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -248,17 +243,19 @@ lean_object* l_PersistentArray_anyMAux___main___at_PersistentArray_allM___spec__
 lean_object* l_PersistentArray_mapMAux___main___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_empty___closed__3;
 lean_object* l_PersistentArray_pop___rarg(lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftLeft(size_t, size_t);
 lean_object* l_PersistentArray_modify___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_toPersistentArray___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_toArray___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__8(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldl___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_append___spec__5(lean_object*);
 uint8_t l_PersistentArray_isEmpty___rarg(lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__4___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_all___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_toPArray___rarg___boxed(lean_object*);
@@ -266,11 +263,12 @@ lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromMAux___mai
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 lean_object* l_PersistentArray_getAux(lean_object*);
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__5___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__3(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__5(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRev_x3f(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSome_x3f___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_getOp___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_get_x21(lean_object*);
 lean_object* l_PersistentArray_map(lean_object*, lean_object*);
@@ -290,15 +288,18 @@ lean_object* l_PersistentArray_stats___rarg___boxed(lean_object*);
 lean_object* l_PersistentArray_allM___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__5___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__9___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___at_PersistentArray_foldlFrom___spec__2(lean_object*, lean_object*);
 size_t l_USize_land(size_t, size_t);
+lean_object* l_PersistentArray_findSomeM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_getAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__4___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3(lean_object*, lean_object*);
 lean_object* l_PersistentArray_getOp(lean_object*);
 lean_object* l_Nat_foldAux___main___at_mkPersistentArray___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_append___rarg(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mkNewPath___main___rarg(size_t, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -320,10 +321,8 @@ lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromMAux___mai
 lean_object* l_PersistentArray_any___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_Stats_toString___closed__4;
 lean_object* l_PersistentArrayNode_isNode___rarg___boxed(lean_object*);
-lean_object* l_PersistentArray_findRevMAux(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_PersistentArray_all___spec__2(lean_object*);
 lean_object* l_PersistentArray_collectStats___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__7___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_setAux___main___rarg(lean_object*, size_t, size_t, lean_object*);
@@ -338,8 +337,8 @@ lean_object* l_PersistentArray_foldlFromMAux___main___rarg___boxed(lean_object*,
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFromM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_modifyAux(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__7(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mkNewPath(lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_append(lean_object*);
 lean_object* l_PersistentArray_insertNewLeaf___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -351,17 +350,18 @@ lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__4___
 lean_object* l_PersistentArray_getAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_PersistentArray_map___spec__4(lean_object*, lean_object*);
 lean_object* l_PersistentArray_modifyAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___at_PersistentArray_map___spec__1(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFrom___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRev_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_Stats_toString___closed__1;
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_collectStats___main___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__3(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_foldlFrom___spec__3(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentArray_anyMAux___main___at_PersistentArray_any___spec__2___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5(lean_object*, lean_object*);
 lean_object* l_PersistentArray_getAux___main___rarg(lean_object*, lean_object*, size_t, size_t);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_toArray___spec__2(lean_object*);
 lean_object* l_mkPersistentArray(lean_object*);
@@ -373,8 +373,8 @@ lean_object* l_PersistentArray_mapMAux___main___rarg(lean_object*, lean_object*,
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_append___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__4(lean_object*);
 lean_object* l_PersistentArray_anyMAux___main(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toList___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentArray_anyM___at_PersistentArray_any___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mkEmptyArray(lean_object*);
@@ -385,18 +385,19 @@ lean_object* l_PersistentArray_foldlFromM___rarg___boxed(lean_object*, lean_obje
 lean_object* l_PersistentArray_insertNewLeaf___main(lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_any___spec__1___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_push(lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_toArray___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_foldlFrom___spec__3___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_Stats_toString___closed__3;
 lean_object* l_PersistentArray_anyMAux___boxed(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_tooBig;
 lean_object* lean_array_pop(lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_tooBig___closed__1;
 lean_object* l_PersistentArray_foldlM___at_PersistentArray_toList___spec__1(lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toArray___spec__5(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_toPersistentArray___spec__1(lean_object*);
 lean_object* l_Array_toPArray(lean_object*);
@@ -404,28 +405,28 @@ lean_object* l_Array_iterateMAux___main___at_PersistentArray_toArray___spec__5__
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_toArray___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_forMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_PersistentArray_toList___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_HasToString___closed__1;
 lean_object* l_PersistentArray_foldlFrom(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldlFrom___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_Stats_toString(lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___at_PersistentArray_map___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArrayNode_isNode(lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_find_x3f(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_div2Shift___boxed(lean_object*, lean_object*);
 extern lean_object* l_usizeSz;
 uint8_t l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_setAux___main(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__4(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_PersistentArray_any___spec__2(lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentArray_anyMAux___main___at_PersistentArray_all___spec__2___rarg(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_allM___spec__4___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_PersistentArray_popLeaf___main___rarg___closed__1;
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_collectStats___main___spec__1(lean_object*);
@@ -442,36 +443,34 @@ lean_object* l_PersistentArray_collectStats___main___rarg(lean_object*, lean_obj
 lean_object* l_List_toPersistentArrayAux(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 lean_object* l_PersistentArray_get_x21___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5(lean_object*, lean_object*);
 lean_object* l_List_toPersistentArray___rarg(lean_object*);
 lean_object* l_PersistentArray_HasAppend___closed__1;
 lean_object* l_PersistentArray_allM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mkNewPath___main(lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___at_PersistentArray_foldlFrom___spec__2___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_all___spec__3(lean_object*);
-lean_object* l_PersistentArray_find_x3f___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4(lean_object*, lean_object*);
 lean_object* l_PersistentArray_allM(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_PersistentArray_any___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_PersistentArray_all___spec__1(lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_modifyAux___main(lean_object*);
 lean_object* l_PersistentArray_forMAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux___main(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_foldl___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___at_PersistentArray_foldlFrom___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_PersistentArray_allM___spec__2(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_mapMAux___main___at_PersistentArray_map___spec__2(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRev_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_set___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_all(lean_object*);
 lean_object* l_mkPersistentArray___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentArray_forMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_PersistentArray_collectStats___main___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_PersistentArray_map___spec__5(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_toPersistentArray___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -479,6 +478,7 @@ lean_object* l_PersistentArray_foldlFromM___at_PersistentArray_foldlFrom___spec_
 lean_object* l_PersistentArray_foldlMAux___main(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldl(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRev_x3f(lean_object*, lean_object*);
 lean_object* l_PersistentArray_toArray___rarg(lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_PersistentArray_foldlM(lean_object*, lean_object*);
@@ -2683,7 +2683,7 @@ lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 if (lean_obj_tag(x_4) == 0)
@@ -2693,12 +2693,12 @@ x_5 = lean_ctor_get(x_4, 0);
 lean_inc(x_5);
 lean_dec(x_4);
 lean_inc(x_1);
-x_6 = lean_alloc_closure((void*)(l_PersistentArray_findMAux___main___rarg), 4, 3);
+x_6 = lean_alloc_closure((void*)(l_PersistentArray_findSomeMAux___main___rarg), 4, 3);
 lean_closure_set(x_6, 0, x_1);
 lean_closure_set(x_6, 1, lean_box(0));
 lean_closure_set(x_6, 2, x_3);
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l_Array_findMAux___main___rarg(x_1, lean_box(0), x_5, x_6, x_7);
+x_8 = l_Array_findSomeMAux___main___rarg(x_1, lean_box(0), x_5, x_6, x_7);
 return x_8;
 }
 else
@@ -2708,54 +2708,54 @@ x_9 = lean_ctor_get(x_4, 0);
 lean_inc(x_9);
 lean_dec(x_4);
 x_10 = lean_unsigned_to_nat(0u);
-x_11 = l_Array_findMAux___main___rarg(x_1, lean_box(0), x_9, x_3, x_10);
+x_11 = l_Array_findSomeMAux___main___rarg(x_1, lean_box(0), x_9, x_3, x_10);
 return x_11;
 }
 }
 }
-lean_object* l_PersistentArray_findMAux___main(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findMAux___main___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeMAux___main___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findMAux___main(x_1, x_2);
+x_3 = l_PersistentArray_findSomeMAux___main(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeMAux___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_PersistentArray_findMAux___main___rarg(x_1, lean_box(0), x_3, x_4);
+x_5 = l_PersistentArray_findSomeMAux___main___rarg(x_1, lean_box(0), x_3, x_4);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findMAux(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findMAux___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeMAux___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findMAux___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findMAux(x_1, x_2);
+x_3 = l_PersistentArray_findSomeMAux(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findM_x3f___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeM_x3f___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 if (lean_obj_tag(x_4) == 0)
@@ -2765,7 +2765,7 @@ x_5 = lean_ctor_get(x_1, 1);
 lean_inc(x_5);
 lean_dec(x_1);
 x_6 = lean_unsigned_to_nat(0u);
-x_7 = l_Array_findMAux___main___rarg(x_2, lean_box(0), x_5, x_3, x_6);
+x_7 = l_Array_findSomeMAux___main___rarg(x_2, lean_box(0), x_5, x_3, x_6);
 return x_7;
 }
 else
@@ -2784,7 +2784,7 @@ return x_10;
 }
 }
 }
-lean_object* l_PersistentArray_findM_x3f___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeM_x3f___rarg(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; 
@@ -2794,8 +2794,8 @@ x_6 = lean_ctor_get(x_3, 0);
 lean_inc(x_6);
 lean_inc(x_4);
 lean_inc(x_1);
-x_7 = l_PersistentArray_findMAux___main___rarg(x_1, lean_box(0), x_4, x_6);
-x_8 = lean_alloc_closure((void*)(l_PersistentArray_findM_x3f___rarg___lambda__1), 4, 3);
+x_7 = l_PersistentArray_findSomeMAux___main___rarg(x_1, lean_box(0), x_4, x_6);
+x_8 = lean_alloc_closure((void*)(l_PersistentArray_findSomeM_x3f___rarg___lambda__1), 4, 3);
 lean_closure_set(x_8, 0, x_3);
 lean_closure_set(x_8, 1, x_1);
 lean_closure_set(x_8, 2, x_4);
@@ -2803,24 +2803,24 @@ x_9 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_7, x_8);
 return x_9;
 }
 }
-lean_object* l_PersistentArray_findM_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findM_x3f___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeM_x3f___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findM_x3f(x_1, x_2);
+x_3 = l_PersistentArray_findSomeM_x3f(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 if (lean_obj_tag(x_4) == 0)
@@ -2830,12 +2830,12 @@ x_5 = lean_ctor_get(x_4, 0);
 lean_inc(x_5);
 lean_dec(x_4);
 lean_inc(x_1);
-x_6 = lean_alloc_closure((void*)(l_PersistentArray_findRevMAux___main___rarg), 4, 3);
+x_6 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevMAux___main___rarg), 4, 3);
 lean_closure_set(x_6, 0, x_1);
 lean_closure_set(x_6, 1, lean_box(0));
 lean_closure_set(x_6, 2, x_3);
 x_7 = lean_array_get_size(x_5);
-x_8 = l_Array_findRevMAux___main___rarg(x_1, lean_box(0), x_5, x_6, x_7, lean_box(0));
+x_8 = l_Array_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_5, x_6, x_7, lean_box(0));
 lean_dec(x_7);
 return x_8;
 }
@@ -2846,55 +2846,55 @@ x_9 = lean_ctor_get(x_4, 0);
 lean_inc(x_9);
 lean_dec(x_4);
 x_10 = lean_array_get_size(x_9);
-x_11 = l_Array_findRevMAux___main___rarg(x_1, lean_box(0), x_9, x_3, x_10, lean_box(0));
+x_11 = l_Array_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_9, x_3, x_10, lean_box(0));
 lean_dec(x_10);
 return x_11;
 }
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findRevMAux___main___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevMAux___main___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevMAux___main(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevMAux___main(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevMAux___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_PersistentArray_findRevMAux___main___rarg(x_1, lean_box(0), x_3, x_4);
+x_5 = l_PersistentArray_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_3, x_4);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findRevMAux(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findRevMAux___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevMAux___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevMAux(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevMAux(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 if (lean_obj_tag(x_4) == 0)
@@ -2903,7 +2903,7 @@ lean_object* x_5; lean_object* x_6;
 x_5 = lean_ctor_get(x_1, 0);
 lean_inc(x_5);
 lean_dec(x_1);
-x_6 = l_PersistentArray_findRevMAux___main___rarg(x_2, lean_box(0), x_3, x_5);
+x_6 = l_PersistentArray_findSomeRevMAux___main___rarg(x_2, lean_box(0), x_3, x_5);
 return x_6;
 }
 else
@@ -2922,7 +2922,7 @@ return x_9;
 }
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___rarg(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; 
@@ -2933,9 +2933,9 @@ lean_inc(x_6);
 x_7 = lean_array_get_size(x_6);
 lean_inc(x_4);
 lean_inc(x_1);
-x_8 = l_Array_findRevMAux___main___rarg(x_1, lean_box(0), x_6, x_4, x_7, lean_box(0));
+x_8 = l_Array_findSomeRevMAux___main___rarg(x_1, lean_box(0), x_6, x_4, x_7, lean_box(0));
 lean_dec(x_7);
-x_9 = lean_alloc_closure((void*)(l_PersistentArray_findRevM_x3f___rarg___lambda__1), 4, 3);
+x_9 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevM_x3f___rarg___lambda__1), 4, 3);
 lean_closure_set(x_9, 0, x_3);
 lean_closure_set(x_9, 1, x_1);
 lean_closure_set(x_9, 2, x_4);
@@ -2943,19 +2943,19 @@ x_10 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_8, x_9);
 return x_10;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findRevM_x3f___rarg), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevM_x3f___rarg), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevM_x3f(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevM_x3f(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
@@ -4273,7 +4273,7 @@ x_2 = l_PersistentArray_HasAppend___closed__1;
 return x_2;
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -4293,7 +4293,7 @@ else
 lean_object* x_7; lean_object* x_8; 
 x_7 = lean_array_fget(x_2, x_3);
 lean_inc(x_1);
-x_8 = l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg(x_1, x_7);
+x_8 = l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg(x_1, x_7);
 lean_dec(x_7);
 if (lean_obj_tag(x_8) == 0)
 {
@@ -4313,15 +4313,15 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -4360,15 +4360,15 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -4376,7 +4376,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 0);
 x_4 = lean_unsigned_to_nat(0u);
-x_5 = l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg(x_1, x_3, x_4);
+x_5 = l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg(x_1, x_3, x_4);
 return x_5;
 }
 else
@@ -4384,20 +4384,20 @@ else
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg(x_1, x_6, x_7);
+x_8 = l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg(x_1, x_6, x_7);
 return x_8;
 }
 }
 }
-lean_object* l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -4436,27 +4436,27 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg___boxed), 3, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg___boxed), 3, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_ctor_get(x_2, 0);
 lean_inc(x_1);
-x_4 = l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg(x_1, x_3);
+x_4 = l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg(x_1, x_3);
 if (lean_obj_tag(x_4) == 0)
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = lean_ctor_get(x_2, 1);
 x_6 = lean_unsigned_to_nat(0u);
-x_7 = l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg(x_1, x_5, x_6);
+x_7 = l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg(x_1, x_5, x_6);
 return x_7;
 }
 else
@@ -4466,85 +4466,85 @@ return x_4;
 }
 }
 }
-lean_object* l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_find_x3f___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSome_x3f___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg(x_2, x_1);
+x_3 = l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg(x_2, x_1);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_find_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSome_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_find_x3f___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSome_x3f___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__3___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__3___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__4___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__4___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findMAux___main___at_PersistentArray_find_x3f___spec__2___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__2___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_PersistentArray_find_x3f___spec__5___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_PersistentArray_findSome_x3f___spec__5___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findM_x3f___at_PersistentArray_find_x3f___spec__1___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeM_x3f___at_PersistentArray_findSome_x3f___spec__1___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_find_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSome_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_find_x3f___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSome_x3f___rarg(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg(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; 
@@ -4582,15 +4582,15 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg___boxed), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg___boxed), 4, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg(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; 
@@ -4612,7 +4612,7 @@ x_9 = lean_nat_sub(x_3, x_8);
 lean_dec(x_3);
 x_10 = lean_array_fget(x_2, x_9);
 lean_inc(x_1);
-x_11 = l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg(x_1, x_10);
+x_11 = l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg(x_1, x_10);
 lean_dec(x_10);
 if (lean_obj_tag(x_11) == 0)
 {
@@ -4629,15 +4629,15 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg___boxed), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg___boxed), 4, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg(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; 
@@ -4675,15 +4675,15 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg___boxed), 4, 0);
+x_3 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg___boxed), 4, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -4691,7 +4691,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 0);
 x_4 = lean_array_get_size(x_3);
-x_5 = l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg(x_1, x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg(x_1, x_3, x_4, lean_box(0));
 return x_5;
 }
 else
@@ -4699,32 +4699,32 @@ else
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_array_get_size(x_6);
-x_8 = l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg(x_1, x_6, x_7, lean_box(0));
+x_8 = l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg(x_1, x_6, x_7, lean_box(0));
 return x_8;
 }
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 1);
 x_4 = lean_array_get_size(x_3);
 lean_inc(x_1);
-x_5 = l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg(x_1, x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg(x_1, x_3, x_4, lean_box(0));
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; lean_object* x_7; 
 x_6 = lean_ctor_get(x_2, 0);
-x_7 = l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg(x_1, x_6);
+x_7 = l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg(x_1, x_6);
 return x_7;
 }
 else
@@ -4734,80 +4734,80 @@ return x_5;
 }
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRev_x3f___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRev_x3f___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg(x_2, x_1);
+x_3 = l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg(x_2, x_1);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRev_x3f(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRev_x3f(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_PersistentArray_findRev_x3f___rarg___boxed), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRev_x3f___rarg___boxed), 2, 0);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__2___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__2___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__4___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__4___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__5___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__5___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevMAux___main___at_PersistentArray_findRev_x3f___spec__3___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevMAux___main___at_PersistentArray_findSomeRev_x3f___spec__3___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevM_x3f___at_PersistentArray_findRev_x3f___spec__1___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevM_x3f___at_PersistentArray_findSomeRev_x3f___spec__1___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRev_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRev_x3f___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRev_x3f___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRev_x3f___rarg(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Lean/Elab/Syntax.c b/stage0/stdlib/Init/Lean/Elab/Syntax.c
index db552cab35..c94a1491bb 100644
--- a/stage0/stdlib/Init/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Init/Lean/Elab/Syntax.c
@@ -24,9 +24,11 @@ lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__6;
 lean_object* l___private_Init_Lean_Elab_Syntax_4__withFirst(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSyntax___closed__2;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_Syntax_7__antiquote___main___spec__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabMacroRules___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__79;
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_andthen___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_expandNotation___closed__1;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__116;
@@ -56,14 +58,17 @@ extern lean_object* l_Lean_Elab_Term_elabArrayLit___closed__13;
 lean_object* l_Lean_mkTermIdFromIdent(lean_object*);
 lean_object* l_Lean_Elab_Command_expandMacroArgIntoSyntaxItem(lean_object*, lean_object*);
 lean_object* l_unreachable_x21___rarg(lean_object*);
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__4;
 extern lean_object* l_Lean_nullKind;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__26;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__4;
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 extern lean_object* l_Lean_identKind___closed__1;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__92;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__14;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__28;
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Command_expandNotation___spec__3(lean_object*, lean_object*);
+lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__1;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__30;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__36;
@@ -86,7 +91,6 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__13;
 extern lean_object* l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__7;
-lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMacroArgIntoPattern(lean_object*, lean_object*);
 extern lean_object* l_PersistentHashMap_mkCollisionNode___rarg___closed__1;
 lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_Syntax_7__antiquote___main___spec__5(lean_object*, lean_object*, lean_object*);
@@ -95,6 +99,7 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__101;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Init_Lean_Elab_Syntax_5__withNoPushLeading(lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__46;
+lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabReserve___closed__2;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__24;
@@ -109,6 +114,7 @@ lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
 lean_object* l___regBuiltinMacro_Lean_Elab_Command_expandMacro(lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__16;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__118;
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_9__getVarDecls(lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__39;
 lean_object* l_Lean_Elab_Command_elabSyntax___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -125,13 +131,13 @@ lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabDeclareSyntaxCat___
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__9;
 lean_object* l_Lean_Elab_Term_toParserDescrAux(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__81;
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__6;
 lean_object* l_Lean_Elab_Command_expandMacro___boxed(lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMixfix___closed__1;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__6;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__27;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__124;
 extern lean_object* l_Lean_Parser_Syntax_ident___elambda__1___closed__1;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__40;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__73;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__98;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__25;
@@ -145,14 +151,13 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__36;
 extern lean_object* l_Lean_Parser_Command_mixfix___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_getMainModule___rarg(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Syntax_7__antiquote___main___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Quotation_11__letBindRhss___main___closed__17;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__29;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSyntax___closed__1;
 lean_object* l___private_Init_Lean_Elab_Syntax_7__antiquote___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__43;
-lean_object* l_Lean_Elab_Command_getMacroRulesAltKind___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_1__quoteName___main(lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__120;
-lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__8;
 lean_object* l_Lean_Elab_Command_elabMixfix___boxed(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Command_expandNotation___spec__4___boxed(lean_object*, lean_object*, lean_object*);
@@ -163,6 +168,7 @@ lean_object* l_Lean_Elab_Command_elabDeclareSyntaxCat___boxed(lean_object*, lean
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__103;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__132;
 lean_object* l_Lean_Elab_Command_addBuiltinCommandElab(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__28;
 lean_object* l___private_Init_Lean_Elab_Syntax_2__mkParserSeq(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -188,6 +194,7 @@ lean_object* l_Lean_Elab_Command_expandMacro(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__100;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__53;
 lean_object* l_Lean_Elab_Command_expandMacroHeadIntoPattern(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_toParserDescrAux___main___spec__2(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__42;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__112;
@@ -199,6 +206,7 @@ uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Command_expandNotation___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__61;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMacroRules___closed__2;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_numLitKind;
 extern lean_object* l_Lean_Parser_Term_stxQuot___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Command_strLitPrec___elambda__1___closed__2;
@@ -220,6 +228,7 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__40;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMacroRules___closed__1;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__67;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__83;
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Command_def___elambda__1___closed__2;
 lean_object* l_Lean_Macro_addMacroScope(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
@@ -239,10 +248,11 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__32;
 extern lean_object* l_Lean_Parser_Syntax_optional___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__10;
 extern lean_object* l_Lean_Elab_Term_mkConst___closed__4;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_elabMacroRules___closed__1;
 extern lean_object* l_Lean_Unhygienic_MonadQuotation___closed__4;
 lean_object* l___private_Init_Lean_Elab_Syntax_5__withNoPushLeading___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinMacro_Lean_Elab_Command_expandNotation___closed__1;
 extern lean_object* l_Lean_Parser_unquotedSymbolFn___rarg___closed__1;
 lean_object* l_Array_filterAux___main___at_Lean_Elab_Command_expandNotation___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -250,7 +260,6 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__20;
 extern lean_object* l_Lean_Parser_mkParserOfConstantUnsafe___closed__4;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__3;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__56;
-lean_object* l_Lean_Elab_Command_expandNotation___closed__5;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__66;
 lean_object* l_Nat_repr(lean_object*);
 extern lean_object* l___private_Init_Lean_Elab_Quotation_11__letBindRhss___main___closed__11;
@@ -259,8 +268,10 @@ extern lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__3;
 lean_object* l_Lean_Elab_Command_elabMacroRules(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__55;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__37;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4;
 lean_object* l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__7;
 lean_object* l_Lean_Elab_Command_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_mkParserAttributeImpl___closed__1;
 extern lean_object* l_Lean_Parser_termParser___closed__2;
@@ -268,11 +279,13 @@ lean_object* lean_name_mk_string(lean_object*, lean_object*);
 extern lean_object* l_Lean_choiceKind;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__7;
 extern lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__1;
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__33;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__22;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__16;
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__2;
 lean_object* l_Lean_Elab_Command_expandNotation___closed__3;
 extern lean_object* l___regBuiltinParser_Lean_Parser_Command_antiquot___closed__2;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__1;
@@ -282,6 +295,7 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__91;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__78;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__22;
 lean_object* l_Lean_Elab_Command_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__93;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__121;
@@ -297,7 +311,6 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__47;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__5;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSyntax___closed__3;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_identPrec___elambda__1___closed__1;
 uint8_t l_coeDecidableEq(uint8_t);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__14;
@@ -309,17 +322,18 @@ extern lean_object* l_Lean_Parser_Command_attributes___elambda__1___closed__5;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__18;
 lean_object* l_Lean_Elab_Command_elabCommand___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__15;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__6;
 extern lean_object* l_Lean_Parser_Command_identPrec___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Syntax_cat___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__86;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 extern lean_object* l_Lean_Parser_Command_attributes___elambda__1___closed__2;
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__3;
 lean_object* l_Lean_Elab_Command_mkKindName___closed__2;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__25;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__3;
 extern lean_object* l_Lean_Parser_Command_macroArgSimple___elambda__1___closed__2;
 lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_Syntax_7__antiquote___main___spec__6(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_sepBy___elambda__1___closed__1;
 lean_object* l___private_Init_Lean_Elab_Syntax_3__markAsTrailingParser___rarg(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Syntax_6__elabKind___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -337,6 +351,7 @@ lean_object* l_Lean_Elab_Command_expandMacroHeadIntoSyntaxItem___boxed(lean_obje
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__117;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__77;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__5;
 extern lean_object* l_Lean_Parser_Command_notation___elambda__1___closed__2;
 extern lean_object* l_Lean_nullKind___closed__2;
 extern lean_object* l_Lean_Parser_Term_str___elambda__1___closed__1;
@@ -351,6 +366,7 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__7;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__71;
 extern lean_object* l_Lean_mkAppStx___closed__3;
 lean_object* l___private_Init_Lean_Elab_Command_2__getState(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_inferMacroRulesAltKind(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Syntax_2__mkParserSeq___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__126;
 uint8_t l_Lean_Name_hasMacroScopes___main(lean_object*);
@@ -360,6 +376,7 @@ lean_object* l_Lean_Elab_Command_elabSyntax___closed__9;
 extern lean_object* l_Lean_Parser_Term_str___elambda__1___closed__2;
 extern lean_object* l_Bool_HasRepr___closed__1;
 extern lean_object* l_Lean_Syntax_inhabited;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__5;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__102;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__4;
@@ -373,12 +390,13 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__90;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__76;
 lean_object* l___private_Init_Lean_Elab_Syntax_8__regTraceClasses___closed__1;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__17;
+lean_object* l_Lean_Syntax_setArg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__18;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__3;
 extern lean_object* l_Lean_Parser_Syntax_sepBy1___elambda__1___closed__1;
 uint8_t l_Lean_Parser_isParserCategory(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__125;
-lean_object* l_Lean_Elab_Command_getMacroRulesAltKind(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getMainModule(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Syntax_3__markAsTrailingParser___boxed(lean_object*, lean_object*, lean_object*);
@@ -387,12 +405,14 @@ extern lean_object* l_Lean_Elab_Term_elabArrayLit___closed__12;
 extern lean_object* l_Lean_Parser_Syntax_optional___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Command_reserve___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__8;
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__7;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabReserve___closed__3;
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 extern lean_object* l_Lean_Parser_Term_match__syntax___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__24;
+lean_object* l_Array_findMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_atom___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__48;
 lean_object* l___private_Init_Lean_Elab_Syntax_7__antiquote(lean_object*, lean_object*);
@@ -408,9 +428,9 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___boxed(lean_object*, lean
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__2;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__5;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__2;
+lean_object* l_Lean_Elab_Command_inferMacroRulesAltKind___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabReserve___rarg(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMixfix(lean_object*);
-lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_Syntax_7__antiquote___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescr(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__26;
@@ -421,10 +441,10 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__60;
 lean_object* l_Lean_mkStxStrLit(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__110;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__80;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__39;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMixfix___closed__2;
 lean_object* l___private_Init_Lean_Elab_Syntax_7__antiquote___main___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__7;
 lean_object* l_Lean_Elab_Command_elabSyntax(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkCAppStx(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__69;
@@ -434,13 +454,14 @@ extern lean_object* l_Lean_mkAppStx___closed__9;
 extern lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__3;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__35;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__4;
+lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getEnv(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__131;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__27;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__17;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__23;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__38;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__21;
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
 extern lean_object* l_Lean_Parser_Term_matchAlt___closed__2;
@@ -471,21 +492,23 @@ lean_object* l_Lean_Elab_Command_elabReserve___boxed(lean_object*, lean_object*)
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabDeclareSyntaxCat___closed__3;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__130;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__9;
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_syntaxCat___elambda__1___closed__2;
 lean_object* lean_mk_syntax_ident(lean_object*);
 lean_object* l_Lean_mkStxLit(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__50;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__6;
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 extern lean_object* l_Lean_Parser_Command_optDeclSig___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__19;
 extern lean_object* l_Lean_Parser_Command_quotedSymbolPrec___elambda__1___closed__2;
+lean_object* lean_nat_mod(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__99;
 extern lean_object* l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
 lean_object* l___private_Init_Lean_Elab_Syntax_7__antiquote___main___closed__2;
+lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__11;
 extern lean_object* l_Lean_Meta_DiscrTree_Trie_format___main___rarg___closed__1;
 lean_object* l_Lean_Elab_Command_mkFreshKind(lean_object*, lean_object*, lean_object*);
@@ -493,7 +516,6 @@ lean_object* l_Lean_Elab_Command_elabMixfix(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkKindName(lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMacroHeadIntoSyntaxItem(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_expandNotation___closed__4;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__1;
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__1;
@@ -9272,90 +9294,50 @@ x_5 = l_Lean_Elab_Command_addBuiltinCommandElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Command_getMacroRulesAltKind(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_4 = lean_unsigned_to_nat(0u);
-x_5 = l_Lean_Syntax_getArg(x_1, x_4);
-x_6 = l_Lean_Syntax_getArg(x_5, x_4);
-lean_dec(x_5);
-x_7 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__2;
-lean_inc(x_6);
-x_8 = l_Lean_Syntax_isOfKind(x_6, x_7);
-if (x_8 == 0)
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_array_get_size(x_2);
+x_5 = lean_nat_dec_lt(x_3, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
 {
-uint8_t x_9; 
-x_9 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
+lean_object* x_6; 
+lean_dec(x_3);
+x_6 = lean_box(0);
+return x_6;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_array_fget(x_2, x_3);
+lean_inc(x_7);
+x_8 = l_Lean_Syntax_getKind(x_7);
+x_9 = lean_name_eq(x_8, x_1);
+lean_dec(x_8);
 if (x_9 == 0)
 {
 lean_object* x_10; lean_object* x_11; 
-lean_dec(x_6);
-x_10 = lean_box(1);
-x_11 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_11, 0, x_10);
-lean_ctor_set(x_11, 1, x_3);
-return x_11;
+lean_dec(x_7);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_3, x_10);
+lean_dec(x_3);
+x_3 = x_11;
+goto _start;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = l_Lean_Syntax_getArg(x_6, x_12);
-lean_dec(x_6);
-x_14 = l_Lean_Syntax_getKind(x_13);
-x_15 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_15, 0, x_14);
-lean_ctor_set(x_15, 1, x_3);
-return x_15;
-}
-}
-else
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; uint8_t x_20; 
-x_16 = l_Lean_Syntax_getArgs(x_6);
-x_17 = lean_array_get_size(x_16);
-lean_dec(x_16);
-x_18 = lean_unsigned_to_nat(3u);
-x_19 = lean_nat_dec_eq(x_17, x_18);
-lean_dec(x_17);
-x_20 = l_coeDecidableEq(x_19);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; 
-lean_dec(x_6);
-x_21 = lean_box(1);
-x_22 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_3);
-return x_22;
-}
-else
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = l_Lean_Syntax_getArg(x_6, x_23);
-lean_dec(x_6);
-x_25 = l_Lean_Syntax_getKind(x_24);
-x_26 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_3);
-return x_26;
+lean_object* x_13; 
+lean_dec(x_3);
+x_13 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_13, 0, x_7);
+return x_13;
 }
 }
 }
 }
-lean_object* l_Lean_Elab_Command_getMacroRulesAltKind___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Elab_Command_getMacroRulesAltKind(x_1, x_2, x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_4;
-}
-}
-lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -9375,273 +9357,369 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
 x_10 = lean_array_fget(x_1, x_3);
-lean_inc(x_2);
-lean_inc(x_5);
-lean_inc(x_10);
-x_11 = lean_apply_3(x_2, x_10, x_5, x_6);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; uint8_t x_13; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_unbox(x_12);
+x_11 = lean_unsigned_to_nat(2u);
+x_12 = lean_nat_mod(x_3, x_11);
+x_13 = lean_unsigned_to_nat(0u);
+x_14 = lean_nat_dec_eq(x_12, x_13);
 lean_dec(x_12);
-if (x_13 == 0)
+if (x_14 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-lean_dec(x_10);
-x_14 = lean_ctor_get(x_11, 1);
-lean_inc(x_14);
-lean_dec(x_11);
-x_15 = lean_unsigned_to_nat(2u);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_unsigned_to_nat(1u);
 x_16 = lean_nat_add(x_3, x_15);
 lean_dec(x_3);
+x_17 = lean_array_push(x_4, x_10);
 x_3 = x_16;
-x_6 = x_14;
+x_4 = x_17;
 goto _start;
 }
 else
 {
-lean_object* x_18; uint8_t x_19; 
-x_18 = lean_ctor_get(x_11, 1);
-lean_inc(x_18);
-lean_dec(x_11);
-x_19 = l_Array_isEmpty___rarg(x_4);
-if (x_19 == 0)
+lean_object* x_19; 
+lean_inc(x_2);
+lean_inc(x_5);
+x_19 = lean_apply_3(x_2, x_10, x_5, x_6);
+if (lean_obj_tag(x_19) == 0)
 {
-lean_object* x_20; uint8_t x_21; 
-x_20 = lean_unsigned_to_nat(0u);
-x_21 = lean_nat_dec_eq(x_3, x_20);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-lean_inc(x_3);
-x_22 = lean_nat_sub(x_3, lean_box(1));
-x_23 = lean_array_fget(x_1, x_22);
-lean_dec(x_22);
-x_24 = lean_unsigned_to_nat(2u);
-x_25 = lean_nat_add(x_3, x_24);
+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_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_unsigned_to_nat(1u);
+x_23 = lean_nat_add(x_3, x_22);
 lean_dec(x_3);
-x_26 = lean_array_push(x_4, x_23);
-x_27 = lean_array_push(x_26, x_10);
-x_3 = x_25;
-x_4 = x_27;
-x_6 = x_18;
+x_24 = lean_array_push(x_4, x_20);
+x_3 = x_23;
+x_4 = x_24;
+x_6 = x_21;
 goto _start;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_unsigned_to_nat(2u);
-x_30 = lean_nat_add(x_3, x_29);
-lean_dec(x_3);
-x_31 = lean_array_push(x_4, x_10);
-x_3 = x_30;
-x_4 = x_31;
-x_6 = x_18;
-goto _start;
-}
-}
-else
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = lean_unsigned_to_nat(2u);
-x_34 = lean_nat_add(x_3, x_33);
-lean_dec(x_3);
-x_35 = lean_array_push(x_4, x_10);
-x_3 = x_34;
-x_4 = x_35;
-x_6 = x_18;
-goto _start;
-}
-}
-}
-else
-{
-uint8_t x_37; 
-lean_dec(x_10);
+uint8_t x_26; 
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_37 = !lean_is_exclusive(x_11);
-if (x_37 == 0)
+x_26 = !lean_is_exclusive(x_19);
+if (x_26 == 0)
 {
-return x_11;
+return x_19;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_11, 0);
-x_39 = lean_ctor_get(x_11, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_11);
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_19, 0);
+x_28 = lean_ctor_get(x_19, 1);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_dec(x_19);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
 }
 }
 }
 }
 }
-lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+}
+lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = l_Array_empty___closed__1;
-x_7 = l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(x_1, x_2, x_5, x_6, x_3, x_4);
+x_7 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__3(x_1, x_2, x_5, x_6, x_3, x_4);
 return x_7;
 }
 }
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid macro_rules alternative, unexpected syntax node kind '");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__1;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__2;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__4() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid macro_rules alternative, expected syntax node kind '");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__4;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__5;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__5;
+x_3 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Array_empty___closed__1;
+x_2 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__7;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1(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_Elab_Command_getMacroRulesAltKind(x_2, x_3, x_4);
-if (lean_obj_tag(x_5) == 0)
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; lean_object* x_62; uint8_t x_63; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Lean_Syntax_getArg(x_2, x_5);
+x_7 = l_Lean_Syntax_getArg(x_6, x_5);
+x_62 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__2;
+lean_inc(x_7);
+x_63 = l_Lean_Syntax_isOfKind(x_7, x_62);
+if (x_63 == 0)
 {
-uint8_t x_6; 
-x_6 = !lean_is_exclusive(x_5);
-if (x_6 == 0)
+uint8_t x_64; 
+x_64 = 0;
+x_8 = x_64;
+goto block_61;
+}
+else
 {
-lean_object* x_7; uint8_t x_8; lean_object* x_9; 
-x_7 = lean_ctor_get(x_5, 0);
-x_8 = lean_name_eq(x_1, x_7);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; 
+x_65 = l_Lean_Syntax_getArgs(x_7);
+x_66 = lean_array_get_size(x_65);
+lean_dec(x_65);
+x_67 = lean_unsigned_to_nat(3u);
+x_68 = lean_nat_dec_eq(x_66, x_67);
+lean_dec(x_66);
+x_8 = x_68;
+goto block_61;
+}
+block_61:
+{
+uint8_t x_9; 
+x_9 = l_coeDecidableEq(x_8);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
 lean_dec(x_7);
-x_9 = lean_box(x_8);
-lean_ctor_set(x_5, 0, x_9);
-return x_5;
+lean_dec(x_6);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_10 = lean_box(1);
+x_11 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_4);
+return x_11;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; 
-x_10 = lean_ctor_get(x_5, 0);
-x_11 = lean_ctor_get(x_5, 1);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_dec(x_5);
-x_12 = lean_name_eq(x_1, x_10);
-lean_dec(x_10);
-x_13 = lean_box(x_12);
-x_14 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_11);
-return x_14;
-}
-}
-else
-{
-uint8_t x_15; 
-x_15 = !lean_is_exclusive(x_5);
-if (x_15 == 0)
-{
-return x_5;
-}
-else
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_5, 0);
-x_17 = lean_ctor_get(x_5, 1);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_dec(x_5);
-x_18 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_18, 0, x_16);
-lean_ctor_set(x_18, 1, x_17);
-return x_18;
-}
-}
-}
-}
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__2(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_Elab_Command_getMacroRulesAltKind(x_2, x_3, x_4);
-if (lean_obj_tag(x_5) == 0)
-{
-uint8_t x_6; 
-x_6 = !lean_is_exclusive(x_5);
-if (x_6 == 0)
-{
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_ctor_get(x_5, 0);
-x_8 = lean_name_eq(x_1, x_7);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_7, x_12);
 lean_dec(x_7);
-if (x_8 == 0)
-{
-uint8_t x_9; lean_object* x_10; 
-x_9 = 1;
-x_10 = lean_box(x_9);
-lean_ctor_set(x_5, 0, x_10);
-return x_5;
-}
-else
-{
-uint8_t x_11; lean_object* x_12; 
-x_11 = 0;
-x_12 = lean_box(x_11);
-lean_ctor_set(x_5, 0, x_12);
-return x_5;
-}
-}
-else
-{
-lean_object* x_13; lean_object* x_14; uint8_t x_15; 
-x_13 = lean_ctor_get(x_5, 0);
-x_14 = lean_ctor_get(x_5, 1);
-lean_inc(x_14);
 lean_inc(x_13);
-lean_dec(x_5);
-x_15 = lean_name_eq(x_1, x_13);
-lean_dec(x_13);
+x_14 = l_Lean_Syntax_getKind(x_13);
+x_15 = lean_name_eq(x_14, x_1);
 if (x_15 == 0)
 {
-uint8_t x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = 1;
-x_17 = lean_box(x_16);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_14);
-return x_18;
+lean_object* x_16; uint8_t x_17; 
+x_16 = l_Lean_choiceKind;
+x_17 = lean_name_eq(x_14, x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+lean_dec(x_13);
+lean_dec(x_6);
+lean_dec(x_1);
+x_18 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_18, 0, x_14);
+x_19 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__3;
+x_20 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_18);
+x_21 = l_Lean_Elab_Term_mkConst___closed__4;
+x_22 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_21);
+x_23 = l_Lean_Elab_Command_throwError___rarg(x_2, x_22, x_3, x_4);
+lean_dec(x_2);
+return x_23;
 }
 else
 {
-uint8_t x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = 0;
-x_20 = lean_box(x_19);
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_20);
-lean_ctor_set(x_21, 1, x_14);
-return x_21;
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_14);
+x_24 = l_Lean_Syntax_getArgs(x_13);
+lean_dec(x_13);
+x_25 = l_Array_findMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(x_1, x_24, x_5);
+lean_dec(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_dec(x_6);
+x_26 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_26, 0, x_1);
+x_27 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__6;
+x_28 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_26);
+x_29 = l_Lean_Elab_Term_mkConst___closed__4;
+x_30 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+x_31 = l_Lean_Elab_Command_throwError___rarg(x_2, x_30, x_3, x_4);
+lean_dec(x_2);
+return x_31;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_dec(x_1);
+x_32 = lean_ctor_get(x_25, 0);
+lean_inc(x_32);
+lean_dec(x_25);
+x_33 = l_Lean_Elab_Command_getCurrMacroScope(x_3, x_4);
+x_34 = lean_ctor_get(x_33, 1);
+lean_inc(x_34);
+lean_dec(x_33);
+x_35 = l_Lean_Elab_Command_getMainModule(x_3, x_34);
+if (lean_obj_tag(x_35) == 0)
+{
+uint8_t x_36; 
+x_36 = !lean_is_exclusive(x_35);
+if (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; 
+x_37 = lean_ctor_get(x_35, 0);
+lean_dec(x_37);
+x_38 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
+x_39 = lean_array_push(x_38, x_32);
+x_40 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
+x_41 = lean_array_push(x_39, x_40);
+x_42 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__2;
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_42);
+lean_ctor_set(x_43, 1, x_41);
+x_44 = l_Lean_Syntax_setArg(x_6, x_5, x_43);
+x_45 = l_Lean_Syntax_setArg(x_2, x_5, x_44);
+lean_ctor_set(x_35, 0, x_45);
+return x_35;
+}
+else
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_46 = lean_ctor_get(x_35, 1);
+lean_inc(x_46);
+lean_dec(x_35);
+x_47 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
+x_48 = lean_array_push(x_47, x_32);
+x_49 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
+x_50 = lean_array_push(x_48, x_49);
+x_51 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__2;
+x_52 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_50);
+x_53 = l_Lean_Syntax_setArg(x_6, x_5, x_52);
+x_54 = l_Lean_Syntax_setArg(x_2, x_5, x_53);
+x_55 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_55, 0, x_54);
+lean_ctor_set(x_55, 1, x_46);
+return x_55;
+}
+}
+else
+{
+uint8_t x_56; 
+lean_dec(x_32);
+lean_dec(x_6);
+lean_dec(x_2);
+x_56 = !lean_is_exclusive(x_35);
+if (x_56 == 0)
+{
+return x_35;
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_35, 0);
+x_58 = lean_ctor_get(x_35, 1);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_dec(x_35);
+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_22; 
-x_22 = !lean_is_exclusive(x_5);
-if (x_22 == 0)
-{
-return x_5;
+lean_object* x_60; 
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_6);
+lean_dec(x_3);
+lean_dec(x_1);
+x_60 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_60, 0, x_2);
+lean_ctor_set(x_60, 1, x_4);
+return x_60;
 }
-else
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_23 = lean_ctor_get(x_5, 0);
-x_24 = lean_ctor_get(x_5, 1);
-lean_inc(x_24);
-lean_inc(x_23);
-lean_dec(x_5);
-x_25 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_25, 0, x_23);
-lean_ctor_set(x_25, 1, x_24);
-return x_25;
 }
 }
 }
@@ -10034,7 +10112,947 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__38() {
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux(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_inc(x_1);
+x_5 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1), 4, 1);
+lean_closure_set(x_5, 0, x_1);
+lean_inc(x_3);
+x_6 = l_Array_mapSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(x_2, x_5, x_3, x_4);
+if (lean_obj_tag(x_6) == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_6, 1);
+lean_inc(x_8);
+lean_dec(x_6);
+x_9 = l_Lean_Elab_Command_getCurrMacroScope(x_3, x_8);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
+lean_inc(x_11);
+lean_dec(x_9);
+x_12 = l_Lean_Elab_Command_getMainModule(x_3, x_11);
+if (lean_obj_tag(x_12) == 0)
+{
+uint8_t x_13; 
+x_13 = !lean_is_exclusive(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_14 = lean_ctor_get(x_12, 0);
+x_15 = lean_box(0);
+x_16 = l_Lean_Elab_mkMacroAttribute___closed__1;
+lean_inc(x_10);
+lean_inc(x_14);
+x_17 = l_Lean_addMacroScope(x_14, x_16, x_10);
+x_18 = lean_box(0);
+x_19 = l_Lean_Elab_Command_elabMacroRulesAux___closed__2;
+x_20 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_20, 0, x_15);
+lean_ctor_set(x_20, 1, x_19);
+lean_ctor_set(x_20, 2, x_17);
+lean_ctor_set(x_20, 3, x_18);
+x_21 = l_Array_empty___closed__1;
+x_22 = lean_array_push(x_21, x_20);
+x_23 = lean_mk_syntax_ident(x_1);
+x_24 = lean_array_push(x_21, x_23);
+x_25 = l_Lean_nullKind___closed__2;
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_24);
+x_27 = lean_array_push(x_22, x_26);
+x_28 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__2;
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_27);
+x_30 = lean_array_push(x_21, x_29);
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_25);
+lean_ctor_set(x_31, 1, x_30);
+x_32 = l_Lean_Elab_Command_elabSyntax___closed__8;
+x_33 = lean_array_push(x_32, x_31);
+x_34 = l_Lean_Elab_Term_elabArrayLit___closed__13;
+x_35 = lean_array_push(x_33, x_34);
+x_36 = l_Lean_Parser_Command_attributes___elambda__1___closed__2;
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_35);
+x_38 = lean_array_push(x_21, x_37);
+x_39 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_39, 0, x_25);
+lean_ctor_set(x_39, 1, x_38);
+x_40 = l_Lean_Elab_Command_elabSyntax___closed__6;
+x_41 = lean_array_push(x_40, x_39);
+x_42 = l___private_Init_Lean_Elab_Term_5__expandCDot___closed__4;
+x_43 = lean_array_push(x_41, x_42);
+x_44 = lean_array_push(x_43, x_42);
+x_45 = lean_array_push(x_44, x_42);
+x_46 = lean_array_push(x_45, x_42);
+x_47 = l_Lean_Parser_Command_declModifiers___elambda__1___closed__2;
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_46);
+x_49 = lean_array_push(x_21, x_48);
+x_50 = l_Lean_Elab_Command_elabMacroRulesAux___closed__6;
+lean_inc(x_10);
+lean_inc(x_14);
+x_51 = l_Lean_addMacroScope(x_14, x_50, x_10);
+x_52 = l_Lean_Elab_Command_elabMacroRulesAux___closed__5;
+x_53 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_53, 0, x_15);
+lean_ctor_set(x_53, 1, x_52);
+lean_ctor_set(x_53, 2, x_51);
+lean_ctor_set(x_53, 3, x_18);
+x_54 = lean_array_push(x_21, x_53);
+x_55 = lean_array_push(x_54, x_42);
+x_56 = l_Lean_Parser_Command_declId___elambda__1___closed__2;
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_55);
+x_58 = l_Lean_Elab_Command_elabSyntax___closed__10;
+x_59 = lean_array_push(x_58, x_57);
+x_60 = l_Lean_Elab_Command_elabMacroRulesAux___closed__9;
+lean_inc(x_10);
+lean_inc(x_14);
+x_61 = l_Lean_addMacroScope(x_14, x_60, x_10);
+x_62 = l_Lean_Elab_Command_elabMacroRulesAux___closed__8;
+x_63 = l_Lean_Elab_Command_elabMacroRulesAux___closed__11;
+x_64 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_64, 0, x_15);
+lean_ctor_set(x_64, 1, x_62);
+lean_ctor_set(x_64, 2, x_61);
+lean_ctor_set(x_64, 3, x_63);
+x_65 = lean_array_push(x_21, x_64);
+x_66 = lean_array_push(x_65, x_42);
+x_67 = l_Lean_mkTermIdFromIdent___closed__2;
+x_68 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_66);
+x_69 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
+x_70 = lean_array_push(x_69, x_68);
+x_71 = l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_71);
+lean_ctor_set(x_72, 1, x_70);
+x_73 = lean_array_push(x_21, x_72);
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_25);
+lean_ctor_set(x_74, 1, x_73);
+x_75 = lean_array_push(x_40, x_74);
+x_76 = l_Lean_Parser_Command_optDeclSig___elambda__1___closed__2;
+x_77 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_77, 0, x_76);
+lean_ctor_set(x_77, 1, x_75);
+x_78 = lean_array_push(x_59, x_77);
+x_79 = l_Lean_Elab_Command_elabMacroRulesAux___closed__15;
+lean_inc(x_10);
+lean_inc(x_14);
+x_80 = l_Lean_addMacroScope(x_14, x_79, x_10);
+x_81 = l_Lean_Elab_Command_elabMacroRulesAux___closed__14;
+x_82 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_82, 0, x_15);
+lean_ctor_set(x_82, 1, x_81);
+lean_ctor_set(x_82, 2, x_80);
+lean_ctor_set(x_82, 3, x_18);
+x_83 = lean_array_push(x_21, x_82);
+x_84 = lean_array_push(x_83, x_42);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_67);
+lean_ctor_set(x_85, 1, x_84);
+lean_inc(x_85);
+x_86 = lean_array_push(x_21, x_85);
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_25);
+lean_ctor_set(x_87, 1, x_86);
+x_88 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_89 = lean_array_push(x_88, x_87);
+x_90 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_91 = lean_array_push(x_89, x_90);
+x_92 = l_Lean_Elab_Command_elabMacroRulesAux___closed__17;
+x_93 = lean_array_push(x_92, x_85);
+x_94 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
+x_95 = lean_array_push(x_93, x_94);
+x_96 = lean_array_push(x_95, x_42);
+x_97 = lean_unsigned_to_nat(0u);
+x_98 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_7, x_7, x_97, x_21);
+lean_dec(x_7);
+x_99 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
+x_100 = lean_array_push(x_98, x_99);
+x_101 = l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
+lean_inc(x_10);
+lean_inc(x_14);
+x_102 = l_Lean_addMacroScope(x_14, x_101, x_10);
+x_103 = l_Lean_Elab_Command_elabMacroRulesAux___closed__22;
+x_104 = l_Lean_Elab_Command_elabMacroRulesAux___closed__28;
+x_105 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_105, 0, x_15);
+lean_ctor_set(x_105, 1, x_103);
+lean_ctor_set(x_105, 2, x_102);
+lean_ctor_set(x_105, 3, x_104);
+x_106 = lean_array_push(x_21, x_105);
+x_107 = lean_array_push(x_106, x_42);
+x_108 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_108, 0, x_67);
+lean_ctor_set(x_108, 1, x_107);
+x_109 = lean_array_push(x_21, x_108);
+x_110 = l_Lean_Elab_Command_elabMacroRulesAux___closed__35;
+x_111 = l_Lean_addMacroScope(x_14, x_110, x_10);
+x_112 = l_Lean_Elab_Command_elabMacroRulesAux___closed__31;
+x_113 = l_Lean_Elab_Command_elabMacroRulesAux___closed__37;
+x_114 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_114, 0, x_15);
+lean_ctor_set(x_114, 1, x_112);
+lean_ctor_set(x_114, 2, x_111);
+lean_ctor_set(x_114, 3, x_113);
+x_115 = lean_array_push(x_21, x_114);
+x_116 = lean_array_push(x_115, x_42);
+x_117 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_117, 0, x_67);
+lean_ctor_set(x_117, 1, x_116);
+x_118 = lean_array_push(x_21, x_117);
+x_119 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_119, 0, x_25);
+lean_ctor_set(x_119, 1, x_118);
+x_120 = lean_array_push(x_109, x_119);
+x_121 = l_Lean_mkAppStx___closed__8;
+x_122 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_122, 0, x_121);
+lean_ctor_set(x_122, 1, x_120);
+x_123 = l_Lean_Elab_Command_elabMacroRulesAux___closed__19;
+x_124 = lean_array_push(x_123, x_122);
+x_125 = l_Lean_Parser_Term_matchAlt___closed__2;
+x_126 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_126, 0, x_125);
+lean_ctor_set(x_126, 1, x_124);
+x_127 = lean_array_push(x_100, x_126);
+x_128 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_128, 0, x_25);
+lean_ctor_set(x_128, 1, x_127);
+x_129 = lean_array_push(x_96, x_128);
+x_130 = l_Lean_Parser_Term_match__syntax___elambda__1___closed__2;
+x_131 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_131, 0, x_130);
+lean_ctor_set(x_131, 1, x_129);
+x_132 = lean_array_push(x_91, x_131);
+x_133 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_134 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_134, 0, x_133);
+lean_ctor_set(x_134, 1, x_132);
+x_135 = l_Lean_Elab_Command_elabSyntax___closed__15;
+x_136 = lean_array_push(x_135, x_134);
+x_137 = l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
+x_138 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_138, 0, x_137);
+lean_ctor_set(x_138, 1, x_136);
+x_139 = lean_array_push(x_78, x_138);
+x_140 = l_Lean_Parser_Command_def___elambda__1___closed__2;
+x_141 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_141, 0, x_140);
+lean_ctor_set(x_141, 1, x_139);
+x_142 = lean_array_push(x_49, x_141);
+x_143 = l_Lean_Parser_Command_declaration___elambda__1___closed__2;
+x_144 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_144, 0, x_143);
+lean_ctor_set(x_144, 1, x_142);
+lean_ctor_set(x_12, 0, x_144);
+return x_12;
+}
+else
+{
+lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; 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; 
+x_145 = lean_ctor_get(x_12, 0);
+x_146 = lean_ctor_get(x_12, 1);
+lean_inc(x_146);
+lean_inc(x_145);
+lean_dec(x_12);
+x_147 = lean_box(0);
+x_148 = l_Lean_Elab_mkMacroAttribute___closed__1;
+lean_inc(x_10);
+lean_inc(x_145);
+x_149 = l_Lean_addMacroScope(x_145, x_148, x_10);
+x_150 = lean_box(0);
+x_151 = l_Lean_Elab_Command_elabMacroRulesAux___closed__2;
+x_152 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_152, 0, x_147);
+lean_ctor_set(x_152, 1, x_151);
+lean_ctor_set(x_152, 2, x_149);
+lean_ctor_set(x_152, 3, x_150);
+x_153 = l_Array_empty___closed__1;
+x_154 = lean_array_push(x_153, x_152);
+x_155 = lean_mk_syntax_ident(x_1);
+x_156 = lean_array_push(x_153, x_155);
+x_157 = l_Lean_nullKind___closed__2;
+x_158 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_158, 0, x_157);
+lean_ctor_set(x_158, 1, x_156);
+x_159 = lean_array_push(x_154, x_158);
+x_160 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__2;
+x_161 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_161, 0, x_160);
+lean_ctor_set(x_161, 1, x_159);
+x_162 = lean_array_push(x_153, x_161);
+x_163 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_163, 0, x_157);
+lean_ctor_set(x_163, 1, x_162);
+x_164 = l_Lean_Elab_Command_elabSyntax___closed__8;
+x_165 = lean_array_push(x_164, x_163);
+x_166 = l_Lean_Elab_Term_elabArrayLit___closed__13;
+x_167 = lean_array_push(x_165, x_166);
+x_168 = l_Lean_Parser_Command_attributes___elambda__1___closed__2;
+x_169 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_169, 0, x_168);
+lean_ctor_set(x_169, 1, x_167);
+x_170 = lean_array_push(x_153, x_169);
+x_171 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_171, 0, x_157);
+lean_ctor_set(x_171, 1, x_170);
+x_172 = l_Lean_Elab_Command_elabSyntax___closed__6;
+x_173 = lean_array_push(x_172, x_171);
+x_174 = l___private_Init_Lean_Elab_Term_5__expandCDot___closed__4;
+x_175 = lean_array_push(x_173, x_174);
+x_176 = lean_array_push(x_175, x_174);
+x_177 = lean_array_push(x_176, x_174);
+x_178 = lean_array_push(x_177, x_174);
+x_179 = l_Lean_Parser_Command_declModifiers___elambda__1___closed__2;
+x_180 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_180, 0, x_179);
+lean_ctor_set(x_180, 1, x_178);
+x_181 = lean_array_push(x_153, x_180);
+x_182 = l_Lean_Elab_Command_elabMacroRulesAux___closed__6;
+lean_inc(x_10);
+lean_inc(x_145);
+x_183 = l_Lean_addMacroScope(x_145, x_182, x_10);
+x_184 = l_Lean_Elab_Command_elabMacroRulesAux___closed__5;
+x_185 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_185, 0, x_147);
+lean_ctor_set(x_185, 1, x_184);
+lean_ctor_set(x_185, 2, x_183);
+lean_ctor_set(x_185, 3, x_150);
+x_186 = lean_array_push(x_153, x_185);
+x_187 = lean_array_push(x_186, x_174);
+x_188 = l_Lean_Parser_Command_declId___elambda__1___closed__2;
+x_189 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_189, 0, x_188);
+lean_ctor_set(x_189, 1, x_187);
+x_190 = l_Lean_Elab_Command_elabSyntax___closed__10;
+x_191 = lean_array_push(x_190, x_189);
+x_192 = l_Lean_Elab_Command_elabMacroRulesAux___closed__9;
+lean_inc(x_10);
+lean_inc(x_145);
+x_193 = l_Lean_addMacroScope(x_145, x_192, x_10);
+x_194 = l_Lean_Elab_Command_elabMacroRulesAux___closed__8;
+x_195 = l_Lean_Elab_Command_elabMacroRulesAux___closed__11;
+x_196 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_196, 0, x_147);
+lean_ctor_set(x_196, 1, x_194);
+lean_ctor_set(x_196, 2, x_193);
+lean_ctor_set(x_196, 3, x_195);
+x_197 = lean_array_push(x_153, x_196);
+x_198 = lean_array_push(x_197, x_174);
+x_199 = l_Lean_mkTermIdFromIdent___closed__2;
+x_200 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_200, 0, x_199);
+lean_ctor_set(x_200, 1, x_198);
+x_201 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
+x_202 = lean_array_push(x_201, x_200);
+x_203 = l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
+x_204 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_204, 0, x_203);
+lean_ctor_set(x_204, 1, x_202);
+x_205 = lean_array_push(x_153, x_204);
+x_206 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_206, 0, x_157);
+lean_ctor_set(x_206, 1, x_205);
+x_207 = lean_array_push(x_172, x_206);
+x_208 = l_Lean_Parser_Command_optDeclSig___elambda__1___closed__2;
+x_209 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_209, 0, x_208);
+lean_ctor_set(x_209, 1, x_207);
+x_210 = lean_array_push(x_191, x_209);
+x_211 = l_Lean_Elab_Command_elabMacroRulesAux___closed__15;
+lean_inc(x_10);
+lean_inc(x_145);
+x_212 = l_Lean_addMacroScope(x_145, x_211, x_10);
+x_213 = l_Lean_Elab_Command_elabMacroRulesAux___closed__14;
+x_214 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_214, 0, x_147);
+lean_ctor_set(x_214, 1, x_213);
+lean_ctor_set(x_214, 2, x_212);
+lean_ctor_set(x_214, 3, x_150);
+x_215 = lean_array_push(x_153, x_214);
+x_216 = lean_array_push(x_215, x_174);
+x_217 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_217, 0, x_199);
+lean_ctor_set(x_217, 1, x_216);
+lean_inc(x_217);
+x_218 = lean_array_push(x_153, x_217);
+x_219 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_219, 0, x_157);
+lean_ctor_set(x_219, 1, x_218);
+x_220 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_221 = lean_array_push(x_220, x_219);
+x_222 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_223 = lean_array_push(x_221, x_222);
+x_224 = l_Lean_Elab_Command_elabMacroRulesAux___closed__17;
+x_225 = lean_array_push(x_224, x_217);
+x_226 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
+x_227 = lean_array_push(x_225, x_226);
+x_228 = lean_array_push(x_227, x_174);
+x_229 = lean_unsigned_to_nat(0u);
+x_230 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_7, x_7, x_229, x_153);
+lean_dec(x_7);
+x_231 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
+x_232 = lean_array_push(x_230, x_231);
+x_233 = l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
+lean_inc(x_10);
+lean_inc(x_145);
+x_234 = l_Lean_addMacroScope(x_145, x_233, x_10);
+x_235 = l_Lean_Elab_Command_elabMacroRulesAux___closed__22;
+x_236 = l_Lean_Elab_Command_elabMacroRulesAux___closed__28;
+x_237 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_237, 0, x_147);
+lean_ctor_set(x_237, 1, x_235);
+lean_ctor_set(x_237, 2, x_234);
+lean_ctor_set(x_237, 3, x_236);
+x_238 = lean_array_push(x_153, x_237);
+x_239 = lean_array_push(x_238, x_174);
+x_240 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_240, 0, x_199);
+lean_ctor_set(x_240, 1, x_239);
+x_241 = lean_array_push(x_153, x_240);
+x_242 = l_Lean_Elab_Command_elabMacroRulesAux___closed__35;
+x_243 = l_Lean_addMacroScope(x_145, x_242, x_10);
+x_244 = l_Lean_Elab_Command_elabMacroRulesAux___closed__31;
+x_245 = l_Lean_Elab_Command_elabMacroRulesAux___closed__37;
+x_246 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_246, 0, x_147);
+lean_ctor_set(x_246, 1, x_244);
+lean_ctor_set(x_246, 2, x_243);
+lean_ctor_set(x_246, 3, x_245);
+x_247 = lean_array_push(x_153, x_246);
+x_248 = lean_array_push(x_247, x_174);
+x_249 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_249, 0, x_199);
+lean_ctor_set(x_249, 1, x_248);
+x_250 = lean_array_push(x_153, x_249);
+x_251 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_251, 0, x_157);
+lean_ctor_set(x_251, 1, x_250);
+x_252 = lean_array_push(x_241, x_251);
+x_253 = l_Lean_mkAppStx___closed__8;
+x_254 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_254, 0, x_253);
+lean_ctor_set(x_254, 1, x_252);
+x_255 = l_Lean_Elab_Command_elabMacroRulesAux___closed__19;
+x_256 = lean_array_push(x_255, x_254);
+x_257 = l_Lean_Parser_Term_matchAlt___closed__2;
+x_258 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_258, 0, x_257);
+lean_ctor_set(x_258, 1, x_256);
+x_259 = lean_array_push(x_232, x_258);
+x_260 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_260, 0, x_157);
+lean_ctor_set(x_260, 1, x_259);
+x_261 = lean_array_push(x_228, x_260);
+x_262 = l_Lean_Parser_Term_match__syntax___elambda__1___closed__2;
+x_263 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_263, 0, x_262);
+lean_ctor_set(x_263, 1, x_261);
+x_264 = lean_array_push(x_223, x_263);
+x_265 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_266 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_266, 0, x_265);
+lean_ctor_set(x_266, 1, x_264);
+x_267 = l_Lean_Elab_Command_elabSyntax___closed__15;
+x_268 = lean_array_push(x_267, x_266);
+x_269 = l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
+x_270 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_270, 0, x_269);
+lean_ctor_set(x_270, 1, x_268);
+x_271 = lean_array_push(x_210, x_270);
+x_272 = l_Lean_Parser_Command_def___elambda__1___closed__2;
+x_273 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_273, 0, x_272);
+lean_ctor_set(x_273, 1, x_271);
+x_274 = lean_array_push(x_181, x_273);
+x_275 = l_Lean_Parser_Command_declaration___elambda__1___closed__2;
+x_276 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_276, 0, x_275);
+lean_ctor_set(x_276, 1, x_274);
+x_277 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_277, 0, x_276);
+lean_ctor_set(x_277, 1, x_146);
+return x_277;
+}
+}
+else
+{
+uint8_t x_278; 
+lean_dec(x_10);
+lean_dec(x_7);
+lean_dec(x_1);
+x_278 = !lean_is_exclusive(x_12);
+if (x_278 == 0)
+{
+return x_12;
+}
+else
+{
+lean_object* x_279; lean_object* x_280; lean_object* x_281; 
+x_279 = lean_ctor_get(x_12, 0);
+x_280 = lean_ctor_get(x_12, 1);
+lean_inc(x_280);
+lean_inc(x_279);
+lean_dec(x_12);
+x_281 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_281, 0, x_279);
+lean_ctor_set(x_281, 1, x_280);
+return x_281;
+}
+}
+}
+else
+{
+uint8_t x_282; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_282 = !lean_is_exclusive(x_6);
+if (x_282 == 0)
+{
+return x_6;
+}
+else
+{
+lean_object* x_283; lean_object* x_284; lean_object* x_285; 
+x_283 = lean_ctor_get(x_6, 0);
+x_284 = lean_ctor_get(x_6, 1);
+lean_inc(x_284);
+lean_inc(x_283);
+lean_dec(x_6);
+x_285 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_285, 0, x_283);
+lean_ctor_set(x_285, 1, x_284);
+return x_285;
+}
+}
+}
+}
+lean_object* l_Array_findMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Array_findMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(x_1, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_4;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__3(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
+lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Array_mapSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(x_1, x_2, x_3, x_4);
+lean_dec(x_1);
+return x_5;
+}
+}
+lean_object* l_Lean_Elab_Command_elabMacroRulesAux___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_Elab_Command_elabMacroRulesAux(x_1, x_2, x_3, x_4);
+lean_dec(x_2);
+return x_5;
+}
+}
+lean_object* l_Lean_Elab_Command_inferMacroRulesAltKind(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = l_Lean_Syntax_getArg(x_5, x_4);
+lean_dec(x_5);
+x_7 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__2;
+lean_inc(x_6);
+x_8 = l_Lean_Syntax_isOfKind(x_6, x_7);
+if (x_8 == 0)
+{
+uint8_t x_9; 
+x_9 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
+lean_dec(x_6);
+x_10 = lean_box(1);
+x_11 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_3);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_6, x_12);
+lean_dec(x_6);
+x_14 = l_Lean_Syntax_getKind(x_13);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_3);
+return x_15;
+}
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; uint8_t x_20; 
+x_16 = l_Lean_Syntax_getArgs(x_6);
+x_17 = lean_array_get_size(x_16);
+lean_dec(x_16);
+x_18 = lean_unsigned_to_nat(3u);
+x_19 = lean_nat_dec_eq(x_17, x_18);
+lean_dec(x_17);
+x_20 = l_coeDecidableEq(x_19);
+if (x_20 == 0)
+{
+lean_object* x_21; lean_object* x_22; 
+lean_dec(x_6);
+x_21 = lean_box(1);
+x_22 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_3);
+return x_22;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_23 = lean_unsigned_to_nat(1u);
+x_24 = l_Lean_Syntax_getArg(x_6, x_23);
+lean_dec(x_6);
+x_25 = l_Lean_Syntax_getKind(x_24);
+x_26 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_3);
+return x_26;
+}
+}
+}
+}
+lean_object* l_Lean_Elab_Command_inferMacroRulesAltKind___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Command_inferMacroRulesAltKind(x_1, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_4;
+}
+}
+lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_array_get_size(x_1);
+x_8 = lean_nat_dec_lt(x_3, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+lean_object* x_9; 
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_9 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_9, 0, x_4);
+lean_ctor_set(x_9, 1, x_6);
+return x_9;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_array_fget(x_1, x_3);
+lean_inc(x_2);
+lean_inc(x_5);
+lean_inc(x_10);
+x_11 = lean_apply_3(x_2, x_10, x_5, x_6);
+if (lean_obj_tag(x_11) == 0)
+{
+lean_object* x_12; uint8_t x_13; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_unbox(x_12);
+lean_dec(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+lean_dec(x_10);
+x_14 = lean_ctor_get(x_11, 1);
+lean_inc(x_14);
+lean_dec(x_11);
+x_15 = lean_unsigned_to_nat(2u);
+x_16 = lean_nat_add(x_3, x_15);
+lean_dec(x_3);
+x_3 = x_16;
+x_6 = x_14;
+goto _start;
+}
+else
+{
+lean_object* x_18; uint8_t x_19; 
+x_18 = lean_ctor_get(x_11, 1);
+lean_inc(x_18);
+lean_dec(x_11);
+x_19 = l_Array_isEmpty___rarg(x_4);
+if (x_19 == 0)
+{
+lean_object* x_20; uint8_t x_21; 
+x_20 = lean_unsigned_to_nat(0u);
+x_21 = lean_nat_dec_eq(x_3, x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+lean_inc(x_3);
+x_22 = lean_nat_sub(x_3, lean_box(1));
+x_23 = lean_array_fget(x_1, x_22);
+lean_dec(x_22);
+x_24 = lean_unsigned_to_nat(2u);
+x_25 = lean_nat_add(x_3, x_24);
+lean_dec(x_3);
+x_26 = lean_array_push(x_4, x_23);
+x_27 = lean_array_push(x_26, x_10);
+x_3 = x_25;
+x_4 = x_27;
+x_6 = x_18;
+goto _start;
+}
+else
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_unsigned_to_nat(2u);
+x_30 = lean_nat_add(x_3, x_29);
+lean_dec(x_3);
+x_31 = lean_array_push(x_4, x_10);
+x_3 = x_30;
+x_4 = x_31;
+x_6 = x_18;
+goto _start;
+}
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_unsigned_to_nat(2u);
+x_34 = lean_nat_add(x_3, x_33);
+lean_dec(x_3);
+x_35 = lean_array_push(x_4, x_10);
+x_3 = x_34;
+x_4 = x_35;
+x_6 = x_18;
+goto _start;
+}
+}
+}
+else
+{
+uint8_t x_37; 
+lean_dec(x_10);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_37 = !lean_is_exclusive(x_11);
+if (x_37 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_38 = lean_ctor_get(x_11, 0);
+x_39 = lean_ctor_get(x_11, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_11);
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
+}
+}
+}
+}
+}
+lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Array_empty___closed__1;
+x_7 = l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__2(x_1, x_2, x_5, x_6, x_3, x_4);
+return x_7;
+}
+}
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__1(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_Elab_Command_inferMacroRulesAltKind(x_2, x_3, x_4);
+if (lean_obj_tag(x_5) == 0)
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_5);
+if (x_6 == 0)
+{
+lean_object* x_7; uint8_t x_8; lean_object* x_9; 
+x_7 = lean_ctor_get(x_5, 0);
+x_8 = lean_name_eq(x_1, x_7);
+lean_dec(x_7);
+x_9 = lean_box(x_8);
+lean_ctor_set(x_5, 0, x_9);
+return x_5;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; 
+x_10 = lean_ctor_get(x_5, 0);
+x_11 = lean_ctor_get(x_5, 1);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_dec(x_5);
+x_12 = lean_name_eq(x_1, x_10);
+lean_dec(x_10);
+x_13 = lean_box(x_12);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_11);
+return x_14;
+}
+}
+else
+{
+uint8_t x_15; 
+x_15 = !lean_is_exclusive(x_5);
+if (x_15 == 0)
+{
+return x_5;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_5, 0);
+x_17 = lean_ctor_get(x_5, 1);
+lean_inc(x_17);
+lean_inc(x_16);
+lean_dec(x_5);
+x_18 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_18, 0, x_16);
+lean_ctor_set(x_18, 1, x_17);
+return x_18;
+}
+}
+}
+}
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__2(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_Elab_Command_inferMacroRulesAltKind(x_2, x_3, x_4);
+if (lean_obj_tag(x_5) == 0)
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_5);
+if (x_6 == 0)
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_ctor_get(x_5, 0);
+x_8 = lean_name_eq(x_1, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = 1;
+x_10 = lean_box(x_9);
+lean_ctor_set(x_5, 0, x_10);
+return x_5;
+}
+else
+{
+uint8_t x_11; lean_object* x_12; 
+x_11 = 0;
+x_12 = lean_box(x_11);
+lean_ctor_set(x_5, 0, x_12);
+return x_5;
+}
+}
+else
+{
+lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_13 = lean_ctor_get(x_5, 0);
+x_14 = lean_ctor_get(x_5, 1);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_dec(x_5);
+x_15 = lean_name_eq(x_1, x_13);
+lean_dec(x_13);
+if (x_15 == 0)
+{
+uint8_t x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = 1;
+x_17 = lean_box(x_16);
+x_18 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_14);
+return x_18;
+}
+else
+{
+uint8_t x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = 0;
+x_20 = lean_box(x_19);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_14);
+return x_21;
+}
+}
+}
+else
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_5);
+if (x_22 == 0)
+{
+return x_5;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_5, 0);
+x_24 = lean_ctor_get(x_5, 1);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_dec(x_5);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
+}
+}
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -10046,854 +11064,479 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__39() {
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_empty___closed__1;
-x_2 = l_Lean_Elab_Command_elabMacroRulesAux___closed__38;
+x_2 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__1;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__40() {
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_elabMacroRulesAux___closed__39;
-x_2 = l___private_Init_Lean_Elab_Term_5__expandCDot___closed__4;
+x_1 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__2;
+x_2 = l___private_Init_Lean_Elab_Quotation_11__letBindRhss___main___closed__17;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3;
+x_2 = l___private_Init_Lean_Elab_Quotation_11__letBindRhss___main___closed__17;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__5() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid macro_rules alternative, multiple interpretations for pattern (solution: specify node kind using `macro_rules [<kind>] ...`)");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__5;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__6;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux(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; 
 x_4 = l_Lean_Syntax_inhabited;
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = lean_array_get(x_4, x_1, x_5);
-x_7 = l_Lean_Elab_Command_getMacroRulesAltKind(x_6, x_2, x_3);
-lean_dec(x_6);
+x_7 = l_Lean_Elab_Command_inferMacroRulesAltKind(x_6, x_2, x_3);
 if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
 x_8 = lean_ctor_get(x_7, 0);
 lean_inc(x_8);
 x_9 = lean_ctor_get(x_7, 1);
 lean_inc(x_9);
 lean_dec(x_7);
-lean_inc(x_8);
-x_10 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___boxed), 4, 1);
-lean_closure_set(x_10, 0, x_8);
-lean_inc(x_2);
-x_11 = l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(x_1, x_10, x_2, x_9);
-if (lean_obj_tag(x_11) == 0)
+x_10 = l_Lean_choiceKind;
+x_11 = lean_name_eq(x_8, x_10);
+if (x_11 == 0)
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
+lean_object* x_12; lean_object* x_13; 
+lean_dec(x_6);
 lean_inc(x_8);
-x_14 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabMacroRulesAux___lambda__2___boxed), 4, 1);
-lean_closure_set(x_14, 0, x_8);
+x_12 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__1___boxed), 4, 1);
+lean_closure_set(x_12, 0, x_8);
 lean_inc(x_2);
-x_15 = l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(x_1, x_14, x_2, x_13);
-if (lean_obj_tag(x_15) == 0)
+x_13 = l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1(x_1, x_12, x_2, x_9);
+if (lean_obj_tag(x_13) == 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; 
-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_Elab_Command_getCurrMacroScope(x_2, x_17);
-x_19 = lean_ctor_get(x_18, 0);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+lean_inc(x_8);
+x_16 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__2___boxed), 4, 1);
+lean_closure_set(x_16, 0, x_8);
+lean_inc(x_2);
+x_17 = l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1(x_1, x_16, x_2, x_15);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_17, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_17, 1);
 lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
-lean_inc(x_20);
+lean_dec(x_17);
+lean_inc(x_2);
+x_20 = l_Lean_Elab_Command_elabMacroRulesAux(x_8, x_14, x_2, x_19);
+lean_dec(x_14);
+if (lean_obj_tag(x_20) == 0)
+{
+uint8_t x_21; 
+x_21 = !lean_is_exclusive(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; uint8_t x_24; 
+x_22 = lean_ctor_get(x_20, 0);
+x_23 = lean_ctor_get(x_20, 1);
+x_24 = l_Array_isEmpty___rarg(x_18);
+if (x_24 == 0)
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+lean_free_object(x_20);
+x_25 = l_Lean_Elab_Command_getCurrMacroScope(x_2, x_23);
+x_26 = lean_ctor_get(x_25, 1);
+lean_inc(x_26);
+lean_dec(x_25);
+x_27 = l_Lean_Elab_Command_getMainModule(x_2, x_26);
+if (lean_obj_tag(x_27) == 0)
+{
+uint8_t x_28; 
+x_28 = !lean_is_exclusive(x_27);
+if (x_28 == 0)
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_29 = lean_ctor_get(x_27, 0);
+lean_dec(x_29);
+x_30 = l_Array_empty___closed__1;
+x_31 = lean_array_push(x_30, x_22);
+x_32 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_18, x_18, x_5, x_30);
 lean_dec(x_18);
-lean_inc(x_2);
-x_21 = l_Lean_Elab_Command_getMainModule(x_2, x_20);
-if (lean_obj_tag(x_21) == 0)
+x_33 = l_Lean_nullKind___closed__2;
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_32);
+x_35 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4;
+x_36 = lean_array_push(x_35, x_34);
+x_37 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+x_39 = lean_array_push(x_31, x_38);
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_33);
+lean_ctor_set(x_40, 1, x_39);
+lean_ctor_set(x_27, 0, x_40);
+return x_27;
+}
+else
 {
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_21);
-if (x_22 == 0)
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_41 = lean_ctor_get(x_27, 1);
+lean_inc(x_41);
+lean_dec(x_27);
+x_42 = l_Array_empty___closed__1;
+x_43 = lean_array_push(x_42, x_22);
+x_44 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_18, x_18, x_5, x_42);
+lean_dec(x_18);
+x_45 = l_Lean_nullKind___closed__2;
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_45);
+lean_ctor_set(x_46, 1, x_44);
+x_47 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4;
+x_48 = lean_array_push(x_47, x_46);
+x_49 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_49);
+lean_ctor_set(x_50, 1, x_48);
+x_51 = lean_array_push(x_43, x_50);
+x_52 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_52, 0, x_45);
+lean_ctor_set(x_52, 1, x_51);
+x_53 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_41);
+return x_53;
+}
+}
+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_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; uint8_t x_154; 
-x_23 = lean_ctor_get(x_21, 0);
-x_24 = lean_ctor_get(x_21, 1);
-x_25 = lean_box(0);
-x_26 = l_Lean_Elab_mkMacroAttribute___closed__1;
-lean_inc(x_19);
-lean_inc(x_23);
-x_27 = l_Lean_addMacroScope(x_23, x_26, x_19);
-x_28 = lean_box(0);
-x_29 = l_Lean_Elab_Command_elabMacroRulesAux___closed__2;
-x_30 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_30, 0, x_25);
-lean_ctor_set(x_30, 1, x_29);
-lean_ctor_set(x_30, 2, x_27);
-lean_ctor_set(x_30, 3, x_28);
-x_31 = l_Array_empty___closed__1;
-x_32 = lean_array_push(x_31, x_30);
-x_33 = lean_mk_syntax_ident(x_8);
-x_34 = lean_array_push(x_31, x_33);
-x_35 = l_Lean_nullKind___closed__2;
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-x_37 = lean_array_push(x_32, x_36);
-x_38 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__2;
-x_39 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_39, 0, x_38);
-lean_ctor_set(x_39, 1, x_37);
-x_40 = lean_array_push(x_31, x_39);
-x_41 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_41, 0, x_35);
-lean_ctor_set(x_41, 1, x_40);
-x_42 = l_Lean_Elab_Command_elabSyntax___closed__8;
-x_43 = lean_array_push(x_42, x_41);
-x_44 = l_Lean_Elab_Term_elabArrayLit___closed__13;
-x_45 = lean_array_push(x_43, x_44);
-x_46 = l_Lean_Parser_Command_attributes___elambda__1___closed__2;
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_46);
-lean_ctor_set(x_47, 1, x_45);
-x_48 = lean_array_push(x_31, x_47);
-x_49 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_49, 0, x_35);
-lean_ctor_set(x_49, 1, x_48);
-x_50 = l_Lean_Elab_Command_elabSyntax___closed__6;
-x_51 = lean_array_push(x_50, x_49);
-x_52 = l___private_Init_Lean_Elab_Term_5__expandCDot___closed__4;
-x_53 = lean_array_push(x_51, x_52);
-x_54 = lean_array_push(x_53, x_52);
-x_55 = lean_array_push(x_54, x_52);
-x_56 = lean_array_push(x_55, x_52);
-x_57 = l_Lean_Parser_Command_declModifiers___elambda__1___closed__2;
-x_58 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_56);
-x_59 = lean_array_push(x_31, x_58);
-x_60 = l_Lean_Elab_Command_elabMacroRulesAux___closed__6;
-lean_inc(x_19);
-lean_inc(x_23);
-x_61 = l_Lean_addMacroScope(x_23, x_60, x_19);
-x_62 = l_Lean_Elab_Command_elabMacroRulesAux___closed__5;
-x_63 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_63, 0, x_25);
-lean_ctor_set(x_63, 1, x_62);
-lean_ctor_set(x_63, 2, x_61);
-lean_ctor_set(x_63, 3, x_28);
-x_64 = lean_array_push(x_31, x_63);
-x_65 = lean_array_push(x_64, x_52);
-x_66 = l_Lean_Parser_Command_declId___elambda__1___closed__2;
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_66);
-lean_ctor_set(x_67, 1, x_65);
-x_68 = l_Lean_Elab_Command_elabSyntax___closed__10;
-x_69 = lean_array_push(x_68, x_67);
-x_70 = l_Lean_Elab_Command_elabMacroRulesAux___closed__9;
-lean_inc(x_19);
-lean_inc(x_23);
-x_71 = l_Lean_addMacroScope(x_23, x_70, x_19);
-x_72 = l_Lean_Elab_Command_elabMacroRulesAux___closed__8;
-x_73 = l_Lean_Elab_Command_elabMacroRulesAux___closed__11;
-x_74 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_74, 0, x_25);
+uint8_t x_54; 
+lean_dec(x_22);
+lean_dec(x_18);
+x_54 = !lean_is_exclusive(x_27);
+if (x_54 == 0)
+{
+return x_27;
+}
+else
+{
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_27, 0);
+x_56 = lean_ctor_get(x_27, 1);
+lean_inc(x_56);
+lean_inc(x_55);
+lean_dec(x_27);
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_55);
+lean_ctor_set(x_57, 1, x_56);
+return x_57;
+}
+}
+}
+else
+{
+lean_dec(x_18);
+lean_dec(x_2);
+return x_20;
+}
+}
+else
+{
+lean_object* x_58; lean_object* x_59; uint8_t 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 = l_Array_isEmpty___rarg(x_18);
+if (x_60 == 0)
+{
+lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_61 = l_Lean_Elab_Command_getCurrMacroScope(x_2, x_59);
+x_62 = lean_ctor_get(x_61, 1);
+lean_inc(x_62);
+lean_dec(x_61);
+x_63 = l_Lean_Elab_Command_getMainModule(x_2, x_62);
+if (lean_obj_tag(x_63) == 0)
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_64 = lean_ctor_get(x_63, 1);
+lean_inc(x_64);
+if (lean_is_exclusive(x_63)) {
+ lean_ctor_release(x_63, 0);
+ lean_ctor_release(x_63, 1);
+ x_65 = x_63;
+} else {
+ lean_dec_ref(x_63);
+ x_65 = lean_box(0);
+}
+x_66 = l_Array_empty___closed__1;
+x_67 = lean_array_push(x_66, x_58);
+x_68 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_18, x_18, x_5, x_66);
+lean_dec(x_18);
+x_69 = l_Lean_nullKind___closed__2;
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_69);
+lean_ctor_set(x_70, 1, x_68);
+x_71 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4;
+x_72 = lean_array_push(x_71, x_70);
+x_73 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_73);
 lean_ctor_set(x_74, 1, x_72);
-lean_ctor_set(x_74, 2, x_71);
-lean_ctor_set(x_74, 3, x_73);
-x_75 = lean_array_push(x_31, x_74);
-x_76 = lean_array_push(x_75, x_52);
-x_77 = l_Lean_mkTermIdFromIdent___closed__2;
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_77);
-lean_ctor_set(x_78, 1, x_76);
-x_79 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
-x_80 = lean_array_push(x_79, x_78);
-x_81 = l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
-x_82 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_82, 0, x_81);
-lean_ctor_set(x_82, 1, x_80);
-x_83 = lean_array_push(x_31, x_82);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_35);
-lean_ctor_set(x_84, 1, x_83);
-x_85 = lean_array_push(x_50, x_84);
-x_86 = l_Lean_Parser_Command_optDeclSig___elambda__1___closed__2;
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_86);
-lean_ctor_set(x_87, 1, x_85);
-x_88 = lean_array_push(x_69, x_87);
-x_89 = l_Lean_Elab_Command_elabMacroRulesAux___closed__15;
-lean_inc(x_19);
-lean_inc(x_23);
-x_90 = l_Lean_addMacroScope(x_23, x_89, x_19);
-x_91 = l_Lean_Elab_Command_elabMacroRulesAux___closed__14;
-x_92 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_92, 0, x_25);
-lean_ctor_set(x_92, 1, x_91);
-lean_ctor_set(x_92, 2, x_90);
-lean_ctor_set(x_92, 3, x_28);
-x_93 = lean_array_push(x_31, x_92);
-x_94 = lean_array_push(x_93, x_52);
-x_95 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_95, 0, x_77);
-lean_ctor_set(x_95, 1, x_94);
-lean_inc(x_95);
-x_96 = lean_array_push(x_31, x_95);
-x_97 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_97, 0, x_35);
-lean_ctor_set(x_97, 1, x_96);
-x_98 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_99 = lean_array_push(x_98, x_97);
-x_100 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_101 = lean_array_push(x_99, x_100);
-x_102 = l_Lean_Elab_Command_elabMacroRulesAux___closed__17;
-x_103 = lean_array_push(x_102, x_95);
-x_104 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
-x_105 = lean_array_push(x_103, x_104);
-x_106 = lean_array_push(x_105, x_52);
-x_107 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_12, x_12, x_5, x_31);
-lean_dec(x_12);
-x_108 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
-x_109 = lean_array_push(x_107, x_108);
-x_110 = l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
-lean_inc(x_19);
-lean_inc(x_23);
-x_111 = l_Lean_addMacroScope(x_23, x_110, x_19);
-x_112 = l_Lean_Elab_Command_elabMacroRulesAux___closed__22;
-x_113 = l_Lean_Elab_Command_elabMacroRulesAux___closed__28;
-x_114 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_114, 0, x_25);
-lean_ctor_set(x_114, 1, x_112);
-lean_ctor_set(x_114, 2, x_111);
-lean_ctor_set(x_114, 3, x_113);
-x_115 = lean_array_push(x_31, x_114);
-x_116 = lean_array_push(x_115, x_52);
-x_117 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_117, 0, x_77);
-lean_ctor_set(x_117, 1, x_116);
-x_118 = lean_array_push(x_31, x_117);
-x_119 = l_Lean_Elab_Command_elabMacroRulesAux___closed__35;
-x_120 = l_Lean_addMacroScope(x_23, x_119, x_19);
-x_121 = l_Lean_Elab_Command_elabMacroRulesAux___closed__31;
-x_122 = l_Lean_Elab_Command_elabMacroRulesAux___closed__37;
-x_123 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_123, 0, x_25);
-lean_ctor_set(x_123, 1, x_121);
-lean_ctor_set(x_123, 2, x_120);
-lean_ctor_set(x_123, 3, x_122);
-x_124 = lean_array_push(x_31, x_123);
-x_125 = lean_array_push(x_124, x_52);
-x_126 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_126, 0, x_77);
-lean_ctor_set(x_126, 1, x_125);
-x_127 = lean_array_push(x_31, x_126);
-x_128 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_128, 0, x_35);
-lean_ctor_set(x_128, 1, x_127);
-x_129 = lean_array_push(x_118, x_128);
-x_130 = l_Lean_mkAppStx___closed__8;
-x_131 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_131, 0, x_130);
-lean_ctor_set(x_131, 1, x_129);
-x_132 = l_Lean_Elab_Command_elabMacroRulesAux___closed__19;
-x_133 = lean_array_push(x_132, x_131);
-x_134 = l_Lean_Parser_Term_matchAlt___closed__2;
-x_135 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_135, 0, x_134);
-lean_ctor_set(x_135, 1, x_133);
-x_136 = lean_array_push(x_109, x_135);
-x_137 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_137, 0, x_35);
-lean_ctor_set(x_137, 1, x_136);
-x_138 = lean_array_push(x_106, x_137);
-x_139 = l_Lean_Parser_Term_match__syntax___elambda__1___closed__2;
-x_140 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_140, 0, x_139);
-lean_ctor_set(x_140, 1, x_138);
-x_141 = lean_array_push(x_101, x_140);
-x_142 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_143 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_143, 0, x_142);
-lean_ctor_set(x_143, 1, x_141);
-x_144 = l_Lean_Elab_Command_elabSyntax___closed__15;
-x_145 = lean_array_push(x_144, x_143);
-x_146 = l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
-x_147 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_147, 0, x_146);
-lean_ctor_set(x_147, 1, x_145);
-x_148 = lean_array_push(x_88, x_147);
-x_149 = l_Lean_Parser_Command_def___elambda__1___closed__2;
-x_150 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_150, 0, x_149);
-lean_ctor_set(x_150, 1, x_148);
-x_151 = lean_array_push(x_59, x_150);
-x_152 = l_Lean_Parser_Command_declaration___elambda__1___closed__2;
-x_153 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_153, 0, x_152);
-lean_ctor_set(x_153, 1, x_151);
-x_154 = l_Array_isEmpty___rarg(x_16);
-if (x_154 == 0)
-{
-lean_object* x_155; lean_object* x_156; lean_object* x_157; 
-lean_free_object(x_21);
-x_155 = l_Lean_Elab_Command_getCurrMacroScope(x_2, x_24);
-x_156 = lean_ctor_get(x_155, 1);
-lean_inc(x_156);
-lean_dec(x_155);
-x_157 = l_Lean_Elab_Command_getMainModule(x_2, x_156);
-if (lean_obj_tag(x_157) == 0)
-{
-uint8_t x_158; 
-x_158 = !lean_is_exclusive(x_157);
-if (x_158 == 0)
-{
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
-x_159 = lean_ctor_get(x_157, 0);
-lean_dec(x_159);
-x_160 = lean_array_push(x_31, x_153);
-x_161 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_16, x_16, x_5, x_31);
-lean_dec(x_16);
-x_162 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_162, 0, x_35);
-lean_ctor_set(x_162, 1, x_161);
-x_163 = l_Lean_Elab_Command_elabMacroRulesAux___closed__40;
-x_164 = lean_array_push(x_163, x_162);
-x_165 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
-x_166 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_166, 0, x_165);
-lean_ctor_set(x_166, 1, x_164);
-x_167 = lean_array_push(x_160, x_166);
-x_168 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_168, 0, x_35);
-lean_ctor_set(x_168, 1, x_167);
-lean_ctor_set(x_157, 0, x_168);
-return x_157;
+x_75 = lean_array_push(x_67, x_74);
+x_76 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_76, 0, x_69);
+lean_ctor_set(x_76, 1, x_75);
+if (lean_is_scalar(x_65)) {
+ x_77 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_77 = x_65;
+}
+lean_ctor_set(x_77, 0, x_76);
+lean_ctor_set(x_77, 1, x_64);
+return x_77;
 }
 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; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; 
-x_169 = lean_ctor_get(x_157, 1);
-lean_inc(x_169);
-lean_dec(x_157);
-x_170 = lean_array_push(x_31, x_153);
-x_171 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_16, x_16, x_5, x_31);
-lean_dec(x_16);
-x_172 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_172, 0, x_35);
-lean_ctor_set(x_172, 1, x_171);
-x_173 = l_Lean_Elab_Command_elabMacroRulesAux___closed__40;
-x_174 = lean_array_push(x_173, x_172);
-x_175 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
-x_176 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_176, 0, x_175);
-lean_ctor_set(x_176, 1, x_174);
-x_177 = lean_array_push(x_170, x_176);
-x_178 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_178, 0, x_35);
-lean_ctor_set(x_178, 1, x_177);
-x_179 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_179, 0, x_178);
-lean_ctor_set(x_179, 1, x_169);
-return x_179;
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+lean_dec(x_58);
+lean_dec(x_18);
+x_78 = lean_ctor_get(x_63, 0);
+lean_inc(x_78);
+x_79 = lean_ctor_get(x_63, 1);
+lean_inc(x_79);
+if (lean_is_exclusive(x_63)) {
+ lean_ctor_release(x_63, 0);
+ lean_ctor_release(x_63, 1);
+ x_80 = x_63;
+} else {
+ lean_dec_ref(x_63);
+ x_80 = lean_box(0);
+}
+if (lean_is_scalar(x_80)) {
+ x_81 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_81 = x_80;
+}
+lean_ctor_set(x_81, 0, x_78);
+lean_ctor_set(x_81, 1, x_79);
+return x_81;
 }
 }
 else
 {
-uint8_t x_180; 
-lean_dec(x_153);
-lean_dec(x_16);
-x_180 = !lean_is_exclusive(x_157);
-if (x_180 == 0)
-{
-return x_157;
-}
-else
-{
-lean_object* x_181; lean_object* x_182; lean_object* x_183; 
-x_181 = lean_ctor_get(x_157, 0);
-x_182 = lean_ctor_get(x_157, 1);
-lean_inc(x_182);
-lean_inc(x_181);
-lean_dec(x_157);
-x_183 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_183, 0, x_181);
-lean_ctor_set(x_183, 1, x_182);
-return x_183;
-}
-}
-}
-else
-{
-lean_dec(x_16);
+lean_object* x_82; 
+lean_dec(x_18);
 lean_dec(x_2);
-lean_ctor_set(x_21, 0, x_153);
-return x_21;
+x_82 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_82, 0, x_58);
+lean_ctor_set(x_82, 1, x_59);
+return x_82;
+}
 }
 }
 else
 {
-lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; lean_object* x_314; uint8_t x_315; 
-x_184 = lean_ctor_get(x_21, 0);
-x_185 = lean_ctor_get(x_21, 1);
-lean_inc(x_185);
-lean_inc(x_184);
-lean_dec(x_21);
-x_186 = lean_box(0);
-x_187 = l_Lean_Elab_mkMacroAttribute___closed__1;
-lean_inc(x_19);
-lean_inc(x_184);
-x_188 = l_Lean_addMacroScope(x_184, x_187, x_19);
-x_189 = lean_box(0);
-x_190 = l_Lean_Elab_Command_elabMacroRulesAux___closed__2;
-x_191 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_191, 0, x_186);
-lean_ctor_set(x_191, 1, x_190);
-lean_ctor_set(x_191, 2, x_188);
-lean_ctor_set(x_191, 3, x_189);
-x_192 = l_Array_empty___closed__1;
-x_193 = lean_array_push(x_192, x_191);
-x_194 = lean_mk_syntax_ident(x_8);
-x_195 = lean_array_push(x_192, x_194);
-x_196 = l_Lean_nullKind___closed__2;
-x_197 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_197, 0, x_196);
-lean_ctor_set(x_197, 1, x_195);
-x_198 = lean_array_push(x_193, x_197);
-x_199 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__2;
-x_200 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_200, 0, x_199);
-lean_ctor_set(x_200, 1, x_198);
-x_201 = lean_array_push(x_192, x_200);
-x_202 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_202, 0, x_196);
-lean_ctor_set(x_202, 1, x_201);
-x_203 = l_Lean_Elab_Command_elabSyntax___closed__8;
-x_204 = lean_array_push(x_203, x_202);
-x_205 = l_Lean_Elab_Term_elabArrayLit___closed__13;
-x_206 = lean_array_push(x_204, x_205);
-x_207 = l_Lean_Parser_Command_attributes___elambda__1___closed__2;
-x_208 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_208, 0, x_207);
-lean_ctor_set(x_208, 1, x_206);
-x_209 = lean_array_push(x_192, x_208);
-x_210 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_210, 0, x_196);
-lean_ctor_set(x_210, 1, x_209);
-x_211 = l_Lean_Elab_Command_elabSyntax___closed__6;
-x_212 = lean_array_push(x_211, x_210);
-x_213 = l___private_Init_Lean_Elab_Term_5__expandCDot___closed__4;
-x_214 = lean_array_push(x_212, x_213);
-x_215 = lean_array_push(x_214, x_213);
-x_216 = lean_array_push(x_215, x_213);
-x_217 = lean_array_push(x_216, x_213);
-x_218 = l_Lean_Parser_Command_declModifiers___elambda__1___closed__2;
-x_219 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_219, 0, x_218);
-lean_ctor_set(x_219, 1, x_217);
-x_220 = lean_array_push(x_192, x_219);
-x_221 = l_Lean_Elab_Command_elabMacroRulesAux___closed__6;
-lean_inc(x_19);
-lean_inc(x_184);
-x_222 = l_Lean_addMacroScope(x_184, x_221, x_19);
-x_223 = l_Lean_Elab_Command_elabMacroRulesAux___closed__5;
-x_224 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_224, 0, x_186);
-lean_ctor_set(x_224, 1, x_223);
-lean_ctor_set(x_224, 2, x_222);
-lean_ctor_set(x_224, 3, x_189);
-x_225 = lean_array_push(x_192, x_224);
-x_226 = lean_array_push(x_225, x_213);
-x_227 = l_Lean_Parser_Command_declId___elambda__1___closed__2;
-x_228 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_228, 0, x_227);
-lean_ctor_set(x_228, 1, x_226);
-x_229 = l_Lean_Elab_Command_elabSyntax___closed__10;
-x_230 = lean_array_push(x_229, x_228);
-x_231 = l_Lean_Elab_Command_elabMacroRulesAux___closed__9;
-lean_inc(x_19);
-lean_inc(x_184);
-x_232 = l_Lean_addMacroScope(x_184, x_231, x_19);
-x_233 = l_Lean_Elab_Command_elabMacroRulesAux___closed__8;
-x_234 = l_Lean_Elab_Command_elabMacroRulesAux___closed__11;
-x_235 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_235, 0, x_186);
-lean_ctor_set(x_235, 1, x_233);
-lean_ctor_set(x_235, 2, x_232);
-lean_ctor_set(x_235, 3, x_234);
-x_236 = lean_array_push(x_192, x_235);
-x_237 = lean_array_push(x_236, x_213);
-x_238 = l_Lean_mkTermIdFromIdent___closed__2;
-x_239 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_239, 0, x_238);
-lean_ctor_set(x_239, 1, x_237);
-x_240 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
-x_241 = lean_array_push(x_240, x_239);
-x_242 = l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
-x_243 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_243, 0, x_242);
-lean_ctor_set(x_243, 1, x_241);
-x_244 = lean_array_push(x_192, x_243);
-x_245 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_245, 0, x_196);
-lean_ctor_set(x_245, 1, x_244);
-x_246 = lean_array_push(x_211, x_245);
-x_247 = l_Lean_Parser_Command_optDeclSig___elambda__1___closed__2;
-x_248 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_248, 0, x_247);
-lean_ctor_set(x_248, 1, x_246);
-x_249 = lean_array_push(x_230, x_248);
-x_250 = l_Lean_Elab_Command_elabMacroRulesAux___closed__15;
-lean_inc(x_19);
-lean_inc(x_184);
-x_251 = l_Lean_addMacroScope(x_184, x_250, x_19);
-x_252 = l_Lean_Elab_Command_elabMacroRulesAux___closed__14;
-x_253 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_253, 0, x_186);
-lean_ctor_set(x_253, 1, x_252);
-lean_ctor_set(x_253, 2, x_251);
-lean_ctor_set(x_253, 3, x_189);
-x_254 = lean_array_push(x_192, x_253);
-x_255 = lean_array_push(x_254, x_213);
-x_256 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_256, 0, x_238);
-lean_ctor_set(x_256, 1, x_255);
-lean_inc(x_256);
-x_257 = lean_array_push(x_192, x_256);
-x_258 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_258, 0, x_196);
-lean_ctor_set(x_258, 1, x_257);
-x_259 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_260 = lean_array_push(x_259, x_258);
-x_261 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_262 = lean_array_push(x_260, x_261);
-x_263 = l_Lean_Elab_Command_elabMacroRulesAux___closed__17;
-x_264 = lean_array_push(x_263, x_256);
-x_265 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
-x_266 = lean_array_push(x_264, x_265);
-x_267 = lean_array_push(x_266, x_213);
-x_268 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_12, x_12, x_5, x_192);
-lean_dec(x_12);
-x_269 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
-x_270 = lean_array_push(x_268, x_269);
-x_271 = l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
-lean_inc(x_19);
-lean_inc(x_184);
-x_272 = l_Lean_addMacroScope(x_184, x_271, x_19);
-x_273 = l_Lean_Elab_Command_elabMacroRulesAux___closed__22;
-x_274 = l_Lean_Elab_Command_elabMacroRulesAux___closed__28;
-x_275 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_275, 0, x_186);
-lean_ctor_set(x_275, 1, x_273);
-lean_ctor_set(x_275, 2, x_272);
-lean_ctor_set(x_275, 3, x_274);
-x_276 = lean_array_push(x_192, x_275);
-x_277 = lean_array_push(x_276, x_213);
-x_278 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_278, 0, x_238);
-lean_ctor_set(x_278, 1, x_277);
-x_279 = lean_array_push(x_192, x_278);
-x_280 = l_Lean_Elab_Command_elabMacroRulesAux___closed__35;
-x_281 = l_Lean_addMacroScope(x_184, x_280, x_19);
-x_282 = l_Lean_Elab_Command_elabMacroRulesAux___closed__31;
-x_283 = l_Lean_Elab_Command_elabMacroRulesAux___closed__37;
-x_284 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_284, 0, x_186);
-lean_ctor_set(x_284, 1, x_282);
-lean_ctor_set(x_284, 2, x_281);
-lean_ctor_set(x_284, 3, x_283);
-x_285 = lean_array_push(x_192, x_284);
-x_286 = lean_array_push(x_285, x_213);
-x_287 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_287, 0, x_238);
-lean_ctor_set(x_287, 1, x_286);
-x_288 = lean_array_push(x_192, x_287);
-x_289 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_289, 0, x_196);
-lean_ctor_set(x_289, 1, x_288);
-x_290 = lean_array_push(x_279, x_289);
-x_291 = l_Lean_mkAppStx___closed__8;
-x_292 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_292, 0, x_291);
-lean_ctor_set(x_292, 1, x_290);
-x_293 = l_Lean_Elab_Command_elabMacroRulesAux___closed__19;
-x_294 = lean_array_push(x_293, x_292);
-x_295 = l_Lean_Parser_Term_matchAlt___closed__2;
-x_296 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_296, 0, x_295);
-lean_ctor_set(x_296, 1, x_294);
-x_297 = lean_array_push(x_270, x_296);
-x_298 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_298, 0, x_196);
-lean_ctor_set(x_298, 1, x_297);
-x_299 = lean_array_push(x_267, x_298);
-x_300 = l_Lean_Parser_Term_match__syntax___elambda__1___closed__2;
-x_301 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_301, 0, x_300);
-lean_ctor_set(x_301, 1, x_299);
-x_302 = lean_array_push(x_262, x_301);
-x_303 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_304 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_304, 0, x_303);
-lean_ctor_set(x_304, 1, x_302);
-x_305 = l_Lean_Elab_Command_elabSyntax___closed__15;
-x_306 = lean_array_push(x_305, x_304);
-x_307 = l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
-x_308 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_308, 0, x_307);
-lean_ctor_set(x_308, 1, x_306);
-x_309 = lean_array_push(x_249, x_308);
-x_310 = l_Lean_Parser_Command_def___elambda__1___closed__2;
-x_311 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_311, 0, x_310);
-lean_ctor_set(x_311, 1, x_309);
-x_312 = lean_array_push(x_220, x_311);
-x_313 = l_Lean_Parser_Command_declaration___elambda__1___closed__2;
-x_314 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_314, 0, x_313);
-lean_ctor_set(x_314, 1, x_312);
-x_315 = l_Array_isEmpty___rarg(x_16);
-if (x_315 == 0)
-{
-lean_object* x_316; lean_object* x_317; lean_object* x_318; 
-x_316 = l_Lean_Elab_Command_getCurrMacroScope(x_2, x_185);
-x_317 = lean_ctor_get(x_316, 1);
-lean_inc(x_317);
-lean_dec(x_316);
-x_318 = l_Lean_Elab_Command_getMainModule(x_2, x_317);
-if (lean_obj_tag(x_318) == 0)
-{
-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; 
-x_319 = lean_ctor_get(x_318, 1);
-lean_inc(x_319);
-if (lean_is_exclusive(x_318)) {
- lean_ctor_release(x_318, 0);
- lean_ctor_release(x_318, 1);
- x_320 = x_318;
-} else {
- lean_dec_ref(x_318);
- x_320 = lean_box(0);
-}
-x_321 = lean_array_push(x_192, x_314);
-x_322 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_16, x_16, x_5, x_192);
-lean_dec(x_16);
-x_323 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_323, 0, x_196);
-lean_ctor_set(x_323, 1, x_322);
-x_324 = l_Lean_Elab_Command_elabMacroRulesAux___closed__40;
-x_325 = lean_array_push(x_324, x_323);
-x_326 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
-x_327 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_327, 0, x_326);
-lean_ctor_set(x_327, 1, x_325);
-x_328 = lean_array_push(x_321, x_327);
-x_329 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_329, 0, x_196);
-lean_ctor_set(x_329, 1, x_328);
-if (lean_is_scalar(x_320)) {
- x_330 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_330 = x_320;
-}
-lean_ctor_set(x_330, 0, x_329);
-lean_ctor_set(x_330, 1, x_319);
-return x_330;
-}
-else
-{
-lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; 
-lean_dec(x_314);
-lean_dec(x_16);
-x_331 = lean_ctor_get(x_318, 0);
-lean_inc(x_331);
-x_332 = lean_ctor_get(x_318, 1);
-lean_inc(x_332);
-if (lean_is_exclusive(x_318)) {
- lean_ctor_release(x_318, 0);
- lean_ctor_release(x_318, 1);
- x_333 = x_318;
-} else {
- lean_dec_ref(x_318);
- x_333 = lean_box(0);
-}
-if (lean_is_scalar(x_333)) {
- x_334 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_334 = x_333;
-}
-lean_ctor_set(x_334, 0, x_331);
-lean_ctor_set(x_334, 1, x_332);
-return x_334;
-}
-}
-else
-{
-lean_object* x_335; 
-lean_dec(x_16);
+uint8_t x_83; 
+lean_dec(x_18);
 lean_dec(x_2);
-x_335 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_335, 0, x_314);
-lean_ctor_set(x_335, 1, x_185);
-return x_335;
+x_83 = !lean_is_exclusive(x_20);
+if (x_83 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_84 = lean_ctor_get(x_20, 0);
+x_85 = lean_ctor_get(x_20, 1);
+lean_inc(x_85);
+lean_inc(x_84);
+lean_dec(x_20);
+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_336; 
-lean_dec(x_19);
-lean_dec(x_16);
-lean_dec(x_12);
+uint8_t x_87; 
+lean_dec(x_14);
 lean_dec(x_8);
 lean_dec(x_2);
-x_336 = !lean_is_exclusive(x_21);
-if (x_336 == 0)
+x_87 = !lean_is_exclusive(x_17);
+if (x_87 == 0)
 {
-return x_21;
+return x_17;
 }
 else
 {
-lean_object* x_337; lean_object* x_338; lean_object* x_339; 
-x_337 = lean_ctor_get(x_21, 0);
-x_338 = lean_ctor_get(x_21, 1);
-lean_inc(x_338);
-lean_inc(x_337);
-lean_dec(x_21);
-x_339 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_339, 0, x_337);
-lean_ctor_set(x_339, 1, x_338);
-return x_339;
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_17, 0);
+x_89 = lean_ctor_get(x_17, 1);
+lean_inc(x_89);
+lean_inc(x_88);
+lean_dec(x_17);
+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_340; 
-lean_dec(x_12);
+uint8_t x_91; 
 lean_dec(x_8);
 lean_dec(x_2);
-x_340 = !lean_is_exclusive(x_15);
-if (x_340 == 0)
+x_91 = !lean_is_exclusive(x_13);
+if (x_91 == 0)
 {
-return x_15;
+return x_13;
 }
 else
 {
-lean_object* x_341; lean_object* x_342; lean_object* x_343; 
-x_341 = lean_ctor_get(x_15, 0);
-x_342 = lean_ctor_get(x_15, 1);
-lean_inc(x_342);
-lean_inc(x_341);
-lean_dec(x_15);
-x_343 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_343, 0, x_341);
-lean_ctor_set(x_343, 1, x_342);
-return x_343;
+lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_92 = lean_ctor_get(x_13, 0);
+x_93 = lean_ctor_get(x_13, 1);
+lean_inc(x_93);
+lean_inc(x_92);
+lean_dec(x_13);
+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_344; 
+lean_object* x_95; lean_object* x_96; 
 lean_dec(x_8);
-lean_dec(x_2);
-x_344 = !lean_is_exclusive(x_11);
-if (x_344 == 0)
-{
-return x_11;
-}
-else
-{
-lean_object* x_345; lean_object* x_346; lean_object* x_347; 
-x_345 = lean_ctor_get(x_11, 0);
-x_346 = lean_ctor_get(x_11, 1);
-lean_inc(x_346);
-lean_inc(x_345);
-lean_dec(x_11);
-x_347 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_347, 0, x_345);
-lean_ctor_set(x_347, 1, x_346);
-return x_347;
-}
+x_95 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__7;
+x_96 = l_Lean_Elab_Command_throwError___rarg(x_6, x_95, x_2, x_9);
+lean_dec(x_6);
+return x_96;
 }
 }
 else
 {
-uint8_t x_348; 
+uint8_t x_97; 
+lean_dec(x_6);
 lean_dec(x_2);
-x_348 = !lean_is_exclusive(x_7);
-if (x_348 == 0)
+x_97 = !lean_is_exclusive(x_7);
+if (x_97 == 0)
 {
 return x_7;
 }
 else
 {
-lean_object* x_349; lean_object* x_350; lean_object* x_351; 
-x_349 = lean_ctor_get(x_7, 0);
-x_350 = lean_ctor_get(x_7, 1);
-lean_inc(x_350);
-lean_inc(x_349);
+lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_98 = lean_ctor_get(x_7, 0);
+x_99 = lean_ctor_get(x_7, 1);
+lean_inc(x_99);
+lean_inc(x_98);
 lean_dec(x_7);
-x_351 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_351, 0, x_349);
-lean_ctor_set(x_351, 1, x_350);
-return x_351;
+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_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___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* l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabMacroRulesAux___spec__2(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Init_LeanInit_14__filterSepElemsMAux___main___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__2(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_1);
 return x_7;
 }
 }
-lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_filterSepElemsM___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(x_1, x_2, x_3, x_4);
+x_5 = l_Array_filterSepElemsM___at_Lean_Elab_Command_elabNoKindMacroRulesAux___spec__1(x_1, x_2, x_3, x_4);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___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_Elab_Command_elabMacroRulesAux___lambda__1(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__1(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__2(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__2(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Command_elabMacroRulesAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Lean_Elab_Command_elabMacroRulesAux(x_1, x_2, x_3);
+x_4 = l_Lean_Elab_Command_elabNoKindMacroRulesAux(x_1, x_2, x_3);
 lean_dec(x_1);
 return x_4;
 }
@@ -10901,30 +11544,30 @@ return x_4;
 lean_object* l_Lean_Elab_Command_elabMacroRules___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-uint8_t x_4; lean_object* x_42; uint8_t x_43; 
-x_42 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
+uint8_t x_4; lean_object* x_100; uint8_t x_101; 
+x_100 = l_Lean_Parser_Command_macro__rules___elambda__1___closed__2;
 lean_inc(x_1);
-x_43 = l_Lean_Syntax_isOfKind(x_1, x_42);
-if (x_43 == 0)
+x_101 = l_Lean_Syntax_isOfKind(x_1, x_100);
+if (x_101 == 0)
 {
-uint8_t x_44; 
-x_44 = 0;
-x_4 = x_44;
-goto block_41;
+uint8_t x_102; 
+x_102 = 0;
+x_4 = x_102;
+goto block_99;
 }
 else
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
-x_45 = l_Lean_Syntax_getArgs(x_1);
-x_46 = lean_array_get_size(x_45);
-lean_dec(x_45);
-x_47 = lean_unsigned_to_nat(3u);
-x_48 = lean_nat_dec_eq(x_46, x_47);
-lean_dec(x_46);
-x_4 = x_48;
-goto block_41;
+lean_object* x_103; lean_object* x_104; lean_object* x_105; uint8_t x_106; 
+x_103 = l_Lean_Syntax_getArgs(x_1);
+x_104 = lean_array_get_size(x_103);
+lean_dec(x_103);
+x_105 = lean_unsigned_to_nat(4u);
+x_106 = lean_nat_dec_eq(x_104, x_105);
+lean_dec(x_104);
+x_4 = x_106;
+goto block_99;
 }
-block_41:
+block_99:
 {
 uint8_t x_5; 
 x_5 = l_coeDecidableEq(x_4);
@@ -10941,113 +11584,307 @@ return x_7;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; uint8_t x_12; 
+lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_52; uint8_t x_53; uint8_t x_54; 
 x_8 = lean_unsigned_to_nat(1u);
 x_9 = l_Lean_Syntax_getArg(x_1, x_8);
-x_10 = l_Lean_nullKind___closed__2;
+x_52 = l_Lean_nullKind___closed__2;
 lean_inc(x_9);
-x_11 = l_Lean_Syntax_isOfKind(x_9, x_10);
+x_53 = l_Lean_Syntax_isOfKind(x_9, x_52);
+if (x_53 == 0)
+{
+uint8_t x_94; 
+x_94 = 0;
+x_54 = x_94;
+goto block_93;
+}
+else
+{
+lean_object* x_95; lean_object* x_96; lean_object* x_97; uint8_t x_98; 
+x_95 = l_Lean_Syntax_getArgs(x_9);
+x_96 = lean_array_get_size(x_95);
+lean_dec(x_95);
+x_97 = lean_unsigned_to_nat(0u);
+x_98 = lean_nat_dec_eq(x_96, x_97);
+lean_dec(x_96);
+x_54 = x_98;
+goto block_93;
+}
+block_51:
+{
+uint8_t x_11; 
+x_11 = l_coeDecidableEq(x_10);
 if (x_11 == 0)
 {
-uint8_t x_36; 
-x_36 = 0;
-x_12 = x_36;
-goto block_35;
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_37 = l_Lean_Syntax_getArgs(x_9);
-x_38 = lean_array_get_size(x_37);
-lean_dec(x_37);
-x_39 = lean_unsigned_to_nat(0u);
-x_40 = lean_nat_dec_eq(x_38, x_39);
-lean_dec(x_38);
-x_12 = x_40;
-goto block_35;
-}
-block_35:
-{
-uint8_t x_13; 
-x_13 = l_coeDecidableEq(x_12);
-if (x_13 == 0)
-{
-if (x_11 == 0)
-{
-uint8_t x_14; 
+lean_object* x_12; lean_object* x_13; 
 lean_dec(x_9);
-x_14 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
-if (x_14 == 0)
-{
-lean_object* x_15; lean_object* x_16; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_15 = lean_box(1);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_3);
-return x_16;
+x_12 = lean_box(1);
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_3);
+return x_13;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_17 = lean_unsigned_to_nat(2u);
-x_18 = l_Lean_Syntax_getArg(x_1, x_17);
-lean_dec(x_1);
-x_19 = l_Lean_Syntax_getArgs(x_18);
-lean_dec(x_18);
-x_20 = l_Lean_Elab_Command_elabMacroRulesAux(x_19, x_2, x_3);
-lean_dec(x_19);
-return x_20;
-}
-}
-else
-{
-lean_object* x_21; lean_object* x_22; uint8_t x_23; uint8_t x_24; 
-x_21 = l_Lean_Syntax_getArgs(x_9);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; uint8_t x_19; 
+x_14 = l_Lean_Syntax_getArg(x_9, x_8);
 lean_dec(x_9);
-x_22 = lean_array_get_size(x_21);
-lean_dec(x_21);
-x_23 = lean_nat_dec_eq(x_22, x_8);
-lean_dec(x_22);
-x_24 = l_coeDecidableEq(x_23);
-if (x_24 == 0)
+x_15 = lean_unsigned_to_nat(2u);
+x_16 = l_Lean_Syntax_getArg(x_1, x_15);
+x_17 = l_Lean_nullKind___closed__2;
+lean_inc(x_16);
+x_18 = l_Lean_Syntax_isOfKind(x_16, x_17);
+if (x_18 == 0)
 {
-lean_object* x_25; lean_object* x_26; 
+uint8_t x_46; 
+x_46 = 0;
+x_19 = x_46;
+goto block_45;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
+x_47 = l_Lean_Syntax_getArgs(x_16);
+x_48 = lean_array_get_size(x_47);
+lean_dec(x_47);
+x_49 = lean_unsigned_to_nat(0u);
+x_50 = lean_nat_dec_eq(x_48, x_49);
+lean_dec(x_48);
+x_19 = x_50;
+goto block_45;
+}
+block_45:
+{
+uint8_t x_20; 
+x_20 = l_coeDecidableEq(x_19);
+if (x_20 == 0)
+{
+if (x_18 == 0)
+{
+uint8_t x_21; 
+lean_dec(x_16);
+x_21 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+lean_dec(x_14);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = lean_box(1);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_3);
-return x_26;
+x_22 = lean_box(1);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_3);
+return x_23;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_27 = lean_unsigned_to_nat(2u);
-x_28 = l_Lean_Syntax_getArg(x_1, x_27);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_24 = lean_unsigned_to_nat(3u);
+x_25 = l_Lean_Syntax_getArg(x_1, x_24);
 lean_dec(x_1);
-x_29 = l_Lean_Syntax_getArgs(x_28);
-lean_dec(x_28);
-x_30 = l_Lean_Elab_Command_elabMacroRulesAux(x_29, x_2, x_3);
+x_26 = l_Lean_Syntax_getArgs(x_25);
+lean_dec(x_25);
+x_27 = l_Lean_Syntax_getId(x_14);
+lean_dec(x_14);
+x_28 = l_Lean_Elab_Command_elabMacroRulesAux(x_27, x_26, x_2, x_3);
+lean_dec(x_26);
+return x_28;
+}
+}
+else
+{
+lean_object* x_29; lean_object* x_30; uint8_t x_31; uint8_t x_32; 
+x_29 = l_Lean_Syntax_getArgs(x_16);
+lean_dec(x_16);
+x_30 = lean_array_get_size(x_29);
 lean_dec(x_29);
-return x_30;
+x_31 = lean_nat_dec_eq(x_30, x_8);
+lean_dec(x_30);
+x_32 = l_coeDecidableEq(x_31);
+if (x_32 == 0)
+{
+lean_object* x_33; lean_object* x_34; 
+lean_dec(x_14);
+lean_dec(x_2);
+lean_dec(x_1);
+x_33 = lean_box(1);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_3);
+return x_34;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_35 = lean_unsigned_to_nat(3u);
+x_36 = l_Lean_Syntax_getArg(x_1, x_35);
+lean_dec(x_1);
+x_37 = l_Lean_Syntax_getArgs(x_36);
+lean_dec(x_36);
+x_38 = l_Lean_Syntax_getId(x_14);
+lean_dec(x_14);
+x_39 = l_Lean_Elab_Command_elabMacroRulesAux(x_38, x_37, x_2, x_3);
+lean_dec(x_37);
+return x_39;
 }
 }
 }
 else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-lean_dec(x_9);
-x_31 = lean_unsigned_to_nat(2u);
-x_32 = l_Lean_Syntax_getArg(x_1, x_31);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+lean_dec(x_16);
+x_40 = lean_unsigned_to_nat(3u);
+x_41 = l_Lean_Syntax_getArg(x_1, x_40);
 lean_dec(x_1);
-x_33 = l_Lean_Syntax_getArgs(x_32);
-lean_dec(x_32);
-x_34 = l_Lean_Elab_Command_elabMacroRulesAux(x_33, x_2, x_3);
-lean_dec(x_33);
-return x_34;
+x_42 = l_Lean_Syntax_getArgs(x_41);
+lean_dec(x_41);
+x_43 = l_Lean_Syntax_getId(x_14);
+lean_dec(x_14);
+x_44 = l_Lean_Elab_Command_elabMacroRulesAux(x_43, x_42, x_2, x_3);
+lean_dec(x_42);
+return x_44;
+}
+}
+}
+}
+block_93:
+{
+uint8_t x_55; 
+x_55 = l_coeDecidableEq(x_54);
+if (x_55 == 0)
+{
+if (x_53 == 0)
+{
+uint8_t x_56; 
+x_56 = 0;
+x_10 = x_56;
+goto block_51;
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; 
+x_57 = l_Lean_Syntax_getArgs(x_9);
+x_58 = lean_array_get_size(x_57);
+lean_dec(x_57);
+x_59 = lean_unsigned_to_nat(3u);
+x_60 = lean_nat_dec_eq(x_58, x_59);
+lean_dec(x_58);
+x_10 = x_60;
+goto block_51;
+}
+}
+else
+{
+lean_object* x_61; lean_object* x_62; uint8_t x_63; uint8_t x_64; 
+lean_dec(x_9);
+x_61 = lean_unsigned_to_nat(2u);
+x_62 = l_Lean_Syntax_getArg(x_1, x_61);
+lean_inc(x_62);
+x_63 = l_Lean_Syntax_isOfKind(x_62, x_52);
+if (x_63 == 0)
+{
+uint8_t x_88; 
+x_88 = 0;
+x_64 = x_88;
+goto block_87;
+}
+else
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; 
+x_89 = l_Lean_Syntax_getArgs(x_62);
+x_90 = lean_array_get_size(x_89);
+lean_dec(x_89);
+x_91 = lean_unsigned_to_nat(0u);
+x_92 = lean_nat_dec_eq(x_90, x_91);
+lean_dec(x_90);
+x_64 = x_92;
+goto block_87;
+}
+block_87:
+{
+uint8_t x_65; 
+x_65 = l_coeDecidableEq(x_64);
+if (x_65 == 0)
+{
+if (x_63 == 0)
+{
+uint8_t x_66; 
+lean_dec(x_62);
+x_66 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
+if (x_66 == 0)
+{
+lean_object* x_67; lean_object* x_68; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_67 = lean_box(1);
+x_68 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_3);
+return x_68;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_69 = lean_unsigned_to_nat(3u);
+x_70 = l_Lean_Syntax_getArg(x_1, x_69);
+lean_dec(x_1);
+x_71 = l_Lean_Syntax_getArgs(x_70);
+lean_dec(x_70);
+x_72 = l_Lean_Elab_Command_elabNoKindMacroRulesAux(x_71, x_2, x_3);
+lean_dec(x_71);
+return x_72;
+}
+}
+else
+{
+lean_object* x_73; lean_object* x_74; uint8_t x_75; uint8_t x_76; 
+x_73 = l_Lean_Syntax_getArgs(x_62);
+lean_dec(x_62);
+x_74 = lean_array_get_size(x_73);
+lean_dec(x_73);
+x_75 = lean_nat_dec_eq(x_74, x_8);
+lean_dec(x_74);
+x_76 = l_coeDecidableEq(x_75);
+if (x_76 == 0)
+{
+lean_object* x_77; lean_object* x_78; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_77 = lean_box(1);
+x_78 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_78, 0, x_77);
+lean_ctor_set(x_78, 1, x_3);
+return x_78;
+}
+else
+{
+lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_79 = lean_unsigned_to_nat(3u);
+x_80 = l_Lean_Syntax_getArg(x_1, x_79);
+lean_dec(x_1);
+x_81 = l_Lean_Syntax_getArgs(x_80);
+lean_dec(x_80);
+x_82 = l_Lean_Elab_Command_elabNoKindMacroRulesAux(x_81, x_2, x_3);
+lean_dec(x_81);
+return x_82;
+}
+}
+}
+else
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+lean_dec(x_62);
+x_83 = lean_unsigned_to_nat(3u);
+x_84 = l_Lean_Syntax_getArg(x_1, x_83);
+lean_dec(x_1);
+x_85 = l_Lean_Syntax_getArgs(x_84);
+lean_dec(x_84);
+x_86 = l_Lean_Elab_Command_elabNoKindMacroRulesAux(x_85, x_2, x_3);
+lean_dec(x_85);
+return x_86;
+}
+}
 }
 }
 }
@@ -12394,34 +13231,12 @@ lean_object* _init_l_Lean_Elab_Command_expandNotation___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_elabMacroRulesAux___closed__39;
+x_1 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3;
 x_2 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_expandNotation___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Term_stxQuot___elambda__1___closed__5;
-x_3 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_expandNotation___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_empty___closed__1;
-x_2 = l_Lean_Elab_Command_expandNotation___closed__4;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
 lean_object* l_Lean_Elab_Command_expandNotation(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -12580,7 +13395,7 @@ x_49 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_49, 0, x_48);
 lean_ctor_set(x_49, 1, x_47);
 x_50 = lean_array_push(x_41, x_49);
-x_51 = l_Lean_Elab_Command_expandNotation___closed__5;
+x_51 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_52 = lean_array_push(x_51, x_31);
 x_53 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_54 = lean_array_push(x_52, x_53);
@@ -12659,7 +13474,7 @@ x_95 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_95, 0, x_94);
 lean_ctor_set(x_95, 1, x_93);
 x_96 = lean_array_push(x_87, x_95);
-x_97 = l_Lean_Elab_Command_expandNotation___closed__5;
+x_97 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_98 = lean_array_push(x_97, x_77);
 x_99 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_100 = lean_array_push(x_98, x_99);
@@ -13486,7 +14301,7 @@ x_64 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_64, 0, x_63);
 lean_ctor_set(x_64, 1, x_62);
 x_65 = lean_array_push(x_56, x_64);
-x_66 = l_Lean_Elab_Command_expandNotation___closed__5;
+x_66 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_67 = lean_array_push(x_66, x_41);
 x_68 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_69 = lean_array_push(x_67, x_68);
@@ -13559,7 +14374,7 @@ x_110 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_110, 0, x_109);
 lean_ctor_set(x_110, 1, x_108);
 x_111 = lean_array_push(x_102, x_110);
-x_112 = l_Lean_Elab_Command_expandNotation___closed__5;
+x_112 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_113 = lean_array_push(x_112, x_41);
 x_114 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_115 = lean_array_push(x_113, x_114);
@@ -13646,7 +14461,7 @@ x_160 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_160, 0, x_159);
 lean_ctor_set(x_160, 1, x_158);
 x_161 = lean_array_push(x_152, x_160);
-x_162 = l_Lean_Elab_Command_expandNotation___closed__5;
+x_162 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_163 = lean_array_push(x_162, x_137);
 x_164 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_165 = lean_array_push(x_163, x_164);
@@ -13720,7 +14535,7 @@ x_207 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_207, 0, x_206);
 lean_ctor_set(x_207, 1, x_205);
 x_208 = lean_array_push(x_199, x_207);
-x_209 = l_Lean_Elab_Command_expandNotation___closed__5;
+x_209 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_210 = lean_array_push(x_209, x_137);
 x_211 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_212 = lean_array_push(x_210, x_211);
@@ -14251,6 +15066,22 @@ lean_mark_persistent(l___regBuiltinCommandElab_Lean_Elab_Command_elabSyntax___cl
 res = l___regBuiltinCommandElab_Lean_Elab_Command_elabSyntax(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__1 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__1);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__2 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__2();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__2);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__3 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__3();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__3);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__4 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__4();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__4);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__5 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__5();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__5);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__6 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__6();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__6);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__7 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__7();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__7);
+l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8 = _init_l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8();
+lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8);
 l_Lean_Elab_Command_elabMacroRulesAux___closed__1 = _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___closed__1);
 l_Lean_Elab_Command_elabMacroRulesAux___closed__2 = _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__2();
@@ -14325,12 +15156,20 @@ l_Lean_Elab_Command_elabMacroRulesAux___closed__36 = _init_l_Lean_Elab_Command_e
 lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___closed__36);
 l_Lean_Elab_Command_elabMacroRulesAux___closed__37 = _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__37();
 lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___closed__37);
-l_Lean_Elab_Command_elabMacroRulesAux___closed__38 = _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__38();
-lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___closed__38);
-l_Lean_Elab_Command_elabMacroRulesAux___closed__39 = _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__39();
-lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___closed__39);
-l_Lean_Elab_Command_elabMacroRulesAux___closed__40 = _init_l_Lean_Elab_Command_elabMacroRulesAux___closed__40();
-lean_mark_persistent(l_Lean_Elab_Command_elabMacroRulesAux___closed__40);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__1 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__1);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__2 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__2();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__2);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__4);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__5 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__5();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__5);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__6 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__6();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__6);
+l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__7 = _init_l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__7();
+lean_mark_persistent(l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__7);
 l_Lean_Elab_Command_elabMacroRules___closed__1 = _init_l_Lean_Elab_Command_elabMacroRules___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_elabMacroRules___closed__1);
 l___regBuiltinCommandElab_Lean_Elab_Command_elabMacroRules___closed__1 = _init_l___regBuiltinCommandElab_Lean_Elab_Command_elabMacroRules___closed__1();
@@ -14370,10 +15209,6 @@ l_Lean_Elab_Command_expandNotation___closed__2 = _init_l_Lean_Elab_Command_expan
 lean_mark_persistent(l_Lean_Elab_Command_expandNotation___closed__2);
 l_Lean_Elab_Command_expandNotation___closed__3 = _init_l_Lean_Elab_Command_expandNotation___closed__3();
 lean_mark_persistent(l_Lean_Elab_Command_expandNotation___closed__3);
-l_Lean_Elab_Command_expandNotation___closed__4 = _init_l_Lean_Elab_Command_expandNotation___closed__4();
-lean_mark_persistent(l_Lean_Elab_Command_expandNotation___closed__4);
-l_Lean_Elab_Command_expandNotation___closed__5 = _init_l_Lean_Elab_Command_expandNotation___closed__5();
-lean_mark_persistent(l_Lean_Elab_Command_expandNotation___closed__5);
 l___regBuiltinMacro_Lean_Elab_Command_expandNotation___closed__1 = _init_l___regBuiltinMacro_Lean_Elab_Command_expandNotation___closed__1();
 lean_mark_persistent(l___regBuiltinMacro_Lean_Elab_Command_expandNotation___closed__1);
 res = l___regBuiltinMacro_Lean_Elab_Command_expandNotation(lean_io_mk_world());
diff --git a/stage0/stdlib/Init/Lean/Elab/TermApp.c b/stage0/stdlib/Init/Lean/Elab/TermApp.c
index 9296e2e742..30bfa885f3 100644
--- a/stage0/stdlib/Init/Lean/Elab/TermApp.c
+++ b/stage0/stdlib/Init/Lean/Elab/TermApp.c
@@ -6219,878 +6219,1040 @@ return x_26;
 lean_object* l___private_Init_Lean_Elab_TermApp_15__elabAppFn___main(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) {
 _start:
 {
-uint8_t x_11; uint8_t x_149; 
-x_149 = l_Lean_Syntax_isIdent(x_2);
-if (x_149 == 0)
+uint8_t x_11; uint8_t x_181; 
+x_181 = l_Lean_Syntax_isIdent(x_2);
+if (x_181 == 0)
 {
-lean_object* x_150; lean_object* x_151; uint8_t x_152; 
+lean_object* x_182; lean_object* x_183; uint8_t x_184; 
 lean_inc(x_2);
-x_150 = l_Lean_Syntax_getKind(x_2);
-x_151 = l_Lean_choiceKind;
-x_152 = lean_name_eq(x_150, x_151);
-lean_dec(x_150);
-if (x_152 == 0)
+x_182 = l_Lean_Syntax_getKind(x_2);
+x_183 = l_Lean_choiceKind;
+x_184 = lean_name_eq(x_182, x_183);
+lean_dec(x_182);
+if (x_184 == 0)
 {
-uint8_t x_153; uint8_t x_276; lean_object* x_350; uint8_t x_351; 
-x_350 = l_Lean_Parser_Term_explicit___elambda__1___closed__2;
+uint8_t x_185; uint8_t x_324; lean_object* x_414; uint8_t x_415; 
+x_414 = l_Lean_Parser_Term_explicit___elambda__1___closed__2;
 lean_inc(x_2);
-x_351 = l_Lean_Syntax_isOfKind(x_2, x_350);
-if (x_351 == 0)
+x_415 = l_Lean_Syntax_isOfKind(x_2, x_414);
+if (x_415 == 0)
 {
-uint8_t x_352; 
-x_352 = 0;
-x_276 = x_352;
-goto block_349;
+uint8_t x_416; 
+x_416 = 0;
+x_324 = x_416;
+goto block_413;
 }
 else
 {
-lean_object* x_353; lean_object* x_354; lean_object* x_355; uint8_t x_356; 
-x_353 = l_Lean_Syntax_getArgs(x_2);
-x_354 = lean_array_get_size(x_353);
-lean_dec(x_353);
-x_355 = lean_unsigned_to_nat(2u);
-x_356 = lean_nat_dec_eq(x_354, x_355);
-lean_dec(x_354);
-x_276 = x_356;
-goto block_349;
+lean_object* x_417; lean_object* x_418; lean_object* x_419; uint8_t x_420; 
+x_417 = l_Lean_Syntax_getArgs(x_2);
+x_418 = lean_array_get_size(x_417);
+lean_dec(x_417);
+x_419 = lean_unsigned_to_nat(2u);
+x_420 = lean_nat_dec_eq(x_418, x_419);
+lean_dec(x_418);
+x_324 = x_420;
+goto block_413;
 }
-block_275:
+block_323:
 {
-uint8_t x_154; 
-x_154 = l_coeDecidableEq(x_153);
-if (x_154 == 0)
+uint8_t x_186; 
+x_186 = l_coeDecidableEq(x_185);
+if (x_186 == 0)
 {
-lean_object* x_155; uint8_t x_156; 
-x_155 = l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
+lean_object* x_187; uint8_t x_188; 
+x_187 = l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
 lean_inc(x_2);
-x_156 = l_Lean_Syntax_isOfKind(x_2, x_155);
-if (x_156 == 0)
+x_188 = l_Lean_Syntax_isOfKind(x_2, x_187);
+if (x_188 == 0)
 {
-uint8_t x_157; 
-x_157 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
-if (x_157 == 0)
+uint8_t x_189; 
+x_189 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
+if (x_189 == 0)
 {
-lean_object* x_158; uint8_t x_159; 
-x_158 = l_Lean_mkTermIdFromIdent___closed__2;
+lean_object* x_190; uint8_t x_191; 
+x_190 = l_Lean_mkTermIdFromIdent___closed__2;
 lean_inc(x_2);
-x_159 = l_Lean_Syntax_isOfKind(x_2, x_158);
-if (x_159 == 0)
+x_191 = l_Lean_Syntax_isOfKind(x_2, x_190);
+if (x_191 == 0)
 {
-uint8_t x_160; 
-x_160 = 0;
-x_11 = x_160;
-goto block_148;
+uint8_t x_192; 
+x_192 = 0;
+x_11 = x_192;
+goto block_180;
 }
 else
 {
-lean_object* x_161; lean_object* x_162; lean_object* x_163; uint8_t x_164; 
-x_161 = l_Lean_Syntax_getArgs(x_2);
-x_162 = lean_array_get_size(x_161);
-lean_dec(x_161);
-x_163 = lean_unsigned_to_nat(2u);
-x_164 = lean_nat_dec_eq(x_162, x_163);
-lean_dec(x_162);
-x_11 = x_164;
-goto block_148;
+lean_object* x_193; lean_object* x_194; lean_object* x_195; uint8_t x_196; 
+x_193 = l_Lean_Syntax_getArgs(x_2);
+x_194 = lean_array_get_size(x_193);
+lean_dec(x_193);
+x_195 = lean_unsigned_to_nat(2u);
+x_196 = lean_nat_dec_eq(x_194, x_195);
+lean_dec(x_194);
+x_11 = x_196;
+goto block_180;
 }
 }
 else
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-x_165 = lean_unsigned_to_nat(0u);
-x_166 = l_Lean_Syntax_getArg(x_2, x_165);
-x_167 = lean_unsigned_to_nat(2u);
-x_168 = l_Lean_Syntax_getArg(x_2, x_167);
+lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+x_197 = lean_unsigned_to_nat(0u);
+x_198 = l_Lean_Syntax_getArg(x_2, x_197);
+x_199 = lean_unsigned_to_nat(2u);
+x_200 = l_Lean_Syntax_getArg(x_2, x_199);
 lean_dec(x_2);
-x_169 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_169, 0, x_168);
-x_170 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_170, 0, x_169);
-lean_ctor_set(x_170, 1, x_3);
-x_2 = x_166;
-x_3 = x_170;
+x_201 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_201, 0, x_200);
+x_202 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_202, 0, x_201);
+lean_ctor_set(x_202, 1, x_3);
+x_2 = x_198;
+x_3 = x_202;
 goto _start;
 }
 }
 else
 {
-lean_object* x_172; lean_object* x_173; lean_object* x_174; uint8_t x_175; uint8_t x_176; 
-x_172 = l_Lean_Syntax_getArgs(x_2);
-x_173 = lean_array_get_size(x_172);
-lean_dec(x_172);
-x_174 = lean_unsigned_to_nat(4u);
-x_175 = lean_nat_dec_eq(x_173, x_174);
-x_176 = l_coeDecidableEq(x_175);
-if (x_176 == 0)
+lean_object* x_204; lean_object* x_205; lean_object* x_206; uint8_t x_207; uint8_t x_208; 
+x_204 = l_Lean_Syntax_getArgs(x_2);
+x_205 = lean_array_get_size(x_204);
+lean_dec(x_204);
+x_206 = lean_unsigned_to_nat(4u);
+x_207 = lean_nat_dec_eq(x_205, x_206);
+x_208 = l_coeDecidableEq(x_207);
+if (x_208 == 0)
 {
-lean_object* x_177; uint8_t x_178; 
-x_177 = l_Lean_mkTermIdFromIdent___closed__2;
+lean_object* x_209; uint8_t x_210; 
+x_209 = l_Lean_mkTermIdFromIdent___closed__2;
 lean_inc(x_2);
-x_178 = l_Lean_Syntax_isOfKind(x_2, x_177);
-if (x_178 == 0)
+x_210 = l_Lean_Syntax_isOfKind(x_2, x_209);
+if (x_210 == 0)
 {
-uint8_t x_179; 
-lean_dec(x_173);
-x_179 = 0;
-x_11 = x_179;
-goto block_148;
+uint8_t x_211; 
+lean_dec(x_205);
+x_211 = 0;
+x_11 = x_211;
+goto block_180;
 }
 else
 {
-lean_object* x_180; uint8_t x_181; 
-x_180 = lean_unsigned_to_nat(2u);
-x_181 = lean_nat_dec_eq(x_173, x_180);
-lean_dec(x_173);
-x_11 = x_181;
-goto block_148;
+lean_object* x_212; uint8_t x_213; 
+x_212 = lean_unsigned_to_nat(2u);
+x_213 = lean_nat_dec_eq(x_205, x_212);
+lean_dec(x_205);
+x_11 = x_213;
+goto block_180;
 }
 }
 else
 {
-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_dec(x_173);
-x_182 = lean_unsigned_to_nat(0u);
-x_183 = l_Lean_Syntax_getArg(x_2, x_182);
-x_184 = lean_unsigned_to_nat(2u);
-x_185 = l_Lean_Syntax_getArg(x_2, x_184);
+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_dec(x_205);
+x_214 = lean_unsigned_to_nat(0u);
+x_215 = l_Lean_Syntax_getArg(x_2, x_214);
+x_216 = lean_unsigned_to_nat(2u);
+x_217 = l_Lean_Syntax_getArg(x_2, x_216);
 lean_dec(x_2);
-x_186 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_186, 0, x_185);
-x_187 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_187, 0, x_186);
-lean_ctor_set(x_187, 1, x_3);
-x_2 = x_183;
-x_3 = x_187;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_189; lean_object* x_190; lean_object* x_191; uint8_t x_192; uint8_t x_193; 
-x_189 = lean_unsigned_to_nat(2u);
-x_190 = l_Lean_Syntax_getArg(x_2, x_189);
-x_191 = l_Lean_fieldIdxKind___closed__2;
-lean_inc(x_190);
-x_192 = l_Lean_Syntax_isOfKind(x_190, x_191);
-x_193 = l_coeDecidableEq(x_192);
-if (x_193 == 0)
-{
-lean_object* x_194; uint8_t x_195; uint8_t x_196; 
-x_194 = l_Lean_identKind___closed__2;
-lean_inc(x_190);
-x_195 = l_Lean_Syntax_isOfKind(x_190, x_194);
-x_196 = l_coeDecidableEq(x_195);
-if (x_196 == 0)
-{
-lean_object* x_197; uint8_t x_198; lean_object* x_199; 
-lean_dec(x_190);
-x_197 = lean_box(0);
-x_198 = 1;
-lean_inc(x_9);
-x_199 = l_Lean_Elab_Term_elabTermAux___main(x_197, x_198, x_2, x_9, x_10);
-if (lean_obj_tag(x_199) == 0)
-{
-uint8_t x_200; 
-x_200 = !lean_is_exclusive(x_199);
-if (x_200 == 0)
-{
-lean_object* x_201; lean_object* x_202; lean_object* x_203; 
-x_201 = lean_ctor_get(x_199, 0);
-x_202 = lean_ctor_get(x_199, 1);
-lean_inc(x_202);
-x_203 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_201, x_3, x_4, x_5, x_6, x_7, x_9, x_202);
-if (lean_obj_tag(x_203) == 0)
-{
-uint8_t x_204; 
-x_204 = !lean_is_exclusive(x_203);
-if (x_204 == 0)
-{
-lean_object* x_205; 
-x_205 = lean_array_push(x_8, x_203);
-lean_ctor_set(x_199, 0, x_205);
-return x_199;
-}
-else
-{
-lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; 
-x_206 = lean_ctor_get(x_203, 0);
-x_207 = lean_ctor_get(x_203, 1);
-lean_inc(x_207);
-lean_inc(x_206);
-lean_dec(x_203);
-x_208 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_208, 0, x_206);
-lean_ctor_set(x_208, 1, x_207);
-x_209 = lean_array_push(x_8, x_208);
-lean_ctor_set(x_199, 0, x_209);
-return x_199;
-}
-}
-else
-{
-lean_object* x_210; 
-x_210 = lean_ctor_get(x_203, 0);
-lean_inc(x_210);
-if (lean_obj_tag(x_210) == 0)
-{
-lean_object* x_211; 
-x_211 = lean_ctor_get(x_210, 0);
-lean_inc(x_211);
-if (lean_obj_tag(x_211) == 0)
-{
-uint8_t x_212; 
-lean_dec(x_210);
-x_212 = !lean_is_exclusive(x_203);
-if (x_212 == 0)
-{
-lean_object* x_213; lean_object* x_214; lean_object* x_215; 
-x_213 = lean_ctor_get(x_203, 0);
-lean_dec(x_213);
-x_214 = lean_ctor_get(x_211, 0);
-lean_inc(x_214);
-lean_dec(x_211);
-lean_ctor_set(x_203, 0, x_214);
-x_215 = lean_array_push(x_8, x_203);
-lean_ctor_set(x_199, 0, x_215);
-return x_199;
-}
-else
-{
-lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; 
-x_216 = lean_ctor_get(x_203, 1);
-lean_inc(x_216);
-lean_dec(x_203);
-x_217 = lean_ctor_get(x_211, 0);
-lean_inc(x_217);
-lean_dec(x_211);
-x_218 = lean_alloc_ctor(1, 2, 0);
+x_218 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_218, 0, x_217);
-lean_ctor_set(x_218, 1, x_216);
-x_219 = lean_array_push(x_8, x_218);
-lean_ctor_set(x_199, 0, x_219);
-return x_199;
+x_219 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_219, 0, x_218);
+lean_ctor_set(x_219, 1, x_3);
+x_2 = x_215;
+x_3 = x_219;
+goto _start;
+}
 }
 }
 else
 {
-uint8_t x_220; 
-lean_free_object(x_199);
-lean_dec(x_202);
-lean_dec(x_8);
-x_220 = !lean_is_exclusive(x_203);
-if (x_220 == 0)
-{
-lean_object* x_221; 
-x_221 = lean_ctor_get(x_203, 0);
-lean_dec(x_221);
-return x_203;
-}
-else
-{
-lean_object* x_222; lean_object* x_223; 
-x_222 = lean_ctor_get(x_203, 1);
+lean_object* x_221; lean_object* x_222; lean_object* x_223; uint8_t x_224; uint8_t x_225; 
+x_221 = lean_unsigned_to_nat(2u);
+x_222 = l_Lean_Syntax_getArg(x_2, x_221);
+x_223 = l_Lean_fieldIdxKind___closed__2;
 lean_inc(x_222);
-lean_dec(x_203);
-x_223 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_223, 0, x_210);
-lean_ctor_set(x_223, 1, x_222);
-return x_223;
-}
-}
-}
-else
+x_224 = l_Lean_Syntax_isOfKind(x_222, x_223);
+x_225 = l_coeDecidableEq(x_224);
+if (x_225 == 0)
 {
-uint8_t x_224; 
-lean_free_object(x_199);
-lean_dec(x_8);
-x_224 = !lean_is_exclusive(x_203);
-if (x_224 == 0)
+lean_object* x_226; uint8_t x_227; uint8_t x_228; 
+x_226 = l_Lean_identKind___closed__2;
+lean_inc(x_222);
+x_227 = l_Lean_Syntax_isOfKind(x_222, x_226);
+x_228 = l_coeDecidableEq(x_227);
+if (x_228 == 0)
 {
-lean_object* x_225; lean_object* x_226; 
-x_225 = lean_ctor_get(x_203, 1);
-lean_dec(x_225);
-x_226 = lean_ctor_get(x_203, 0);
-lean_dec(x_226);
-lean_ctor_set(x_203, 1, x_202);
-return x_203;
-}
-else
+lean_object* x_229; uint8_t x_230; lean_object* x_231; 
+lean_dec(x_222);
+x_229 = lean_box(0);
+x_230 = 1;
+lean_inc(x_10);
+lean_inc(x_9);
+x_231 = l_Lean_Elab_Term_elabTermAux___main(x_229, x_230, x_2, x_9, x_10);
+if (lean_obj_tag(x_231) == 0)
 {
-lean_object* x_227; 
-lean_dec(x_203);
-x_227 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_227, 0, x_210);
-lean_ctor_set(x_227, 1, x_202);
-return x_227;
-}
-}
-}
-}
-else
+uint8_t x_232; 
+x_232 = !lean_is_exclusive(x_231);
+if (x_232 == 0)
 {
-lean_object* x_228; lean_object* x_229; lean_object* x_230; 
-x_228 = lean_ctor_get(x_199, 0);
-x_229 = lean_ctor_get(x_199, 1);
-lean_inc(x_229);
-lean_inc(x_228);
-lean_dec(x_199);
-lean_inc(x_229);
-x_230 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_228, x_3, x_4, x_5, x_6, x_7, x_9, x_229);
-if (lean_obj_tag(x_230) == 0)
+lean_object* x_233; lean_object* x_234; lean_object* x_235; 
+x_233 = lean_ctor_get(x_231, 0);
+x_234 = lean_ctor_get(x_231, 1);
+x_235 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_233, x_3, x_4, x_5, x_6, x_7, x_9, x_234);
+if (lean_obj_tag(x_235) == 0)
 {
-lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; 
-x_231 = lean_ctor_get(x_230, 0);
-lean_inc(x_231);
-x_232 = lean_ctor_get(x_230, 1);
-lean_inc(x_232);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_233 = x_230;
-} else {
- lean_dec_ref(x_230);
- x_233 = lean_box(0);
-}
-if (lean_is_scalar(x_233)) {
- x_234 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_234 = x_233;
-}
-lean_ctor_set(x_234, 0, x_231);
-lean_ctor_set(x_234, 1, x_232);
-x_235 = lean_array_push(x_8, x_234);
-x_236 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_236, 0, x_235);
-lean_ctor_set(x_236, 1, x_229);
-return x_236;
-}
-else
+uint8_t x_236; 
+x_236 = !lean_is_exclusive(x_235);
+if (x_236 == 0)
 {
 lean_object* x_237; 
-x_237 = lean_ctor_get(x_230, 0);
-lean_inc(x_237);
-if (lean_obj_tag(x_237) == 0)
-{
-lean_object* x_238; 
-x_238 = lean_ctor_get(x_237, 0);
-lean_inc(x_238);
-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; 
-lean_dec(x_237);
-x_239 = lean_ctor_get(x_230, 1);
-lean_inc(x_239);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_240 = x_230;
-} else {
- lean_dec_ref(x_230);
- x_240 = lean_box(0);
-}
-x_241 = lean_ctor_get(x_238, 0);
-lean_inc(x_241);
-lean_dec(x_238);
-if (lean_is_scalar(x_240)) {
- x_242 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_242 = x_240;
-}
-lean_ctor_set(x_242, 0, x_241);
-lean_ctor_set(x_242, 1, x_239);
-x_243 = lean_array_push(x_8, x_242);
-x_244 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_244, 0, x_243);
-lean_ctor_set(x_244, 1, x_229);
-return x_244;
+x_237 = lean_array_push(x_8, x_235);
+lean_ctor_set(x_231, 1, x_10);
+lean_ctor_set(x_231, 0, x_237);
+return x_231;
 }
 else
 {
+lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; 
+x_238 = lean_ctor_get(x_235, 0);
+x_239 = lean_ctor_get(x_235, 1);
+lean_inc(x_239);
+lean_inc(x_238);
+lean_dec(x_235);
+x_240 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_240, 0, x_238);
+lean_ctor_set(x_240, 1, x_239);
+x_241 = lean_array_push(x_8, x_240);
+lean_ctor_set(x_231, 1, x_10);
+lean_ctor_set(x_231, 0, x_241);
+return x_231;
+}
+}
+else
+{
+lean_object* x_242; 
+x_242 = lean_ctor_get(x_235, 0);
+lean_inc(x_242);
+if (lean_obj_tag(x_242) == 0)
+{
+lean_object* x_243; 
+x_243 = lean_ctor_get(x_242, 0);
+lean_inc(x_243);
+if (lean_obj_tag(x_243) == 0)
+{
+uint8_t x_244; 
+lean_dec(x_242);
+x_244 = !lean_is_exclusive(x_235);
+if (x_244 == 0)
+{
 lean_object* x_245; lean_object* x_246; lean_object* x_247; 
-lean_dec(x_229);
-lean_dec(x_8);
-x_245 = lean_ctor_get(x_230, 1);
-lean_inc(x_245);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_246 = x_230;
-} else {
- lean_dec_ref(x_230);
- x_246 = lean_box(0);
+x_245 = lean_ctor_get(x_235, 0);
+lean_dec(x_245);
+x_246 = lean_ctor_get(x_243, 0);
+lean_inc(x_246);
+lean_dec(x_243);
+lean_ctor_set(x_235, 0, x_246);
+x_247 = lean_array_push(x_8, x_235);
+lean_ctor_set(x_231, 1, x_10);
+lean_ctor_set(x_231, 0, x_247);
+return x_231;
 }
-if (lean_is_scalar(x_246)) {
- x_247 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_247 = x_246;
-}
-lean_ctor_set(x_247, 0, x_237);
-lean_ctor_set(x_247, 1, x_245);
-return x_247;
+else
+{
+lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; 
+x_248 = lean_ctor_get(x_235, 1);
+lean_inc(x_248);
+lean_dec(x_235);
+x_249 = lean_ctor_get(x_243, 0);
+lean_inc(x_249);
+lean_dec(x_243);
+x_250 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_250, 0, x_249);
+lean_ctor_set(x_250, 1, x_248);
+x_251 = lean_array_push(x_8, x_250);
+lean_ctor_set(x_231, 1, x_10);
+lean_ctor_set(x_231, 0, x_251);
+return x_231;
 }
 }
 else
 {
-lean_object* x_248; lean_object* x_249; 
+uint8_t x_252; 
+lean_free_object(x_231);
+lean_dec(x_10);
 lean_dec(x_8);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_248 = x_230;
-} else {
- lean_dec_ref(x_230);
- x_248 = lean_box(0);
+x_252 = !lean_is_exclusive(x_235);
+if (x_252 == 0)
+{
+lean_object* x_253; 
+x_253 = lean_ctor_get(x_235, 0);
+lean_dec(x_253);
+return x_235;
 }
-if (lean_is_scalar(x_248)) {
- x_249 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_249 = x_248;
+else
+{
+lean_object* x_254; lean_object* x_255; 
+x_254 = lean_ctor_get(x_235, 1);
+lean_inc(x_254);
+lean_dec(x_235);
+x_255 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_255, 0, x_242);
+lean_ctor_set(x_255, 1, x_254);
+return x_255;
 }
-lean_ctor_set(x_249, 0, x_237);
-lean_ctor_set(x_249, 1, x_229);
-return x_249;
+}
+}
+else
+{
+uint8_t x_256; 
+lean_free_object(x_231);
+lean_dec(x_8);
+x_256 = !lean_is_exclusive(x_235);
+if (x_256 == 0)
+{
+lean_object* x_257; lean_object* x_258; 
+x_257 = lean_ctor_get(x_235, 1);
+lean_dec(x_257);
+x_258 = lean_ctor_get(x_235, 0);
+lean_dec(x_258);
+lean_ctor_set(x_235, 1, x_10);
+return x_235;
+}
+else
+{
+lean_object* x_259; 
+lean_dec(x_235);
+x_259 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_259, 0, x_242);
+lean_ctor_set(x_259, 1, x_10);
+return x_259;
 }
 }
 }
 }
 else
 {
-uint8_t x_250; 
+lean_object* x_260; lean_object* x_261; lean_object* x_262; 
+x_260 = lean_ctor_get(x_231, 0);
+x_261 = lean_ctor_get(x_231, 1);
+lean_inc(x_261);
+lean_inc(x_260);
+lean_dec(x_231);
+x_262 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_260, x_3, x_4, x_5, x_6, x_7, x_9, x_261);
+if (lean_obj_tag(x_262) == 0)
+{
+lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; 
+x_263 = lean_ctor_get(x_262, 0);
+lean_inc(x_263);
+x_264 = lean_ctor_get(x_262, 1);
+lean_inc(x_264);
+if (lean_is_exclusive(x_262)) {
+ lean_ctor_release(x_262, 0);
+ lean_ctor_release(x_262, 1);
+ x_265 = x_262;
+} else {
+ lean_dec_ref(x_262);
+ x_265 = lean_box(0);
+}
+if (lean_is_scalar(x_265)) {
+ x_266 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_266 = x_265;
+}
+lean_ctor_set(x_266, 0, x_263);
+lean_ctor_set(x_266, 1, x_264);
+x_267 = lean_array_push(x_8, x_266);
+x_268 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_268, 0, x_267);
+lean_ctor_set(x_268, 1, x_10);
+return x_268;
+}
+else
+{
+lean_object* x_269; 
+x_269 = lean_ctor_get(x_262, 0);
+lean_inc(x_269);
+if (lean_obj_tag(x_269) == 0)
+{
+lean_object* x_270; 
+x_270 = lean_ctor_get(x_269, 0);
+lean_inc(x_270);
+if (lean_obj_tag(x_270) == 0)
+{
+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_dec(x_269);
+x_271 = lean_ctor_get(x_262, 1);
+lean_inc(x_271);
+if (lean_is_exclusive(x_262)) {
+ lean_ctor_release(x_262, 0);
+ lean_ctor_release(x_262, 1);
+ x_272 = x_262;
+} else {
+ lean_dec_ref(x_262);
+ x_272 = lean_box(0);
+}
+x_273 = lean_ctor_get(x_270, 0);
+lean_inc(x_273);
+lean_dec(x_270);
+if (lean_is_scalar(x_272)) {
+ x_274 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_274 = x_272;
+}
+lean_ctor_set(x_274, 0, x_273);
+lean_ctor_set(x_274, 1, x_271);
+x_275 = lean_array_push(x_8, x_274);
+x_276 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_276, 0, x_275);
+lean_ctor_set(x_276, 1, x_10);
+return x_276;
+}
+else
+{
+lean_object* x_277; lean_object* x_278; lean_object* x_279; 
+lean_dec(x_10);
+lean_dec(x_8);
+x_277 = lean_ctor_get(x_262, 1);
+lean_inc(x_277);
+if (lean_is_exclusive(x_262)) {
+ lean_ctor_release(x_262, 0);
+ lean_ctor_release(x_262, 1);
+ x_278 = x_262;
+} else {
+ lean_dec_ref(x_262);
+ x_278 = lean_box(0);
+}
+if (lean_is_scalar(x_278)) {
+ x_279 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_279 = x_278;
+}
+lean_ctor_set(x_279, 0, x_269);
+lean_ctor_set(x_279, 1, x_277);
+return x_279;
+}
+}
+else
+{
+lean_object* x_280; lean_object* x_281; 
+lean_dec(x_8);
+if (lean_is_exclusive(x_262)) {
+ lean_ctor_release(x_262, 0);
+ lean_ctor_release(x_262, 1);
+ x_280 = x_262;
+} else {
+ lean_dec_ref(x_262);
+ x_280 = lean_box(0);
+}
+if (lean_is_scalar(x_280)) {
+ x_281 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_281 = x_280;
+}
+lean_ctor_set(x_281, 0, x_269);
+lean_ctor_set(x_281, 1, x_10);
+return x_281;
+}
+}
+}
+}
+else
+{
+lean_object* x_282; 
 lean_dec(x_9);
-lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_250 = !lean_is_exclusive(x_199);
-if (x_250 == 0)
+x_282 = lean_ctor_get(x_231, 0);
+lean_inc(x_282);
+if (lean_obj_tag(x_282) == 0)
 {
-return x_199;
-}
-else
+lean_object* x_283; 
+x_283 = lean_ctor_get(x_282, 0);
+lean_inc(x_283);
+if (lean_obj_tag(x_283) == 0)
 {
-lean_object* x_251; lean_object* x_252; lean_object* x_253; 
-x_251 = lean_ctor_get(x_199, 0);
-x_252 = lean_ctor_get(x_199, 1);
-lean_inc(x_252);
-lean_inc(x_251);
-lean_dec(x_199);
-x_253 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_253, 0, x_251);
-lean_ctor_set(x_253, 1, x_252);
-return x_253;
-}
-}
-}
-else
-{
-lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; 
-x_254 = l_Lean_Syntax_getId(x_190);
-lean_dec(x_190);
-x_255 = l_Lean_Name_components(x_254);
-x_256 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_15__elabAppFn___main___spec__1(x_255);
-x_257 = lean_unsigned_to_nat(0u);
-x_258 = l_Lean_Syntax_getArg(x_2, x_257);
-lean_dec(x_2);
-x_259 = l_List_append___rarg(x_256, x_3);
-x_2 = x_258;
-x_3 = x_259;
-goto _start;
-}
-}
-else
-{
-lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; 
-x_261 = l_Lean_fieldIdxKind;
-x_262 = l_Lean_Syntax_isNatLitAux(x_261, x_190);
-lean_dec(x_190);
-x_263 = lean_unsigned_to_nat(0u);
-x_264 = l_Lean_Syntax_getArg(x_2, x_263);
-lean_dec(x_2);
-if (lean_obj_tag(x_262) == 0)
-{
-lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
-x_265 = l_Nat_Inhabited;
-x_266 = l_Option_get_x21___rarg___closed__3;
-x_267 = lean_panic_fn(x_265, x_266);
-x_268 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_268, 0, x_267);
-x_269 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_269, 0, x_268);
-lean_ctor_set(x_269, 1, x_3);
-x_2 = x_264;
-x_3 = x_269;
-goto _start;
-}
-else
-{
-lean_object* x_271; lean_object* x_272; lean_object* x_273; 
-x_271 = lean_ctor_get(x_262, 0);
-lean_inc(x_271);
-lean_dec(x_262);
-x_272 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_272, 0, x_271);
-x_273 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_273, 0, x_272);
-lean_ctor_set(x_273, 1, x_3);
-x_2 = x_264;
-x_3 = x_273;
-goto _start;
-}
-}
-}
-}
-block_349:
-{
-uint8_t x_277; 
-x_277 = l_coeDecidableEq(x_276);
-if (x_277 == 0)
-{
-lean_object* x_278; uint8_t x_279; 
-x_278 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
-lean_inc(x_2);
-x_279 = l_Lean_Syntax_isOfKind(x_2, x_278);
-if (x_279 == 0)
-{
-uint8_t x_280; 
-x_280 = 0;
-x_153 = x_280;
-goto block_275;
-}
-else
-{
-lean_object* x_281; lean_object* x_282; lean_object* x_283; uint8_t x_284; 
-x_281 = l_Lean_Syntax_getArgs(x_2);
-x_282 = lean_array_get_size(x_281);
-lean_dec(x_281);
-x_283 = lean_unsigned_to_nat(3u);
-x_284 = lean_nat_dec_eq(x_282, x_283);
+uint8_t x_284; 
 lean_dec(x_282);
-x_153 = x_284;
-goto block_275;
-}
-}
-else
+x_284 = !lean_is_exclusive(x_231);
+if (x_284 == 0)
 {
-lean_object* x_285; lean_object* x_286; lean_object* x_287; uint8_t x_288; uint8_t x_289; 
-x_285 = lean_unsigned_to_nat(1u);
-x_286 = l_Lean_Syntax_getArg(x_2, x_285);
-x_287 = l_Lean_mkTermIdFromIdent___closed__2;
+lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; 
+x_285 = lean_ctor_get(x_231, 0);
+lean_dec(x_285);
+x_286 = lean_ctor_get(x_283, 0);
 lean_inc(x_286);
-x_288 = l_Lean_Syntax_isOfKind(x_286, x_287);
-x_289 = l_coeDecidableEq(x_288);
-if (x_289 == 0)
-{
-lean_object* x_290; uint8_t x_291; lean_object* x_292; 
-lean_dec(x_286);
-x_290 = lean_box(0);
-x_291 = 1;
-lean_inc(x_9);
-x_292 = l_Lean_Elab_Term_elabTermAux___main(x_290, x_291, x_2, x_9, x_10);
-if (lean_obj_tag(x_292) == 0)
-{
-uint8_t x_293; 
-x_293 = !lean_is_exclusive(x_292);
-if (x_293 == 0)
-{
-lean_object* x_294; lean_object* x_295; lean_object* x_296; 
-x_294 = lean_ctor_get(x_292, 0);
-x_295 = lean_ctor_get(x_292, 1);
-lean_inc(x_295);
-x_296 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_294, x_3, x_4, x_5, x_6, x_7, x_9, x_295);
-if (lean_obj_tag(x_296) == 0)
-{
-uint8_t x_297; 
-x_297 = !lean_is_exclusive(x_296);
-if (x_297 == 0)
-{
-lean_object* x_298; 
-x_298 = lean_array_push(x_8, x_296);
-lean_ctor_set(x_292, 0, x_298);
-return x_292;
+lean_dec(x_283);
+lean_ctor_set(x_231, 0, x_286);
+x_287 = lean_array_push(x_8, x_231);
+x_288 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_288, 0, x_287);
+lean_ctor_set(x_288, 1, x_10);
+return x_288;
 }
 else
 {
-lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; 
-x_299 = lean_ctor_get(x_296, 0);
-x_300 = lean_ctor_get(x_296, 1);
-lean_inc(x_300);
-lean_inc(x_299);
-lean_dec(x_296);
-x_301 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_301, 0, x_299);
-lean_ctor_set(x_301, 1, x_300);
-x_302 = lean_array_push(x_8, x_301);
-lean_ctor_set(x_292, 0, x_302);
-return x_292;
+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_231, 1);
+lean_inc(x_289);
+lean_dec(x_231);
+x_290 = lean_ctor_get(x_283, 0);
+lean_inc(x_290);
+lean_dec(x_283);
+x_291 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_291, 0, x_290);
+lean_ctor_set(x_291, 1, x_289);
+x_292 = lean_array_push(x_8, x_291);
+x_293 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_293, 0, x_292);
+lean_ctor_set(x_293, 1, x_10);
+return x_293;
 }
 }
 else
 {
-lean_object* x_303; 
-x_303 = lean_ctor_get(x_296, 0);
-lean_inc(x_303);
-if (lean_obj_tag(x_303) == 0)
+uint8_t x_294; 
+lean_dec(x_10);
+lean_dec(x_8);
+x_294 = !lean_is_exclusive(x_231);
+if (x_294 == 0)
 {
-lean_object* x_304; 
-x_304 = lean_ctor_get(x_303, 0);
-lean_inc(x_304);
-if (lean_obj_tag(x_304) == 0)
+lean_object* x_295; 
+x_295 = lean_ctor_get(x_231, 0);
+lean_dec(x_295);
+return x_231;
+}
+else
 {
-uint8_t x_305; 
-lean_dec(x_303);
-x_305 = !lean_is_exclusive(x_296);
-if (x_305 == 0)
+lean_object* x_296; lean_object* x_297; 
+x_296 = lean_ctor_get(x_231, 1);
+lean_inc(x_296);
+lean_dec(x_231);
+x_297 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_297, 0, x_282);
+lean_ctor_set(x_297, 1, x_296);
+return x_297;
+}
+}
+}
+else
 {
-lean_object* x_306; lean_object* x_307; lean_object* x_308; 
-x_306 = lean_ctor_get(x_296, 0);
-lean_dec(x_306);
-x_307 = lean_ctor_get(x_304, 0);
-lean_inc(x_307);
-lean_dec(x_304);
-lean_ctor_set(x_296, 0, x_307);
-x_308 = lean_array_push(x_8, x_296);
-lean_ctor_set(x_292, 0, x_308);
-return x_292;
+uint8_t x_298; 
+lean_dec(x_8);
+x_298 = !lean_is_exclusive(x_231);
+if (x_298 == 0)
+{
+lean_object* x_299; lean_object* x_300; 
+x_299 = lean_ctor_get(x_231, 1);
+lean_dec(x_299);
+x_300 = lean_ctor_get(x_231, 0);
+lean_dec(x_300);
+lean_ctor_set(x_231, 1, x_10);
+return x_231;
+}
+else
+{
+lean_object* x_301; 
+lean_dec(x_231);
+x_301 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_301, 0, x_282);
+lean_ctor_set(x_301, 1, x_10);
+return x_301;
+}
+}
+}
+}
+else
+{
+lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; 
+x_302 = l_Lean_Syntax_getId(x_222);
+lean_dec(x_222);
+x_303 = l_Lean_Name_components(x_302);
+x_304 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_15__elabAppFn___main___spec__1(x_303);
+x_305 = lean_unsigned_to_nat(0u);
+x_306 = l_Lean_Syntax_getArg(x_2, x_305);
+lean_dec(x_2);
+x_307 = l_List_append___rarg(x_304, x_3);
+x_2 = x_306;
+x_3 = x_307;
+goto _start;
+}
 }
 else
 {
 lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; 
-x_309 = lean_ctor_get(x_296, 1);
-lean_inc(x_309);
-lean_dec(x_296);
-x_310 = lean_ctor_get(x_304, 0);
-lean_inc(x_310);
-lean_dec(x_304);
-x_311 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_311, 0, x_310);
-lean_ctor_set(x_311, 1, x_309);
-x_312 = lean_array_push(x_8, x_311);
-lean_ctor_set(x_292, 0, x_312);
-return x_292;
-}
+x_309 = l_Lean_fieldIdxKind;
+x_310 = l_Lean_Syntax_isNatLitAux(x_309, x_222);
+lean_dec(x_222);
+x_311 = lean_unsigned_to_nat(0u);
+x_312 = l_Lean_Syntax_getArg(x_2, x_311);
+lean_dec(x_2);
+if (lean_obj_tag(x_310) == 0)
+{
+lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; 
+x_313 = l_Nat_Inhabited;
+x_314 = l_Option_get_x21___rarg___closed__3;
+x_315 = lean_panic_fn(x_313, x_314);
+x_316 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_316, 0, x_315);
+x_317 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_317, 0, x_316);
+lean_ctor_set(x_317, 1, x_3);
+x_2 = x_312;
+x_3 = x_317;
+goto _start;
 }
 else
 {
-uint8_t x_313; 
-lean_free_object(x_292);
-lean_dec(x_295);
-lean_dec(x_8);
-x_313 = !lean_is_exclusive(x_296);
-if (x_313 == 0)
+lean_object* x_319; lean_object* x_320; lean_object* x_321; 
+x_319 = lean_ctor_get(x_310, 0);
+lean_inc(x_319);
+lean_dec(x_310);
+x_320 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_320, 0, x_319);
+x_321 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_321, 0, x_320);
+lean_ctor_set(x_321, 1, x_3);
+x_2 = x_312;
+x_3 = x_321;
+goto _start;
+}
+}
+}
+}
+block_413:
 {
-lean_object* x_314; 
-x_314 = lean_ctor_get(x_296, 0);
-lean_dec(x_314);
-return x_296;
+uint8_t x_325; 
+x_325 = l_coeDecidableEq(x_324);
+if (x_325 == 0)
+{
+lean_object* x_326; uint8_t x_327; 
+x_326 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
+lean_inc(x_2);
+x_327 = l_Lean_Syntax_isOfKind(x_2, x_326);
+if (x_327 == 0)
+{
+uint8_t x_328; 
+x_328 = 0;
+x_185 = x_328;
+goto block_323;
 }
 else
 {
-lean_object* x_315; lean_object* x_316; 
-x_315 = lean_ctor_get(x_296, 1);
-lean_inc(x_315);
-lean_dec(x_296);
-x_316 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_316, 0, x_303);
-lean_ctor_set(x_316, 1, x_315);
-return x_316;
-}
-}
-}
-else
-{
-uint8_t x_317; 
-lean_free_object(x_292);
-lean_dec(x_8);
-x_317 = !lean_is_exclusive(x_296);
-if (x_317 == 0)
-{
-lean_object* x_318; lean_object* x_319; 
-x_318 = lean_ctor_get(x_296, 1);
-lean_dec(x_318);
-x_319 = lean_ctor_get(x_296, 0);
-lean_dec(x_319);
-lean_ctor_set(x_296, 1, x_295);
-return x_296;
-}
-else
-{
-lean_object* x_320; 
-lean_dec(x_296);
-x_320 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_320, 0, x_303);
-lean_ctor_set(x_320, 1, x_295);
-return x_320;
-}
-}
-}
-}
-else
-{
-lean_object* x_321; lean_object* x_322; lean_object* x_323; 
-x_321 = lean_ctor_get(x_292, 0);
-x_322 = lean_ctor_get(x_292, 1);
-lean_inc(x_322);
-lean_inc(x_321);
-lean_dec(x_292);
-lean_inc(x_322);
-x_323 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_321, x_3, x_4, x_5, x_6, x_7, x_9, x_322);
-if (lean_obj_tag(x_323) == 0)
-{
-lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; 
-x_324 = lean_ctor_get(x_323, 0);
-lean_inc(x_324);
-x_325 = lean_ctor_get(x_323, 1);
-lean_inc(x_325);
-if (lean_is_exclusive(x_323)) {
- lean_ctor_release(x_323, 0);
- lean_ctor_release(x_323, 1);
- x_326 = x_323;
-} else {
- lean_dec_ref(x_323);
- x_326 = lean_box(0);
-}
-if (lean_is_scalar(x_326)) {
- x_327 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_327 = x_326;
-}
-lean_ctor_set(x_327, 0, x_324);
-lean_ctor_set(x_327, 1, x_325);
-x_328 = lean_array_push(x_8, x_327);
-x_329 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_329, 0, x_328);
-lean_ctor_set(x_329, 1, x_322);
-return x_329;
-}
-else
-{
-lean_object* x_330; 
-x_330 = lean_ctor_get(x_323, 0);
-lean_inc(x_330);
-if (lean_obj_tag(x_330) == 0)
-{
-lean_object* x_331; 
-x_331 = lean_ctor_get(x_330, 0);
-lean_inc(x_331);
-if (lean_obj_tag(x_331) == 0)
-{
-lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; 
+lean_object* x_329; lean_object* x_330; lean_object* x_331; uint8_t x_332; 
+x_329 = l_Lean_Syntax_getArgs(x_2);
+x_330 = lean_array_get_size(x_329);
+lean_dec(x_329);
+x_331 = lean_unsigned_to_nat(3u);
+x_332 = lean_nat_dec_eq(x_330, x_331);
 lean_dec(x_330);
-x_332 = lean_ctor_get(x_323, 1);
-lean_inc(x_332);
-if (lean_is_exclusive(x_323)) {
- lean_ctor_release(x_323, 0);
- lean_ctor_release(x_323, 1);
- x_333 = x_323;
-} else {
- lean_dec_ref(x_323);
- x_333 = lean_box(0);
+x_185 = x_332;
+goto block_323;
 }
-x_334 = lean_ctor_get(x_331, 0);
-lean_inc(x_334);
-lean_dec(x_331);
-if (lean_is_scalar(x_333)) {
- x_335 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_335 = x_333;
-}
-lean_ctor_set(x_335, 0, x_334);
-lean_ctor_set(x_335, 1, x_332);
-x_336 = lean_array_push(x_8, x_335);
-x_337 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_337, 0, x_336);
-lean_ctor_set(x_337, 1, x_322);
-return x_337;
 }
 else
 {
-lean_object* x_338; lean_object* x_339; lean_object* x_340; 
-lean_dec(x_322);
-lean_dec(x_8);
-x_338 = lean_ctor_get(x_323, 1);
-lean_inc(x_338);
-if (lean_is_exclusive(x_323)) {
- lean_ctor_release(x_323, 0);
- lean_ctor_release(x_323, 1);
- x_339 = x_323;
-} else {
- lean_dec_ref(x_323);
- x_339 = lean_box(0);
+lean_object* x_333; lean_object* x_334; lean_object* x_335; uint8_t x_336; uint8_t x_337; 
+x_333 = lean_unsigned_to_nat(1u);
+x_334 = l_Lean_Syntax_getArg(x_2, x_333);
+x_335 = l_Lean_mkTermIdFromIdent___closed__2;
+lean_inc(x_334);
+x_336 = l_Lean_Syntax_isOfKind(x_334, x_335);
+x_337 = l_coeDecidableEq(x_336);
+if (x_337 == 0)
+{
+lean_object* x_338; uint8_t x_339; lean_object* x_340; 
+lean_dec(x_334);
+x_338 = lean_box(0);
+x_339 = 1;
+lean_inc(x_10);
+lean_inc(x_9);
+x_340 = l_Lean_Elab_Term_elabTermAux___main(x_338, x_339, x_2, x_9, x_10);
+if (lean_obj_tag(x_340) == 0)
+{
+uint8_t x_341; 
+x_341 = !lean_is_exclusive(x_340);
+if (x_341 == 0)
+{
+lean_object* x_342; lean_object* x_343; lean_object* x_344; 
+x_342 = lean_ctor_get(x_340, 0);
+x_343 = lean_ctor_get(x_340, 1);
+x_344 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_342, x_3, x_4, x_5, x_6, x_7, x_9, x_343);
+if (lean_obj_tag(x_344) == 0)
+{
+uint8_t x_345; 
+x_345 = !lean_is_exclusive(x_344);
+if (x_345 == 0)
+{
+lean_object* x_346; 
+x_346 = lean_array_push(x_8, x_344);
+lean_ctor_set(x_340, 1, x_10);
+lean_ctor_set(x_340, 0, x_346);
+return x_340;
 }
-if (lean_is_scalar(x_339)) {
- x_340 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_340 = x_339;
-}
-lean_ctor_set(x_340, 0, x_330);
-lean_ctor_set(x_340, 1, x_338);
+else
+{
+lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; 
+x_347 = lean_ctor_get(x_344, 0);
+x_348 = lean_ctor_get(x_344, 1);
+lean_inc(x_348);
+lean_inc(x_347);
+lean_dec(x_344);
+x_349 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_349, 0, x_347);
+lean_ctor_set(x_349, 1, x_348);
+x_350 = lean_array_push(x_8, x_349);
+lean_ctor_set(x_340, 1, x_10);
+lean_ctor_set(x_340, 0, x_350);
 return x_340;
 }
 }
 else
 {
-lean_object* x_341; lean_object* x_342; 
+lean_object* x_351; 
+x_351 = lean_ctor_get(x_344, 0);
+lean_inc(x_351);
+if (lean_obj_tag(x_351) == 0)
+{
+lean_object* x_352; 
+x_352 = lean_ctor_get(x_351, 0);
+lean_inc(x_352);
+if (lean_obj_tag(x_352) == 0)
+{
+uint8_t x_353; 
+lean_dec(x_351);
+x_353 = !lean_is_exclusive(x_344);
+if (x_353 == 0)
+{
+lean_object* x_354; lean_object* x_355; lean_object* x_356; 
+x_354 = lean_ctor_get(x_344, 0);
+lean_dec(x_354);
+x_355 = lean_ctor_get(x_352, 0);
+lean_inc(x_355);
+lean_dec(x_352);
+lean_ctor_set(x_344, 0, x_355);
+x_356 = lean_array_push(x_8, x_344);
+lean_ctor_set(x_340, 1, x_10);
+lean_ctor_set(x_340, 0, x_356);
+return x_340;
+}
+else
+{
+lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; 
+x_357 = lean_ctor_get(x_344, 1);
+lean_inc(x_357);
+lean_dec(x_344);
+x_358 = lean_ctor_get(x_352, 0);
+lean_inc(x_358);
+lean_dec(x_352);
+x_359 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_359, 0, x_358);
+lean_ctor_set(x_359, 1, x_357);
+x_360 = lean_array_push(x_8, x_359);
+lean_ctor_set(x_340, 1, x_10);
+lean_ctor_set(x_340, 0, x_360);
+return x_340;
+}
+}
+else
+{
+uint8_t x_361; 
+lean_free_object(x_340);
+lean_dec(x_10);
 lean_dec(x_8);
-if (lean_is_exclusive(x_323)) {
- lean_ctor_release(x_323, 0);
- lean_ctor_release(x_323, 1);
- x_341 = x_323;
-} else {
- lean_dec_ref(x_323);
- x_341 = lean_box(0);
+x_361 = !lean_is_exclusive(x_344);
+if (x_361 == 0)
+{
+lean_object* x_362; 
+x_362 = lean_ctor_get(x_344, 0);
+lean_dec(x_362);
+return x_344;
 }
-if (lean_is_scalar(x_341)) {
- x_342 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_342 = x_341;
+else
+{
+lean_object* x_363; lean_object* x_364; 
+x_363 = lean_ctor_get(x_344, 1);
+lean_inc(x_363);
+lean_dec(x_344);
+x_364 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_364, 0, x_351);
+lean_ctor_set(x_364, 1, x_363);
+return x_364;
 }
-lean_ctor_set(x_342, 0, x_330);
-lean_ctor_set(x_342, 1, x_322);
-return x_342;
+}
+}
+else
+{
+uint8_t x_365; 
+lean_free_object(x_340);
+lean_dec(x_8);
+x_365 = !lean_is_exclusive(x_344);
+if (x_365 == 0)
+{
+lean_object* x_366; lean_object* x_367; 
+x_366 = lean_ctor_get(x_344, 1);
+lean_dec(x_366);
+x_367 = lean_ctor_get(x_344, 0);
+lean_dec(x_367);
+lean_ctor_set(x_344, 1, x_10);
+return x_344;
+}
+else
+{
+lean_object* x_368; 
+lean_dec(x_344);
+x_368 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_368, 0, x_351);
+lean_ctor_set(x_368, 1, x_10);
+return x_368;
 }
 }
 }
 }
 else
 {
-uint8_t x_343; 
-lean_dec(x_9);
+lean_object* x_369; lean_object* x_370; lean_object* x_371; 
+x_369 = lean_ctor_get(x_340, 0);
+x_370 = lean_ctor_get(x_340, 1);
+lean_inc(x_370);
+lean_inc(x_369);
+lean_dec(x_340);
+x_371 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_369, x_3, x_4, x_5, x_6, x_7, x_9, x_370);
+if (lean_obj_tag(x_371) == 0)
+{
+lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; lean_object* x_377; 
+x_372 = lean_ctor_get(x_371, 0);
+lean_inc(x_372);
+x_373 = lean_ctor_get(x_371, 1);
+lean_inc(x_373);
+if (lean_is_exclusive(x_371)) {
+ lean_ctor_release(x_371, 0);
+ lean_ctor_release(x_371, 1);
+ x_374 = x_371;
+} else {
+ lean_dec_ref(x_371);
+ x_374 = lean_box(0);
+}
+if (lean_is_scalar(x_374)) {
+ x_375 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_375 = x_374;
+}
+lean_ctor_set(x_375, 0, x_372);
+lean_ctor_set(x_375, 1, x_373);
+x_376 = lean_array_push(x_8, x_375);
+x_377 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_377, 0, x_376);
+lean_ctor_set(x_377, 1, x_10);
+return x_377;
+}
+else
+{
+lean_object* x_378; 
+x_378 = lean_ctor_get(x_371, 0);
+lean_inc(x_378);
+if (lean_obj_tag(x_378) == 0)
+{
+lean_object* x_379; 
+x_379 = lean_ctor_get(x_378, 0);
+lean_inc(x_379);
+if (lean_obj_tag(x_379) == 0)
+{
+lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; 
+lean_dec(x_378);
+x_380 = lean_ctor_get(x_371, 1);
+lean_inc(x_380);
+if (lean_is_exclusive(x_371)) {
+ lean_ctor_release(x_371, 0);
+ lean_ctor_release(x_371, 1);
+ x_381 = x_371;
+} else {
+ lean_dec_ref(x_371);
+ x_381 = lean_box(0);
+}
+x_382 = lean_ctor_get(x_379, 0);
+lean_inc(x_382);
+lean_dec(x_379);
+if (lean_is_scalar(x_381)) {
+ x_383 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_383 = x_381;
+}
+lean_ctor_set(x_383, 0, x_382);
+lean_ctor_set(x_383, 1, x_380);
+x_384 = lean_array_push(x_8, x_383);
+x_385 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_385, 0, x_384);
+lean_ctor_set(x_385, 1, x_10);
+return x_385;
+}
+else
+{
+lean_object* x_386; lean_object* x_387; lean_object* x_388; 
+lean_dec(x_10);
 lean_dec(x_8);
+x_386 = lean_ctor_get(x_371, 1);
+lean_inc(x_386);
+if (lean_is_exclusive(x_371)) {
+ lean_ctor_release(x_371, 0);
+ lean_ctor_release(x_371, 1);
+ x_387 = x_371;
+} else {
+ lean_dec_ref(x_371);
+ x_387 = lean_box(0);
+}
+if (lean_is_scalar(x_387)) {
+ x_388 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_388 = x_387;
+}
+lean_ctor_set(x_388, 0, x_378);
+lean_ctor_set(x_388, 1, x_386);
+return x_388;
+}
+}
+else
+{
+lean_object* x_389; lean_object* x_390; 
+lean_dec(x_8);
+if (lean_is_exclusive(x_371)) {
+ lean_ctor_release(x_371, 0);
+ lean_ctor_release(x_371, 1);
+ x_389 = x_371;
+} else {
+ lean_dec_ref(x_371);
+ x_389 = lean_box(0);
+}
+if (lean_is_scalar(x_389)) {
+ x_390 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_390 = x_389;
+}
+lean_ctor_set(x_390, 0, x_378);
+lean_ctor_set(x_390, 1, x_10);
+return x_390;
+}
+}
+}
+}
+else
+{
+lean_object* x_391; 
+lean_dec(x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_343 = !lean_is_exclusive(x_292);
-if (x_343 == 0)
+x_391 = lean_ctor_get(x_340, 0);
+lean_inc(x_391);
+if (lean_obj_tag(x_391) == 0)
 {
-return x_292;
+lean_object* x_392; 
+x_392 = lean_ctor_get(x_391, 0);
+lean_inc(x_392);
+if (lean_obj_tag(x_392) == 0)
+{
+uint8_t x_393; 
+lean_dec(x_391);
+x_393 = !lean_is_exclusive(x_340);
+if (x_393 == 0)
+{
+lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; 
+x_394 = lean_ctor_get(x_340, 0);
+lean_dec(x_394);
+x_395 = lean_ctor_get(x_392, 0);
+lean_inc(x_395);
+lean_dec(x_392);
+lean_ctor_set(x_340, 0, x_395);
+x_396 = lean_array_push(x_8, x_340);
+x_397 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_397, 0, x_396);
+lean_ctor_set(x_397, 1, x_10);
+return x_397;
 }
 else
 {
-lean_object* x_344; lean_object* x_345; lean_object* x_346; 
-x_344 = lean_ctor_get(x_292, 0);
-x_345 = lean_ctor_get(x_292, 1);
-lean_inc(x_345);
-lean_inc(x_344);
-lean_dec(x_292);
-x_346 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_346, 0, x_344);
-lean_ctor_set(x_346, 1, x_345);
-return x_346;
+lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; 
+x_398 = lean_ctor_get(x_340, 1);
+lean_inc(x_398);
+lean_dec(x_340);
+x_399 = lean_ctor_get(x_392, 0);
+lean_inc(x_399);
+lean_dec(x_392);
+x_400 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_400, 0, x_399);
+lean_ctor_set(x_400, 1, x_398);
+x_401 = lean_array_push(x_8, x_400);
+x_402 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_402, 0, x_401);
+lean_ctor_set(x_402, 1, x_10);
+return x_402;
+}
+}
+else
+{
+uint8_t x_403; 
+lean_dec(x_10);
+lean_dec(x_8);
+x_403 = !lean_is_exclusive(x_340);
+if (x_403 == 0)
+{
+lean_object* x_404; 
+x_404 = lean_ctor_get(x_340, 0);
+lean_dec(x_404);
+return x_340;
+}
+else
+{
+lean_object* x_405; lean_object* x_406; 
+x_405 = lean_ctor_get(x_340, 1);
+lean_inc(x_405);
+lean_dec(x_340);
+x_406 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_406, 0, x_391);
+lean_ctor_set(x_406, 1, x_405);
+return x_406;
 }
 }
 }
 else
 {
-uint8_t x_347; 
+uint8_t x_407; 
+lean_dec(x_8);
+x_407 = !lean_is_exclusive(x_340);
+if (x_407 == 0)
+{
+lean_object* x_408; lean_object* x_409; 
+x_408 = lean_ctor_get(x_340, 1);
+lean_dec(x_408);
+x_409 = lean_ctor_get(x_340, 0);
+lean_dec(x_409);
+lean_ctor_set(x_340, 1, x_10);
+return x_340;
+}
+else
+{
+lean_object* x_410; 
+lean_dec(x_340);
+x_410 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_410, 0, x_391);
+lean_ctor_set(x_410, 1, x_10);
+return x_410;
+}
+}
+}
+}
+else
+{
+uint8_t x_411; 
 lean_dec(x_2);
-x_347 = 1;
-x_2 = x_286;
-x_7 = x_347;
+x_411 = 1;
+x_2 = x_334;
+x_7 = x_411;
 goto _start;
 }
 }
@@ -7098,23 +7260,23 @@ goto _start;
 }
 else
 {
-lean_object* x_357; lean_object* x_358; lean_object* x_359; 
-x_357 = l_Lean_Syntax_getArgs(x_2);
-x_358 = lean_unsigned_to_nat(0u);
-x_359 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_15__elabAppFn___main___spec__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_357, x_358, x_8, x_9, x_10);
-lean_dec(x_357);
+lean_object* x_421; lean_object* x_422; lean_object* x_423; 
+x_421 = l_Lean_Syntax_getArgs(x_2);
+x_422 = lean_unsigned_to_nat(0u);
+x_423 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_15__elabAppFn___main___spec__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_421, x_422, x_8, x_9, x_10);
+lean_dec(x_421);
 lean_dec(x_2);
-return x_359;
+return x_423;
 }
 }
 else
 {
-lean_object* x_360; lean_object* x_361; 
-x_360 = lean_box(0);
-x_361 = l___private_Init_Lean_Elab_TermApp_14__elabAppFnId(x_1, x_2, x_360, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_361;
+lean_object* x_424; lean_object* x_425; 
+x_424 = lean_box(0);
+x_425 = l___private_Init_Lean_Elab_TermApp_14__elabAppFnId(x_1, x_2, x_424, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_425;
 }
-block_148:
+block_180:
 {
 uint8_t x_12; 
 x_12 = l_coeDecidableEq(x_11);
@@ -7123,6 +7285,7 @@ if (x_12 == 0)
 lean_object* x_13; uint8_t x_14; lean_object* x_15; 
 x_13 = lean_box(0);
 x_14 = 1;
+lean_inc(x_10);
 lean_inc(x_9);
 x_15 = l_Lean_Elab_Term_elabTermAux___main(x_13, x_14, x_2, x_9, x_10);
 if (lean_obj_tag(x_15) == 0)
@@ -7134,7 +7297,6 @@ if (x_16 == 0)
 lean_object* x_17; lean_object* x_18; lean_object* x_19; 
 x_17 = lean_ctor_get(x_15, 0);
 x_18 = lean_ctor_get(x_15, 1);
-lean_inc(x_18);
 x_19 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_17, x_3, x_4, x_5, x_6, x_7, x_9, x_18);
 if (lean_obj_tag(x_19) == 0)
 {
@@ -7144,6 +7306,7 @@ if (x_20 == 0)
 {
 lean_object* x_21; 
 x_21 = lean_array_push(x_8, x_19);
+lean_ctor_set(x_15, 1, x_10);
 lean_ctor_set(x_15, 0, x_21);
 return x_15;
 }
@@ -7159,6 +7322,7 @@ x_24 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_24, 0, x_22);
 lean_ctor_set(x_24, 1, x_23);
 x_25 = lean_array_push(x_8, x_24);
+lean_ctor_set(x_15, 1, x_10);
 lean_ctor_set(x_15, 0, x_25);
 return x_15;
 }
@@ -7188,6 +7352,7 @@ lean_inc(x_30);
 lean_dec(x_27);
 lean_ctor_set(x_19, 0, x_30);
 x_31 = lean_array_push(x_8, x_19);
+lean_ctor_set(x_15, 1, x_10);
 lean_ctor_set(x_15, 0, x_31);
 return x_15;
 }
@@ -7204,6 +7369,7 @@ x_34 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_34, 0, x_33);
 lean_ctor_set(x_34, 1, x_32);
 x_35 = lean_array_push(x_8, x_34);
+lean_ctor_set(x_15, 1, x_10);
 lean_ctor_set(x_15, 0, x_35);
 return x_15;
 }
@@ -7212,7 +7378,7 @@ else
 {
 uint8_t x_36; 
 lean_free_object(x_15);
-lean_dec(x_18);
+lean_dec(x_10);
 lean_dec(x_8);
 x_36 = !lean_is_exclusive(x_19);
 if (x_36 == 0)
@@ -7248,7 +7414,7 @@ x_41 = lean_ctor_get(x_19, 1);
 lean_dec(x_41);
 x_42 = lean_ctor_get(x_19, 0);
 lean_dec(x_42);
-lean_ctor_set(x_19, 1, x_18);
+lean_ctor_set(x_19, 1, x_10);
 return x_19;
 }
 else
@@ -7257,7 +7423,7 @@ lean_object* x_43;
 lean_dec(x_19);
 x_43 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_43, 0, x_26);
-lean_ctor_set(x_43, 1, x_18);
+lean_ctor_set(x_43, 1, x_10);
 return x_43;
 }
 }
@@ -7271,7 +7437,6 @@ x_45 = lean_ctor_get(x_15, 1);
 lean_inc(x_45);
 lean_inc(x_44);
 lean_dec(x_15);
-lean_inc(x_45);
 x_46 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_44, x_3, x_4, x_5, x_6, x_7, x_9, x_45);
 if (lean_obj_tag(x_46) == 0)
 {
@@ -7298,7 +7463,7 @@ lean_ctor_set(x_50, 1, x_48);
 x_51 = lean_array_push(x_8, x_50);
 x_52 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_52, 0, x_51);
-lean_ctor_set(x_52, 1, x_45);
+lean_ctor_set(x_52, 1, x_10);
 return x_52;
 }
 else
@@ -7338,13 +7503,13 @@ lean_ctor_set(x_58, 1, x_55);
 x_59 = lean_array_push(x_8, x_58);
 x_60 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_45);
+lean_ctor_set(x_60, 1, x_10);
 return x_60;
 }
 else
 {
 lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-lean_dec(x_45);
+lean_dec(x_10);
 lean_dec(x_8);
 x_61 = lean_ctor_get(x_46, 1);
 lean_inc(x_61);
@@ -7384,7 +7549,7 @@ if (lean_is_scalar(x_64)) {
  x_65 = x_64;
 }
 lean_ctor_set(x_65, 0, x_53);
-lean_ctor_set(x_65, 1, x_45);
+lean_ctor_set(x_65, 1, x_10);
 return x_65;
 }
 }
@@ -7392,412 +7557,571 @@ return x_65;
 }
 else
 {
-uint8_t x_66; 
+lean_object* x_66; 
 lean_dec(x_9);
-lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_66 = !lean_is_exclusive(x_15);
-if (x_66 == 0)
+x_66 = lean_ctor_get(x_15, 0);
+lean_inc(x_66);
+if (lean_obj_tag(x_66) == 0)
 {
+lean_object* x_67; 
+x_67 = lean_ctor_get(x_66, 0);
+lean_inc(x_67);
+if (lean_obj_tag(x_67) == 0)
+{
+uint8_t x_68; 
+lean_dec(x_66);
+x_68 = !lean_is_exclusive(x_15);
+if (x_68 == 0)
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_69 = lean_ctor_get(x_15, 0);
+lean_dec(x_69);
+x_70 = lean_ctor_get(x_67, 0);
+lean_inc(x_70);
+lean_dec(x_67);
+lean_ctor_set(x_15, 0, x_70);
+x_71 = lean_array_push(x_8, x_15);
+x_72 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_72, 0, x_71);
+lean_ctor_set(x_72, 1, x_10);
+return x_72;
+}
+else
+{
+lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_73 = lean_ctor_get(x_15, 1);
+lean_inc(x_73);
+lean_dec(x_15);
+x_74 = lean_ctor_get(x_67, 0);
+lean_inc(x_74);
+lean_dec(x_67);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_74);
+lean_ctor_set(x_75, 1, x_73);
+x_76 = lean_array_push(x_8, x_75);
+x_77 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_77, 0, x_76);
+lean_ctor_set(x_77, 1, x_10);
+return x_77;
+}
+}
+else
+{
+uint8_t x_78; 
+lean_dec(x_10);
+lean_dec(x_8);
+x_78 = !lean_is_exclusive(x_15);
+if (x_78 == 0)
+{
+lean_object* x_79; 
+x_79 = lean_ctor_get(x_15, 0);
+lean_dec(x_79);
 return x_15;
 }
 else
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_67 = lean_ctor_get(x_15, 0);
-x_68 = lean_ctor_get(x_15, 1);
-lean_inc(x_68);
-lean_inc(x_67);
-lean_dec(x_15);
-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
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_73; uint8_t x_74; 
-x_70 = lean_unsigned_to_nat(0u);
-x_71 = l_Lean_Syntax_getArg(x_2, x_70);
-x_72 = l_Lean_identKind___closed__2;
-lean_inc(x_71);
-x_73 = l_Lean_Syntax_isOfKind(x_71, x_72);
-x_74 = l_coeDecidableEq(x_73);
-if (x_74 == 0)
-{
-lean_object* x_75; uint8_t x_76; lean_object* x_77; 
-lean_dec(x_71);
-x_75 = lean_box(0);
-x_76 = 1;
-lean_inc(x_9);
-x_77 = l_Lean_Elab_Term_elabTermAux___main(x_75, x_76, x_2, x_9, x_10);
-if (lean_obj_tag(x_77) == 0)
-{
-uint8_t x_78; 
-x_78 = !lean_is_exclusive(x_77);
-if (x_78 == 0)
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_ctor_get(x_77, 0);
-x_80 = lean_ctor_get(x_77, 1);
+lean_object* x_80; lean_object* x_81; 
+x_80 = lean_ctor_get(x_15, 1);
 lean_inc(x_80);
-x_81 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_79, x_3, x_4, x_5, x_6, x_7, x_9, x_80);
-if (lean_obj_tag(x_81) == 0)
-{
-uint8_t x_82; 
-x_82 = !lean_is_exclusive(x_81);
-if (x_82 == 0)
-{
-lean_object* x_83; 
-x_83 = lean_array_push(x_8, x_81);
-lean_ctor_set(x_77, 0, x_83);
-return x_77;
-}
-else
-{
-lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_84 = lean_ctor_get(x_81, 0);
-x_85 = lean_ctor_get(x_81, 1);
-lean_inc(x_85);
-lean_inc(x_84);
-lean_dec(x_81);
-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_87 = lean_array_push(x_8, x_86);
-lean_ctor_set(x_77, 0, x_87);
-return x_77;
-}
-}
-else
-{
-lean_object* x_88; 
-x_88 = lean_ctor_get(x_81, 0);
-lean_inc(x_88);
-if (lean_obj_tag(x_88) == 0)
-{
-lean_object* x_89; 
-x_89 = lean_ctor_get(x_88, 0);
-lean_inc(x_89);
-if (lean_obj_tag(x_89) == 0)
-{
-uint8_t x_90; 
-lean_dec(x_88);
-x_90 = !lean_is_exclusive(x_81);
-if (x_90 == 0)
-{
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_91 = lean_ctor_get(x_81, 0);
-lean_dec(x_91);
-x_92 = lean_ctor_get(x_89, 0);
-lean_inc(x_92);
-lean_dec(x_89);
-lean_ctor_set(x_81, 0, x_92);
-x_93 = lean_array_push(x_8, x_81);
-lean_ctor_set(x_77, 0, x_93);
-return x_77;
-}
-else
-{
-lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_94 = lean_ctor_get(x_81, 1);
-lean_inc(x_94);
-lean_dec(x_81);
-x_95 = lean_ctor_get(x_89, 0);
-lean_inc(x_95);
-lean_dec(x_89);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_95);
-lean_ctor_set(x_96, 1, x_94);
-x_97 = lean_array_push(x_8, x_96);
-lean_ctor_set(x_77, 0, x_97);
-return x_77;
-}
-}
-else
-{
-uint8_t x_98; 
-lean_free_object(x_77);
-lean_dec(x_80);
-lean_dec(x_8);
-x_98 = !lean_is_exclusive(x_81);
-if (x_98 == 0)
-{
-lean_object* x_99; 
-x_99 = lean_ctor_get(x_81, 0);
-lean_dec(x_99);
-return x_81;
-}
-else
-{
-lean_object* x_100; lean_object* x_101; 
-x_100 = lean_ctor_get(x_81, 1);
-lean_inc(x_100);
-lean_dec(x_81);
-x_101 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_101, 0, x_88);
-lean_ctor_set(x_101, 1, x_100);
-return x_101;
-}
-}
-}
-else
-{
-uint8_t x_102; 
-lean_free_object(x_77);
-lean_dec(x_8);
-x_102 = !lean_is_exclusive(x_81);
-if (x_102 == 0)
-{
-lean_object* x_103; lean_object* x_104; 
-x_103 = lean_ctor_get(x_81, 1);
-lean_dec(x_103);
-x_104 = lean_ctor_get(x_81, 0);
-lean_dec(x_104);
+lean_dec(x_15);
+x_81 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_81, 0, x_66);
 lean_ctor_set(x_81, 1, x_80);
 return x_81;
 }
+}
+}
 else
 {
+uint8_t x_82; 
+lean_dec(x_8);
+x_82 = !lean_is_exclusive(x_15);
+if (x_82 == 0)
+{
+lean_object* x_83; lean_object* x_84; 
+x_83 = lean_ctor_get(x_15, 1);
+lean_dec(x_83);
+x_84 = lean_ctor_get(x_15, 0);
+lean_dec(x_84);
+lean_ctor_set(x_15, 1, x_10);
+return x_15;
+}
+else
+{
+lean_object* x_85; 
+lean_dec(x_15);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_66);
+lean_ctor_set(x_85, 1, x_10);
+return x_85;
+}
+}
+}
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; uint8_t x_89; uint8_t x_90; 
+x_86 = lean_unsigned_to_nat(0u);
+x_87 = l_Lean_Syntax_getArg(x_2, x_86);
+x_88 = l_Lean_identKind___closed__2;
+lean_inc(x_87);
+x_89 = l_Lean_Syntax_isOfKind(x_87, x_88);
+x_90 = l_coeDecidableEq(x_89);
+if (x_90 == 0)
+{
+lean_object* x_91; uint8_t x_92; lean_object* x_93; 
+lean_dec(x_87);
+x_91 = lean_box(0);
+x_92 = 1;
+lean_inc(x_10);
+lean_inc(x_9);
+x_93 = l_Lean_Elab_Term_elabTermAux___main(x_91, x_92, x_2, x_9, x_10);
+if (lean_obj_tag(x_93) == 0)
+{
+uint8_t x_94; 
+x_94 = !lean_is_exclusive(x_93);
+if (x_94 == 0)
+{
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_93, 0);
+x_96 = lean_ctor_get(x_93, 1);
+x_97 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_95, x_3, x_4, x_5, x_6, x_7, x_9, x_96);
+if (lean_obj_tag(x_97) == 0)
+{
+uint8_t x_98; 
+x_98 = !lean_is_exclusive(x_97);
+if (x_98 == 0)
+{
+lean_object* x_99; 
+x_99 = lean_array_push(x_8, x_97);
+lean_ctor_set(x_93, 1, x_10);
+lean_ctor_set(x_93, 0, x_99);
+return x_93;
+}
+else
+{
+lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_100 = lean_ctor_get(x_97, 0);
+x_101 = lean_ctor_get(x_97, 1);
+lean_inc(x_101);
+lean_inc(x_100);
+lean_dec(x_97);
+x_102 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_102, 0, x_100);
+lean_ctor_set(x_102, 1, x_101);
+x_103 = lean_array_push(x_8, x_102);
+lean_ctor_set(x_93, 1, x_10);
+lean_ctor_set(x_93, 0, x_103);
+return x_93;
+}
+}
+else
+{
+lean_object* x_104; 
+x_104 = lean_ctor_get(x_97, 0);
+lean_inc(x_104);
+if (lean_obj_tag(x_104) == 0)
+{
 lean_object* x_105; 
-lean_dec(x_81);
-x_105 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_105, 0, x_88);
-lean_ctor_set(x_105, 1, x_80);
-return x_105;
-}
-}
-}
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+if (lean_obj_tag(x_105) == 0)
+{
+uint8_t x_106; 
+lean_dec(x_104);
+x_106 = !lean_is_exclusive(x_97);
+if (x_106 == 0)
+{
+lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_107 = lean_ctor_get(x_97, 0);
+lean_dec(x_107);
+x_108 = lean_ctor_get(x_105, 0);
+lean_inc(x_108);
+lean_dec(x_105);
+lean_ctor_set(x_97, 0, x_108);
+x_109 = lean_array_push(x_8, x_97);
+lean_ctor_set(x_93, 1, x_10);
+lean_ctor_set(x_93, 0, x_109);
+return x_93;
 }
 else
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; 
-x_106 = lean_ctor_get(x_77, 0);
-x_107 = lean_ctor_get(x_77, 1);
-lean_inc(x_107);
-lean_inc(x_106);
-lean_dec(x_77);
-lean_inc(x_107);
-x_108 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_106, x_3, x_4, x_5, x_6, x_7, x_9, x_107);
-if (lean_obj_tag(x_108) == 0)
-{
-lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-x_109 = lean_ctor_get(x_108, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_108, 1);
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_110 = lean_ctor_get(x_97, 1);
 lean_inc(x_110);
-if (lean_is_exclusive(x_108)) {
- lean_ctor_release(x_108, 0);
- lean_ctor_release(x_108, 1);
- x_111 = x_108;
-} else {
- lean_dec_ref(x_108);
- x_111 = lean_box(0);
-}
-if (lean_is_scalar(x_111)) {
- x_112 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_112 = x_111;
-}
-lean_ctor_set(x_112, 0, x_109);
+lean_dec(x_97);
+x_111 = lean_ctor_get(x_105, 0);
+lean_inc(x_111);
+lean_dec(x_105);
+x_112 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_112, 0, x_111);
 lean_ctor_set(x_112, 1, x_110);
 x_113 = lean_array_push(x_8, x_112);
-x_114 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_114, 0, x_113);
-lean_ctor_set(x_114, 1, x_107);
-return x_114;
+lean_ctor_set(x_93, 1, x_10);
+lean_ctor_set(x_93, 0, x_113);
+return x_93;
+}
 }
 else
 {
+uint8_t x_114; 
+lean_free_object(x_93);
+lean_dec(x_10);
+lean_dec(x_8);
+x_114 = !lean_is_exclusive(x_97);
+if (x_114 == 0)
+{
 lean_object* x_115; 
-x_115 = lean_ctor_get(x_108, 0);
-lean_inc(x_115);
-if (lean_obj_tag(x_115) == 0)
-{
-lean_object* x_116; 
-x_116 = lean_ctor_get(x_115, 0);
-lean_inc(x_116);
-if (lean_obj_tag(x_116) == 0)
-{
-lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
+x_115 = lean_ctor_get(x_97, 0);
 lean_dec(x_115);
-x_117 = lean_ctor_get(x_108, 1);
-lean_inc(x_117);
-if (lean_is_exclusive(x_108)) {
- lean_ctor_release(x_108, 0);
- lean_ctor_release(x_108, 1);
- x_118 = x_108;
-} else {
- lean_dec_ref(x_108);
- x_118 = lean_box(0);
-}
-x_119 = lean_ctor_get(x_116, 0);
-lean_inc(x_119);
-lean_dec(x_116);
-if (lean_is_scalar(x_118)) {
- x_120 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_120 = x_118;
-}
-lean_ctor_set(x_120, 0, x_119);
-lean_ctor_set(x_120, 1, x_117);
-x_121 = lean_array_push(x_8, x_120);
-x_122 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_122, 0, x_121);
-lean_ctor_set(x_122, 1, x_107);
-return x_122;
+return x_97;
 }
 else
 {
-lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-lean_dec(x_107);
+lean_object* x_116; lean_object* x_117; 
+x_116 = lean_ctor_get(x_97, 1);
+lean_inc(x_116);
+lean_dec(x_97);
+x_117 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_117, 0, x_104);
+lean_ctor_set(x_117, 1, x_116);
+return x_117;
+}
+}
+}
+else
+{
+uint8_t x_118; 
+lean_free_object(x_93);
 lean_dec(x_8);
-x_123 = lean_ctor_get(x_108, 1);
+x_118 = !lean_is_exclusive(x_97);
+if (x_118 == 0)
+{
+lean_object* x_119; lean_object* x_120; 
+x_119 = lean_ctor_get(x_97, 1);
+lean_dec(x_119);
+x_120 = lean_ctor_get(x_97, 0);
+lean_dec(x_120);
+lean_ctor_set(x_97, 1, x_10);
+return x_97;
+}
+else
+{
+lean_object* x_121; 
+lean_dec(x_97);
+x_121 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_121, 0, x_104);
+lean_ctor_set(x_121, 1, x_10);
+return x_121;
+}
+}
+}
+}
+else
+{
+lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+x_122 = lean_ctor_get(x_93, 0);
+x_123 = lean_ctor_get(x_93, 1);
 lean_inc(x_123);
-if (lean_is_exclusive(x_108)) {
- lean_ctor_release(x_108, 0);
- lean_ctor_release(x_108, 1);
- x_124 = x_108;
+lean_inc(x_122);
+lean_dec(x_93);
+x_124 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_122, x_3, x_4, x_5, x_6, x_7, x_9, x_123);
+if (lean_obj_tag(x_124) == 0)
+{
+lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
+x_125 = lean_ctor_get(x_124, 0);
+lean_inc(x_125);
+x_126 = lean_ctor_get(x_124, 1);
+lean_inc(x_126);
+if (lean_is_exclusive(x_124)) {
+ lean_ctor_release(x_124, 0);
+ lean_ctor_release(x_124, 1);
+ x_127 = x_124;
 } else {
- lean_dec_ref(x_108);
- x_124 = lean_box(0);
+ lean_dec_ref(x_124);
+ x_127 = lean_box(0);
 }
-if (lean_is_scalar(x_124)) {
- x_125 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_127)) {
+ x_128 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_125 = x_124;
-}
-lean_ctor_set(x_125, 0, x_115);
-lean_ctor_set(x_125, 1, x_123);
-return x_125;
+ x_128 = x_127;
 }
+lean_ctor_set(x_128, 0, x_125);
+lean_ctor_set(x_128, 1, x_126);
+x_129 = lean_array_push(x_8, x_128);
+x_130 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_130, 0, x_129);
+lean_ctor_set(x_130, 1, x_10);
+return x_130;
 }
 else
 {
-lean_object* x_126; lean_object* x_127; 
-lean_dec(x_8);
-if (lean_is_exclusive(x_108)) {
- lean_ctor_release(x_108, 0);
- lean_ctor_release(x_108, 1);
- x_126 = x_108;
+lean_object* x_131; 
+x_131 = lean_ctor_get(x_124, 0);
+lean_inc(x_131);
+if (lean_obj_tag(x_131) == 0)
+{
+lean_object* x_132; 
+x_132 = lean_ctor_get(x_131, 0);
+lean_inc(x_132);
+if (lean_obj_tag(x_132) == 0)
+{
+lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+lean_dec(x_131);
+x_133 = lean_ctor_get(x_124, 1);
+lean_inc(x_133);
+if (lean_is_exclusive(x_124)) {
+ lean_ctor_release(x_124, 0);
+ lean_ctor_release(x_124, 1);
+ x_134 = x_124;
 } else {
- lean_dec_ref(x_108);
- x_126 = lean_box(0);
+ lean_dec_ref(x_124);
+ x_134 = lean_box(0);
 }
-if (lean_is_scalar(x_126)) {
- x_127 = lean_alloc_ctor(1, 2, 0);
+x_135 = lean_ctor_get(x_132, 0);
+lean_inc(x_135);
+lean_dec(x_132);
+if (lean_is_scalar(x_134)) {
+ x_136 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_127 = x_126;
+ x_136 = x_134;
 }
-lean_ctor_set(x_127, 0, x_115);
-lean_ctor_set(x_127, 1, x_107);
-return x_127;
-}
-}
-}
-}
-else
-{
-uint8_t x_128; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_128 = !lean_is_exclusive(x_77);
-if (x_128 == 0)
-{
-return x_77;
-}
-else
-{
-lean_object* x_129; lean_object* x_130; lean_object* x_131; 
-x_129 = lean_ctor_get(x_77, 0);
-x_130 = lean_ctor_get(x_77, 1);
-lean_inc(x_130);
-lean_inc(x_129);
-lean_dec(x_77);
-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;
-}
-}
-}
-else
-{
-lean_object* x_132; lean_object* x_133; lean_object* x_134; uint8_t x_135; 
-x_132 = lean_unsigned_to_nat(1u);
-x_133 = l_Lean_Syntax_getArg(x_2, x_132);
-lean_dec(x_2);
-x_134 = l_Lean_Syntax_getArgs(x_133);
-lean_dec(x_133);
-x_135 = l_Array_isEmpty___rarg(x_134);
-if (x_135 == 0)
-{
-lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-x_136 = l_Lean_Syntax_inhabited;
-x_137 = lean_array_get(x_136, x_134, x_70);
-lean_dec(x_134);
-x_138 = l_Lean_Elab_Term_elabExplicitUniv(x_137, x_9, x_10);
-lean_dec(x_137);
-if (lean_obj_tag(x_138) == 0)
-{
-lean_object* x_139; lean_object* x_140; lean_object* x_141; 
-x_139 = lean_ctor_get(x_138, 0);
-lean_inc(x_139);
-x_140 = lean_ctor_get(x_138, 1);
-lean_inc(x_140);
-lean_dec(x_138);
-x_141 = l___private_Init_Lean_Elab_TermApp_14__elabAppFnId(x_1, x_71, x_139, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_140);
-return x_141;
-}
-else
-{
-uint8_t x_142; 
-lean_dec(x_71);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_142 = !lean_is_exclusive(x_138);
-if (x_142 == 0)
-{
+lean_ctor_set(x_136, 0, x_135);
+lean_ctor_set(x_136, 1, x_133);
+x_137 = lean_array_push(x_8, x_136);
+x_138 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_138, 0, x_137);
+lean_ctor_set(x_138, 1, x_10);
 return x_138;
 }
 else
 {
-lean_object* x_143; lean_object* x_144; lean_object* x_145; 
-x_143 = lean_ctor_get(x_138, 0);
-x_144 = lean_ctor_get(x_138, 1);
-lean_inc(x_144);
-lean_inc(x_143);
-lean_dec(x_138);
-x_145 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_145, 0, x_143);
-lean_ctor_set(x_145, 1, x_144);
-return x_145;
+lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+lean_dec(x_10);
+lean_dec(x_8);
+x_139 = lean_ctor_get(x_124, 1);
+lean_inc(x_139);
+if (lean_is_exclusive(x_124)) {
+ lean_ctor_release(x_124, 0);
+ lean_ctor_release(x_124, 1);
+ x_140 = x_124;
+} else {
+ lean_dec_ref(x_124);
+ x_140 = lean_box(0);
+}
+if (lean_is_scalar(x_140)) {
+ x_141 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_141 = x_140;
+}
+lean_ctor_set(x_141, 0, x_131);
+lean_ctor_set(x_141, 1, x_139);
+return x_141;
+}
+}
+else
+{
+lean_object* x_142; lean_object* x_143; 
+lean_dec(x_8);
+if (lean_is_exclusive(x_124)) {
+ lean_ctor_release(x_124, 0);
+ lean_ctor_release(x_124, 1);
+ x_142 = x_124;
+} else {
+ lean_dec_ref(x_124);
+ x_142 = lean_box(0);
+}
+if (lean_is_scalar(x_142)) {
+ x_143 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_143 = x_142;
+}
+lean_ctor_set(x_143, 0, x_131);
+lean_ctor_set(x_143, 1, x_10);
+return x_143;
+}
 }
 }
 }
 else
 {
-lean_object* x_146; lean_object* x_147; 
-lean_dec(x_134);
-x_146 = lean_box(0);
-x_147 = l___private_Init_Lean_Elab_TermApp_14__elabAppFnId(x_1, x_71, x_146, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_147;
+lean_object* x_144; 
+lean_dec(x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_144 = lean_ctor_get(x_93, 0);
+lean_inc(x_144);
+if (lean_obj_tag(x_144) == 0)
+{
+lean_object* x_145; 
+x_145 = lean_ctor_get(x_144, 0);
+lean_inc(x_145);
+if (lean_obj_tag(x_145) == 0)
+{
+uint8_t x_146; 
+lean_dec(x_144);
+x_146 = !lean_is_exclusive(x_93);
+if (x_146 == 0)
+{
+lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
+x_147 = lean_ctor_get(x_93, 0);
+lean_dec(x_147);
+x_148 = lean_ctor_get(x_145, 0);
+lean_inc(x_148);
+lean_dec(x_145);
+lean_ctor_set(x_93, 0, x_148);
+x_149 = lean_array_push(x_8, x_93);
+x_150 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_150, 0, x_149);
+lean_ctor_set(x_150, 1, x_10);
+return x_150;
+}
+else
+{
+lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+x_151 = lean_ctor_get(x_93, 1);
+lean_inc(x_151);
+lean_dec(x_93);
+x_152 = lean_ctor_get(x_145, 0);
+lean_inc(x_152);
+lean_dec(x_145);
+x_153 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_153, 0, x_152);
+lean_ctor_set(x_153, 1, x_151);
+x_154 = lean_array_push(x_8, x_153);
+x_155 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_155, 0, x_154);
+lean_ctor_set(x_155, 1, x_10);
+return x_155;
+}
+}
+else
+{
+uint8_t x_156; 
+lean_dec(x_10);
+lean_dec(x_8);
+x_156 = !lean_is_exclusive(x_93);
+if (x_156 == 0)
+{
+lean_object* x_157; 
+x_157 = lean_ctor_get(x_93, 0);
+lean_dec(x_157);
+return x_93;
+}
+else
+{
+lean_object* x_158; lean_object* x_159; 
+x_158 = lean_ctor_get(x_93, 1);
+lean_inc(x_158);
+lean_dec(x_93);
+x_159 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_159, 0, x_144);
+lean_ctor_set(x_159, 1, x_158);
+return x_159;
+}
+}
+}
+else
+{
+uint8_t x_160; 
+lean_dec(x_8);
+x_160 = !lean_is_exclusive(x_93);
+if (x_160 == 0)
+{
+lean_object* x_161; lean_object* x_162; 
+x_161 = lean_ctor_get(x_93, 1);
+lean_dec(x_161);
+x_162 = lean_ctor_get(x_93, 0);
+lean_dec(x_162);
+lean_ctor_set(x_93, 1, x_10);
+return x_93;
+}
+else
+{
+lean_object* x_163; 
+lean_dec(x_93);
+x_163 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_163, 0, x_144);
+lean_ctor_set(x_163, 1, x_10);
+return x_163;
+}
+}
+}
+}
+else
+{
+lean_object* x_164; lean_object* x_165; lean_object* x_166; uint8_t x_167; 
+x_164 = lean_unsigned_to_nat(1u);
+x_165 = l_Lean_Syntax_getArg(x_2, x_164);
+lean_dec(x_2);
+x_166 = l_Lean_Syntax_getArgs(x_165);
+lean_dec(x_165);
+x_167 = l_Array_isEmpty___rarg(x_166);
+if (x_167 == 0)
+{
+lean_object* x_168; lean_object* x_169; lean_object* x_170; 
+x_168 = l_Lean_Syntax_inhabited;
+x_169 = lean_array_get(x_168, x_166, x_86);
+lean_dec(x_166);
+x_170 = l_Lean_Elab_Term_elabExplicitUniv(x_169, x_9, x_10);
+lean_dec(x_169);
+if (lean_obj_tag(x_170) == 0)
+{
+lean_object* x_171; lean_object* x_172; lean_object* x_173; 
+x_171 = lean_ctor_get(x_170, 0);
+lean_inc(x_171);
+x_172 = lean_ctor_get(x_170, 1);
+lean_inc(x_172);
+lean_dec(x_170);
+x_173 = l___private_Init_Lean_Elab_TermApp_14__elabAppFnId(x_1, x_87, x_171, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_172);
+return x_173;
+}
+else
+{
+uint8_t x_174; 
+lean_dec(x_87);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_174 = !lean_is_exclusive(x_170);
+if (x_174 == 0)
+{
+return x_170;
+}
+else
+{
+lean_object* x_175; lean_object* x_176; lean_object* x_177; 
+x_175 = lean_ctor_get(x_170, 0);
+x_176 = lean_ctor_get(x_170, 1);
+lean_inc(x_176);
+lean_inc(x_175);
+lean_dec(x_170);
+x_177 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_177, 0, x_175);
+lean_ctor_set(x_177, 1, x_176);
+return x_177;
+}
+}
+}
+else
+{
+lean_object* x_178; lean_object* x_179; 
+lean_dec(x_166);
+x_178 = lean_box(0);
+x_179 = l___private_Init_Lean_Elab_TermApp_14__elabAppFnId(x_1, x_87, x_178, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_179;
 }
 }
 }
diff --git a/stage0/stdlib/Init/Lean/LocalContext.c b/stage0/stdlib/Init/Lean/LocalContext.c
index de0ea87601..a585f10096 100644
--- a/stage0/stdlib/Init/Lean/LocalContext.c
+++ b/stage0/stdlib/Init/Lean/LocalContext.c
@@ -24,8 +24,11 @@ lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_anyM___spec
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_Name_eraseMacroScopes(lean_object*);
 lean_object* l_Lean_LocalDecl_userName___boxed(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlM___at_Lean_LocalContext_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(lean_object*, lean_object*);
 lean_object* lean_local_ctx_get_unused_name(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5(lean_object*);
 lean_object* l_Lean_LocalContext_usesUserName___boxed(lean_object*, lean_object*);
 uint8_t lean_local_ctx_is_empty(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_mkLocalDecl___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -34,51 +37,47 @@ lean_object* l_Lean_LocalContext_findDeclRev_x3f___rarg___boxed(lean_object*, le
 uint8_t l_Array_anyRangeMAux___main___at_Lean_LocalContext_any___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__3___boxed(lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_LocalContext_find_x3f___spec__2(lean_object*, size_t, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_isSubPrefixOfAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_LocalContext_1__popTailNoneAux___main(lean_object*);
 lean_object* l_PersistentArray_anyM___at_Lean_LocalContext_allM___spec__1(lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_LocalContext_mkLocalDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__4___boxed(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__4(lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM___at_Lean_LocalContext_foldlFrom___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(lean_object*, lean_object*);
 lean_object* lean_local_ctx_mk_let_decl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_any___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__10(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__4___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_LocalDecl_value___closed__3;
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__3___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_Inhabited;
 lean_object* lean_local_ctx_erase(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_sub(size_t, size_t);
 lean_object* l___private_Init_Util_1__mkPanicMessage(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclM_x3f(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__4___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3___boxed(lean_object*, lean_object*);
 lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkLambda___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__8(lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__3___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_LocalContext_any___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_get_x21(lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_binderInfo___boxed(lean_object*);
 uint8_t l_Lean_LocalContext_containsFVar(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_allM___spec__2___boxed(lean_object*);
 lean_object* l_Lean_LocalDecl_index___boxed(lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6(lean_object*);
 lean_object* l_Lean_LocalDecl_Inhabited___closed__1;
 lean_object* lean_local_ctx_find_from_user_name(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6(lean_object*);
 lean_object* l_PersistentHashMap_isUnaryNode___rarg(lean_object*);
 uint8_t l_Lean_LocalContext_isSubPrefixOfAux(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_eraseAux___main___at_Lean_LocalContext_erase___spec__2___boxed(lean_object*, lean_object*, lean_object*);
@@ -96,22 +95,23 @@ lean_object* l_Lean_LocalContext_forM___boxed(lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_Lean_LocalContext_foldl___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_LocalContext_find_x3f___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__9(lean_object*);
-lean_object* l_PersistentArray_findM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Array_indexOfAux___main___at_Lean_LocalContext_erase___spec__3(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentArray_anyMAux___main___at_Lean_LocalContext_any___spec__2(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_LocalContext_2__getUnusedNameAux(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_LocalContext_contains(lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_any___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldl___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_any___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_Inhabited___closed__1;
 lean_object* l_Lean_LocalContext_anyM___boxed(lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_LocalContext_all___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4(lean_object*);
 lean_object* l_PersistentHashMap_erase___at_Lean_LocalContext_erase___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_value___closed__2;
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_LocalContext_find_x3f___spec__1(lean_object*, lean_object*);
 uint8_t lean_expr_has_loose_bvar(lean_object*, lean_object*);
@@ -121,6 +121,8 @@ lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Local
 lean_object* l_Lean_LocalDecl_updateUserName(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__8___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentHashMap_containsAtAux___main___at_Lean_LocalContext_contains___spec__3(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_Inhabited___closed__2;
 lean_object* l_PersistentArray_foldlFromMAux___main___at_Lean_LocalContext_foldlFrom___spec__3(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__9___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -133,50 +135,46 @@ lean_object* l_Lean_LocalDecl_value(lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___boxed(lean_object*);
 lean_object* lean_local_ctx_num_indices(lean_object*);
 lean_object* l_Lean_LocalDecl_isLet___boxed(lean_object*);
-lean_object* l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkBinding___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_anyM___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_Inhabited___closed__1;
 lean_object* l_Lean_LocalDecl_type___boxed(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_mkBinding(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldl___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_get_x21___at___private_Init_Lean_LocalContext_1__popTailNoneAux___main___spec__1___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldl___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__5(lean_object*);
 lean_object* l_Lean_LocalContext_forM(lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4(lean_object*);
 lean_object* l_PersistentHashMap_contains___at_Lean_LocalContext_contains___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDecl_x3f(lean_object*);
 lean_object* l_PersistentArray_anyM___at_Lean_LocalContext_anyM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__10___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_all___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentArray_anyM___at_Lean_LocalContext_all___spec__1(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_mkLocalDecl___spec__4(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_getAux___main___at___private_Init_Lean_LocalContext_1__popTailNoneAux___main___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlM___at_Lean_LocalContext_foldl___spec__1(lean_object*);
 lean_object* l_PersistentArray_anyM___at_Lean_LocalContext_allM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkBinding___spec__1___closed__1;
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_any___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
-lean_object* l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkBinding___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5(lean_object*);
 uint8_t l_PersistentHashMap_isEmpty___at_Lean_LocalContext_isEmpty___spec__1(lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__5___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_appendIndexAfter(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRev_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_indexOfAux___main___at_Lean_LocalContext_erase___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -193,6 +191,7 @@ lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__5__
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_PersistentHashMap_insertAux___main___rarg___closed__3;
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM___at_Lean_LocalContext_foldlFrom___spec__1(lean_object*);
 lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkLambda___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_anyM___spec__2(lean_object*);
@@ -212,30 +211,32 @@ size_t l_USize_shiftLeft(size_t, size_t);
 lean_object* l_Lean_LocalDecl_Inhabited;
 lean_object* l_PersistentHashMap_containsAux___main___at_Lean_LocalContext_contains___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__4___boxed(lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5(lean_object*);
 lean_object* l_Lean_LocalDecl_value___closed__1;
 lean_object* l_PersistentHashMap_isEmpty___at_Lean_LocalContext_isEmpty___spec__1___boxed(lean_object*);
 lean_object* l_PersistentArray_getAux___main___at___private_Init_Lean_LocalContext_1__popTailNoneAux___main___spec__2(lean_object*, size_t, size_t);
 lean_object* l_Lean_LocalContext_foldlM___at_Lean_LocalContext_foldl___spec__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM___at_Lean_LocalContext_foldlFrom___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldl___spec__6(lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3(lean_object*);
 lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkForall___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentHashMap_contains___at_Lean_LocalContext_contains___spec__1(lean_object*, lean_object*);
 lean_object* lean_local_ctx_pop(lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_allM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_isSubPrefixOfAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
 extern lean_object* l_PersistentHashMap_empty___rarg___closed__2;
 lean_object* l_Lean_mkLambda(lean_object*, uint8_t, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2(lean_object*);
 size_t l_USize_mul(size_t, size_t);
 lean_object* l_Lean_LocalDecl_toExpr___boxed(lean_object*);
 uint8_t l_Lean_LocalContext_all(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findFVar_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_LocalContext_find_x3f___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_Lean_LocalContext_foldl___spec__3(lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__5(lean_object*);
 lean_object* l_Lean_mkFVar(lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__1(lean_object*);
@@ -246,20 +247,22 @@ lean_object* l_PersistentHashMap_findAux___main___at_Lean_LocalContext_find_x3f_
 lean_object* l_Lean_LocalContext_findDeclM_x3f___boxed(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__4___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_PersistentArray_foldlMAux___main___at_Lean_LocalContext_foldlFrom___spec__4___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_land(size_t, size_t);
 lean_object* l_PersistentArray_anyM___at_Lean_LocalContext_allM___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_LocalDecl_value_x3f___boxed(lean_object*);
 lean_object* l_Lean_LocalDecl_fvarId(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__3___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
+lean_object* l_PersistentArray_findSomeM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_allM___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_LocalContext_all___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_type(lean_object*);
 lean_object* l_Lean_LocalDecl_value_x3f(lean_object*);
 lean_object* lean_local_ctx_mk_local_decl(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_LocalContext_foldlFrom___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromMAux___main___at_Lean_LocalContext_foldlFrom___spec__3___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5(lean_object*);
 lean_object* l_Lean_LocalContext_findDecl_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlM(lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM(lean_object*);
@@ -269,7 +272,7 @@ lean_object* l_Lean_LocalDecl_index(lean_object*);
 lean_object* l_Lean_LocalContext_forM___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__4___rarg___lambda__1___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___at_Lean_LocalContext_foldlFrom___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDecl_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldl(lean_object*);
@@ -283,23 +286,23 @@ lean_object* l_PersistentArray_anyM___at_Lean_LocalContext_any___spec__1___boxed
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_all___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_local_ctx_get(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM___at_Lean_LocalContext_foldlFrom___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_isEmpty___boxed(lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_LocalContext_mkLocalDecl___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_all___spec__2___boxed(lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__5___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_all___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1___boxed(lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3(lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__8___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_get_x21___closed__2;
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__3(lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_any___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_LocalContext_1__popTailNoneAux(lean_object*);
 lean_object* l_Lean_LocalContext_mkLambda(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__5___boxed(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentArray_anyMAux___main___at_Lean_LocalContext_all___spec__2(lean_object*, lean_object*);
 lean_object* l_Array_eraseIdx_x27___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -318,31 +321,32 @@ lean_object* l_PersistentArray_foldlFromM___at_Lean_LocalContext_foldlFrom___spe
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__5___boxed(lean_object*);
 uint8_t l_Lean_LocalContext_any(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_get_x21___closed__1;
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__5___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_PersistentHashMap_insert___at_Lean_LocalContext_mkLocalDecl___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
 lean_object* l_Lean_mkLet(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 extern lean_object* l_Lean_Expr_Inhabited;
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6(lean_object*);
 lean_object* l_Lean_LocalContext_foldlM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_all___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_getFVar_x21___boxed(lean_object*, lean_object*);
 lean_object* lean_expr_abstract(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__7(lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2(lean_object*);
+lean_object* l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2(lean_object*);
 lean_object* l_Lean_LocalContext_findDeclM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__1___rarg(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4(lean_object*);
 lean_object* l_Lean_LocalContext_foldl___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__3(lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3(lean_object*);
 lean_object* l_Lean_LocalContext_findDeclM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_erase___at_Lean_LocalContext_erase___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_isSubPrefixOf___boxed(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_mkBinding___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6(lean_object*);
 lean_object* l_PersistentArray_anyMAux___main___at_Lean_LocalContext_anyM___spec__2___boxed(lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2(lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___at_Lean_LocalContext_foldlFrom___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlFromM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_local_ctx_find(lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_allM(lean_object*);
@@ -351,13 +355,11 @@ lean_object* l_Lean_LocalContext_anyM(lean_object*);
 lean_object* l_Lean_LocalContext_mkForall(lean_object*, lean_object*, lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 lean_object* l_PersistentArray_foldlM___at_Lean_LocalContext_foldl___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_Lean_LocalContext_foldlFrom___spec__4(lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_Lean_LocalContext_foldlFrom___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_contains___boxed(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_LocalContext_foldlFrom___spec__9___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_anyM___at_Lean_LocalContext_allM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at_Lean_LocalContext_foldl___spec__3___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_anyM___spec__3___boxed(lean_object*);
@@ -368,12 +370,10 @@ uint8_t l_Lean_LocalContext_isSubPrefixOfAux___main(lean_object*, lean_object*,
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__5___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_set___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_foldlM___boxed(lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_containsFVar___boxed(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_LocalContext_allM___spec__4(lean_object*);
 lean_object* l_Lean_LocalContext_mkForall___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_allM___boxed(lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_LocalContext_all___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_LocalDecl_isLet(lean_object*);
 lean_object* l_PersistentHashMap_containsAtAux___main___at_Lean_LocalContext_contains___spec__3___boxed(lean_object*, lean_object*, lean_object*);
@@ -2844,7 +2844,7 @@ return x_1;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(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; 
@@ -2895,7 +2895,7 @@ return x_10;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(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; 
@@ -2915,7 +2915,7 @@ x_8 = lean_unsigned_to_nat(1u);
 x_9 = lean_nat_sub(x_3, x_8);
 lean_dec(x_3);
 x_10 = lean_array_fget(x_2, x_9);
-x_11 = l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(x_1, x_10);
+x_11 = l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(x_1, x_10);
 lean_dec(x_10);
 if (lean_obj_tag(x_11) == 0)
 {
@@ -2931,7 +2931,7 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(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; 
@@ -2982,7 +2982,7 @@ return x_10;
 }
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -2990,7 +2990,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 0);
 x_4 = lean_array_get_size(x_3);
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(x_1, x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(x_1, x_3, x_4, lean_box(0));
 return x_5;
 }
 else
@@ -2998,23 +2998,23 @@ else
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_array_get_size(x_6);
-x_8 = l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(x_1, x_6, x_7, lean_box(0));
+x_8 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(x_1, x_6, x_7, lean_box(0));
 return x_8;
 }
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 1);
 x_4 = lean_array_get_size(x_3);
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(x_1, x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(x_1, x_3, x_4, lean_box(0));
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; lean_object* x_7; 
 x_6 = lean_ctor_get(x_2, 0);
-x_7 = l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(x_1, x_6);
+x_7 = l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(x_1, x_6);
 return x_7;
 }
 else
@@ -3030,57 +3030,57 @@ lean_object* x_3; lean_object* x_4;
 x_3 = lean_ctor_get(x_1, 1);
 lean_inc(x_3);
 lean_dec(x_1);
-x_4 = l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(x_2, x_3);
+x_4 = l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(x_2, x_3);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__2(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__4(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__5(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findFromUserName_x3f___spec__3(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findFromUserName_x3f___spec__1(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
@@ -3496,7 +3496,7 @@ lean_inc(x_1);
 x_6 = lean_alloc_closure((void*)(l_Lean_LocalContext_findDeclM_x3f___rarg___lambda__1), 3, 2);
 lean_closure_set(x_6, 0, x_1);
 lean_closure_set(x_6, 1, x_4);
-x_7 = l_PersistentArray_findM_x3f___rarg(x_1, lean_box(0), x_5, x_6);
+x_7 = l_PersistentArray_findSomeM_x3f___rarg(x_1, lean_box(0), x_5, x_6);
 return x_7;
 }
 }
@@ -3528,7 +3528,7 @@ lean_inc(x_1);
 x_6 = lean_alloc_closure((void*)(l_Lean_LocalContext_findDeclM_x3f___rarg___lambda__1), 3, 2);
 lean_closure_set(x_6, 0, x_1);
 lean_closure_set(x_6, 1, x_4);
-x_7 = l_PersistentArray_findRevM_x3f___rarg(x_1, lean_box(0), x_5, x_6);
+x_7 = l_PersistentArray_findSomeRevM_x3f___rarg(x_1, lean_box(0), x_5, x_6);
 return x_7;
 }
 }
@@ -3874,7 +3874,7 @@ lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -3894,7 +3894,7 @@ else
 lean_object* x_7; lean_object* x_8; 
 x_7 = lean_array_fget(x_2, x_3);
 lean_inc(x_1);
-x_8 = l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(x_1, x_7);
+x_8 = l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(x_1, x_7);
 lean_dec(x_7);
 if (lean_obj_tag(x_8) == 0)
 {
@@ -3914,15 +3914,15 @@ return x_8;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4(lean_object* x_1) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg___boxed), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg___boxed), 3, 0);
 return x_2;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -3977,15 +3977,15 @@ return x_12;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5(lean_object* x_1) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg___boxed), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg___boxed), 3, 0);
 return x_2;
 }
 }
-lean_object* l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -3993,7 +3993,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 0);
 x_4 = lean_unsigned_to_nat(0u);
-x_5 = l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(x_1, x_3, x_4);
+x_5 = l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(x_1, x_3, x_4);
 return x_5;
 }
 else
@@ -4001,20 +4001,20 @@ else
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(x_1, x_6, x_7);
+x_8 = l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(x_1, x_6, x_7);
 return x_8;
 }
 }
 }
-lean_object* l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3(lean_object* x_1) {
+lean_object* l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg___boxed), 2, 0);
+x_2 = lean_alloc_closure((void*)(l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg___boxed), 2, 0);
 return x_2;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -4069,27 +4069,27 @@ return x_12;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6(lean_object* x_1) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg___boxed), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg___boxed), 3, 0);
 return x_2;
 }
 }
-lean_object* l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_ctor_get(x_2, 0);
 lean_inc(x_1);
-x_4 = l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(x_1, x_3);
+x_4 = l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(x_1, x_3);
 if (lean_obj_tag(x_4) == 0)
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = lean_ctor_get(x_2, 1);
 x_6 = lean_unsigned_to_nat(0u);
-x_7 = l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(x_1, x_5, x_6);
+x_7 = l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(x_1, x_5, x_6);
 return x_7;
 }
 else
@@ -4099,11 +4099,11 @@ return x_4;
 }
 }
 }
-lean_object* l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2(lean_object* x_1) {
+lean_object* l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg___boxed), 2, 0);
+x_2 = lean_alloc_closure((void*)(l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg___boxed), 2, 0);
 return x_2;
 }
 }
@@ -4112,7 +4112,7 @@ _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_ctor_get(x_2, 1);
-x_4 = l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(x_1, x_3);
+x_4 = l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(x_1, x_3);
 return x_4;
 }
 }
@@ -4140,47 +4140,47 @@ x_2 = lean_alloc_closure((void*)(l_Lean_LocalContext_findDecl_x3f___rarg___boxed
 return x_2;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__4___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__5___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__3___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(x_1, x_2, x_3);
+x_4 = l_Array_findSomeMAux___main___at_Lean_LocalContext_findDecl_x3f___spec__6___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeM_x3f___at_Lean_LocalContext_findDecl_x3f___spec__2___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
@@ -4203,7 +4203,7 @@ lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(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; 
@@ -4254,15 +4254,15 @@ return x_13;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3(lean_object* x_1) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg___boxed), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg___boxed), 4, 0);
 return x_2;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(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; 
@@ -4284,7 +4284,7 @@ x_9 = lean_nat_sub(x_3, x_8);
 lean_dec(x_3);
 x_10 = lean_array_fget(x_2, x_9);
 lean_inc(x_1);
-x_11 = l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(x_1, x_10);
+x_11 = l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(x_1, x_10);
 lean_dec(x_10);
 if (lean_obj_tag(x_11) == 0)
 {
@@ -4301,15 +4301,15 @@ return x_11;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5(lean_object* x_1) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg___boxed), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg___boxed), 4, 0);
 return x_2;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(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; 
@@ -4360,15 +4360,15 @@ return x_13;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6(lean_object* x_1) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg___boxed), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg___boxed), 4, 0);
 return x_2;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -4376,7 +4376,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 0);
 x_4 = lean_array_get_size(x_3);
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(x_1, x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(x_1, x_3, x_4, lean_box(0));
 return x_5;
 }
 else
@@ -4384,32 +4384,32 @@ else
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_array_get_size(x_6);
-x_8 = l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(x_1, x_6, x_7, lean_box(0));
+x_8 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(x_1, x_6, x_7, lean_box(0));
 return x_8;
 }
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4(lean_object* x_1) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg___boxed), 2, 0);
+x_2 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg___boxed), 2, 0);
 return x_2;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_2, 1);
 x_4 = lean_array_get_size(x_3);
 lean_inc(x_1);
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(x_1, x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(x_1, x_3, x_4, lean_box(0));
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; lean_object* x_7; 
 x_6 = lean_ctor_get(x_2, 0);
-x_7 = l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(x_1, x_6);
+x_7 = l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(x_1, x_6);
 return x_7;
 }
 else
@@ -4419,11 +4419,11 @@ return x_5;
 }
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2(lean_object* x_1) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg___boxed), 2, 0);
+x_2 = lean_alloc_closure((void*)(l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg___boxed), 2, 0);
 return x_2;
 }
 }
@@ -4432,7 +4432,7 @@ _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_ctor_get(x_2, 1);
-x_4 = l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(x_1, x_3);
+x_4 = l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(x_1, x_3);
 return x_4;
 }
 }
@@ -4460,47 +4460,47 @@ x_2 = lean_alloc_closure((void*)(l_Lean_LocalContext_findDeclRev_x3f___rarg___bo
 return x_2;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__3___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__5___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__6___rarg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevMAux___main___at_Lean_LocalContext_findDeclRev_x3f___spec__4___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_PersistentArray_findRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(x_1, x_2);
+x_3 = l_PersistentArray_findSomeRevM_x3f___at_Lean_LocalContext_findDeclRev_x3f___spec__2___rarg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Lean/Meta/Tactic/Assumption.c b/stage0/stdlib/Init/Lean/Meta/Tactic/Assumption.c
index 4e4e4c4ab0..b4468c7fbc 100644
--- a/stage0/stdlib/Init/Lean/Meta/Tactic/Assumption.c
+++ b/stage0/stdlib/Init/Lean/Meta/Tactic/Assumption.c
@@ -13,58 +13,58 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___at_Lean_Meta_assumptionAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assumption___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Meta_assumption___closed__1;
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_isEqvAux___main___at_Lean_Meta_assumptionAux___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assumptionAux(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assumptionAux___closed__2;
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMVarType(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Format_join___closed__1;
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
 lean_object* l_Lean_Meta_assumption(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___at_Lean_Meta_assumptionAux___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_type(lean_object*);
 lean_object* l_Lean_Meta_throwTacticEx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assumptionAux___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assumptionAux___closed__1;
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_checkNotAssigned(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___at_Lean_Meta_assumptionAux___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_isEqvAux___main___at_Lean_Meta_assumptionAux___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMVarDecl(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_LocalInstance_beq(lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_resettingSynthInstanceCache___rarg___closed__1;
 lean_object* l_Lean_LocalContext_findDeclRevM_x3f___at_Lean_Meta_assumptionAux___spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(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_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -281,7 +281,7 @@ return x_48;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -308,7 +308,7 @@ lean_dec(x_3);
 x_13 = lean_array_fget(x_2, x_12);
 lean_inc(x_5);
 lean_inc(x_1);
-x_14 = l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(x_1, x_13, x_5, x_6);
+x_14 = l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(x_1, x_13, x_5, x_6);
 lean_dec(x_13);
 if (lean_obj_tag(x_14) == 0)
 {
@@ -381,7 +381,7 @@ return x_25;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -598,7 +598,7 @@ return x_48;
 }
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -606,7 +606,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = lean_ctor_get(x_2, 0);
 x_6 = lean_array_get_size(x_5);
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(x_1, x_5, x_6, lean_box(0), x_3, x_4);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(x_1, x_5, x_6, lean_box(0), x_3, x_4);
 return x_7;
 }
 else
@@ -614,12 +614,12 @@ else
 lean_object* x_8; lean_object* x_9; lean_object* x_10; 
 x_8 = lean_ctor_get(x_2, 0);
 x_9 = lean_array_get_size(x_8);
-x_10 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(x_1, x_8, x_9, lean_box(0), x_3, x_4);
+x_10 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(x_1, x_8, x_9, lean_box(0), x_3, x_4);
 return x_10;
 }
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
@@ -627,7 +627,7 @@ x_5 = lean_ctor_get(x_2, 1);
 x_6 = lean_array_get_size(x_5);
 lean_inc(x_3);
 lean_inc(x_1);
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(x_1, x_5, x_6, lean_box(0), x_3, x_4);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(x_1, x_5, x_6, lean_box(0), x_3, x_4);
 if (lean_obj_tag(x_7) == 0)
 {
 lean_object* x_8; 
@@ -640,7 +640,7 @@ x_9 = lean_ctor_get(x_7, 1);
 lean_inc(x_9);
 lean_dec(x_7);
 x_10 = lean_ctor_get(x_2, 0);
-x_11 = l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(x_1, x_10, x_3, x_9);
+x_11 = l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(x_1, x_10, x_3, x_9);
 return x_11;
 }
 else
@@ -700,7 +700,7 @@ _start:
 {
 lean_object* x_5; lean_object* x_6; 
 x_5 = lean_ctor_get(x_2, 1);
-x_6 = l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(x_1, x_5, x_3, x_4);
+x_6 = l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(x_1, x_5, x_3, x_4);
 return x_6;
 }
 }
@@ -746,7 +746,7 @@ goto _start;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -963,7 +963,7 @@ return x_48;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__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) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -990,7 +990,7 @@ lean_dec(x_3);
 x_13 = lean_array_fget(x_2, x_12);
 lean_inc(x_5);
 lean_inc(x_1);
-x_14 = l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(x_1, x_13, x_5, x_6);
+x_14 = l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(x_1, x_13, x_5, x_6);
 lean_dec(x_13);
 if (lean_obj_tag(x_14) == 0)
 {
@@ -1063,7 +1063,7 @@ return x_25;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(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; 
@@ -1280,7 +1280,7 @@ return x_48;
 }
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -1288,7 +1288,7 @@ if (lean_obj_tag(x_2) == 0)
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = lean_ctor_get(x_2, 0);
 x_6 = lean_array_get_size(x_5);
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__12(x_1, x_5, x_6, lean_box(0), x_3, x_4);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__12(x_1, x_5, x_6, lean_box(0), x_3, x_4);
 return x_7;
 }
 else
@@ -1296,12 +1296,12 @@ else
 lean_object* x_8; lean_object* x_9; lean_object* x_10; 
 x_8 = lean_ctor_get(x_2, 0);
 x_9 = lean_array_get_size(x_8);
-x_10 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(x_1, x_8, x_9, lean_box(0), x_3, x_4);
+x_10 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(x_1, x_8, x_9, lean_box(0), x_3, x_4);
 return x_10;
 }
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(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; 
@@ -1309,7 +1309,7 @@ x_5 = lean_ctor_get(x_2, 1);
 x_6 = lean_array_get_size(x_5);
 lean_inc(x_3);
 lean_inc(x_1);
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(x_1, x_5, x_6, lean_box(0), x_3, x_4);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(x_1, x_5, x_6, lean_box(0), x_3, x_4);
 if (lean_obj_tag(x_7) == 0)
 {
 lean_object* x_8; 
@@ -1322,7 +1322,7 @@ x_9 = lean_ctor_get(x_7, 1);
 lean_inc(x_9);
 lean_dec(x_7);
 x_10 = lean_ctor_get(x_2, 0);
-x_11 = l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(x_1, x_10, x_3, x_9);
+x_11 = l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(x_1, x_10, x_3, x_9);
 return x_11;
 }
 else
@@ -1382,7 +1382,7 @@ _start:
 {
 lean_object* x_5; lean_object* x_6; 
 x_5 = lean_ctor_get(x_2, 1);
-x_6 = l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(x_1, x_5, x_3, x_4);
+x_6 = l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(x_1, x_5, x_3, x_4);
 return x_6;
 }
 }
@@ -2621,47 +2621,47 @@ return x_279;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__3(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___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) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__5(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___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) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__6(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4___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_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(x_1, x_2, x_3, x_4);
+x_5 = l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__4(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(x_1, x_2, x_3, x_4);
+x_5 = l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__2(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
@@ -2688,47 +2688,47 @@ x_8 = lean_box(x_7);
 return x_8;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___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) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__10(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__12___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__12(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__12(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___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* l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___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) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__13(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11___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_PersistentArray_findRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(x_1, x_2, x_3, x_4);
+x_5 = l_PersistentArray_findSomeRevMAux___main___at_Lean_Meta_assumptionAux___spec__11(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__9___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__9___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_PersistentArray_findRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(x_1, x_2, x_3, x_4);
+x_5 = l_PersistentArray_findSomeRevM_x3f___at_Lean_Meta_assumptionAux___spec__9(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 return x_5;
 }
diff --git a/stage0/stdlib/Init/Lean/Structure.c b/stage0/stdlib/Init/Lean/Structure.c
index 5775d2e35c..2bd7e0b9ec 100644
--- a/stage0/stdlib/Init/Lean/Structure.c
+++ b/stage0/stdlib/Init/Lean/Structure.c
@@ -19,6 +19,7 @@ lean_object* l_Lean_getStructureCtor___closed__1;
 lean_object* l_Lean_getStructureCtor___closed__2;
 lean_object* l___private_Init_Lean_Structure_4__hasProjFn___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Lean_Structure_4__hasProjFn(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_findField_x3f___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getStructureCtor___closed__4;
 uint8_t lean_name_eq(lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
@@ -29,7 +30,6 @@ lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 uint8_t l_Lean_isInternalSubobjectFieldName(lean_object*);
 lean_object* l___private_Init_Lean_Structure_2__isSubobjectFieldAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_findField_x3f___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Array_contains___at_Lean_findField_x3f___main___spec__1___boxed(lean_object*, lean_object*);
 uint8_t l_Lean_Environment_isProjectionFn(lean_object*, lean_object*);
@@ -43,27 +43,27 @@ lean_object* l_Lean_getStructureFieldsFlattened(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Structure_3__getStructureFieldsFlattenedAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getStructureCtor___closed__5;
 lean_object* l_Lean_getStructureCtor___closed__3;
-lean_object* l_Array_findMAux___main___at_Lean_findField_x3f___main___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_findField_x3f___main___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Structure_1__getStructureFieldsAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getStructureFields(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint32_t lean_string_utf8_get(lean_object*, lean_object*);
 lean_object* l_Lean_getPathToBaseStructure_x3f(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_findField_x3f___main___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_contains___at_Lean_findField_x3f___main___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_getPathToBaseStructureAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Structure_1__getStructureFieldsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Lean_Structure_4__hasProjFn___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_getParentStructures___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_UInt32_decEq(uint32_t, uint32_t);
+lean_object* l_Array_findSomeMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getParentStructures(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Structure_2__isSubobjectFieldAux(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkInternalSubobjectFieldName(lean_object*);
 lean_object* l___private_Init_Lean_Structure_2__isSubobjectFieldAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Structure_2__isSubobjectFieldAux___main___closed__1;
 lean_object* l___private_Init_Lean_Structure_2__isSubobjectFieldAux___main___closed__2;
+lean_object* l_Array_findSomeMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_findField_x3f___main___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Lean_getStructureCtor(lean_object*, lean_object*);
@@ -811,7 +811,7 @@ lean_dec(x_3);
 return x_5;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_findField_x3f___main___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_findField_x3f___main___spec__3(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; 
@@ -865,7 +865,7 @@ lean_object* x_6; lean_object* x_7; lean_object* x_8;
 lean_inc(x_1);
 x_6 = l_Lean_getParentStructures(x_1, x_2);
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l_Array_findMAux___main___at_Lean_findField_x3f___main___spec__3(x_1, x_3, x_6, x_7);
+x_8 = l_Array_findSomeMAux___main___at_Lean_findField_x3f___main___spec__3(x_1, x_3, x_6, x_7);
 lean_dec(x_6);
 return x_8;
 }
@@ -903,11 +903,11 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_findField_x3f___main___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_findField_x3f___main___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Array_findMAux___main___at_Lean_findField_x3f___main___spec__3(x_1, x_2, x_3, x_4);
+x_5 = l_Array_findSomeMAux___main___at_Lean_findField_x3f___main___spec__3(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_5;
@@ -1148,7 +1148,7 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -1229,7 +1229,7 @@ lean_inc(x_3);
 lean_inc(x_1);
 x_6 = l_Lean_getStructureFields(x_1, x_3);
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l_Array_findMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(x_1, x_2, x_3, x_4, x_6, x_7);
+x_8 = l_Array_findSomeMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(x_1, x_2, x_3, x_4, x_6, x_7);
 lean_dec(x_6);
 return x_8;
 }
@@ -1245,11 +1245,11 @@ return x_10;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_getPathToBaseStructureAux___main___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* l_Array_findSomeMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Array_findMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_findSomeMAux___main___at_Lean_getPathToBaseStructureAux___main___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 lean_dec(x_2);
 return x_7;
diff --git a/stage0/stdlib/Init/Lean/Syntax.c b/stage0/stdlib/Init/Lean/Syntax.c
index 5720e7ddf9..65537a74f6 100644
--- a/stage0/stdlib/Init/Lean/Syntax.c
+++ b/stage0/stdlib/Init/Lean/Syntax.c
@@ -28,10 +28,8 @@ lean_object* l_Lean_Syntax_modifyArg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main___closed__5;
 lean_object* l_Lean_Syntax_ifNodeKind___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_mrewriteBottomUp___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getIdAt(lean_object*, lean_object*);
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_HasToString;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Lean_SyntaxNode_withArgs(lean_object*);
@@ -71,7 +69,6 @@ lean_object* l_Lean_Syntax_formatStxAux___main___closed__8;
 lean_object* l_Lean_Syntax_ifNode(lean_object*);
 lean_object* l_Lean_Syntax_getTailWithInfo___main(lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main___closed__4;
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SyntaxNode_getIdAt(lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_SyntaxNode_getKind___boxed(lean_object*);
@@ -83,6 +80,7 @@ lean_object* l_Lean_Syntax_mreplace___main___rarg(lean_object*, lean_object*, le
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Syntax_reprint___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_map___main___at_Lean_Syntax_formatStxAux___main___spec__5___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_unreachIsNodeMissing(lean_object*, lean_object*);
@@ -108,8 +106,10 @@ lean_object* l_Array_umapMAux___main___at_Lean_Syntax_rewriteBottomUp___spec__2(
 lean_object* l_Lean_Syntax_isMissing___boxed(lean_object*);
 lean_object* l_Lean_Syntax_mreplace(lean_object*);
 lean_object* l___private_Init_Lean_Syntax_3__updateLast___main(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SyntaxNode_modifyArgs(lean_object*, lean_object*);
 lean_object* l_Lean_SyntaxNode_getArgs___boxed(lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_map___main___at_Lean_Syntax_formatStxAux___main___spec__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_unreachIsNodeIdent___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_String_Iterator_HasRepr___closed__2;
@@ -154,6 +154,7 @@ extern lean_object* l_Lean_Format_paren___closed__2;
 lean_object* l_Lean_unreachIsNodeAtom___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Syntax_3__updateLast___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_map___main___at_Lean_Syntax_formatStxAux___main___spec__4___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setTailInfoAux___main(lean_object*, lean_object*);
 lean_object* lean_format_group(lean_object*);
 lean_object* l_Lean_mkStxStrLit(lean_object*, lean_object*);
@@ -163,7 +164,6 @@ lean_object* lean_mk_syntax_num_lit(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Syntax_reprint___main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Syntax_updateLeading___spec__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_HasToString___closed__1;
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
 lean_object* l_Lean_Syntax_mrewriteBottomUp___main(lean_object*);
 lean_object* l_Lean_SyntaxNode_getIdAt___boxed(lean_object*, lean_object*);
@@ -2384,7 +2384,7 @@ lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2436,7 +2436,7 @@ x_3 = lean_ctor_get(x_1, 1);
 lean_inc(x_3);
 lean_dec(x_1);
 x_4 = lean_array_get_size(x_3);
-x_5 = l_Array_findRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(x_3, x_4, lean_box(0));
 lean_dec(x_3);
 return x_5;
 }
@@ -2477,11 +2477,11 @@ return x_10;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(x_1, x_2, x_3);
+x_4 = l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailWithInfo___main___spec__1(x_1, x_2, x_3);
 lean_dec(x_1);
 return x_4;
 }
@@ -2494,7 +2494,7 @@ x_2 = l_Lean_Syntax_getTailWithInfo___main(x_1);
 return x_2;
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2545,7 +2545,7 @@ case 1:
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
-x_5 = l_Array_findRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(x_3, x_4, lean_box(0));
+x_5 = l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(x_3, x_4, lean_box(0));
 return x_5;
 }
 default: 
@@ -2558,11 +2558,11 @@ return x_6;
 }
 }
 }
-lean_object* l_Array_findRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(x_1, x_2, x_3);
+x_4 = l_Array_findSomeRevMAux___main___at_Lean_Syntax_getTailInfo___main___spec__1(x_1, x_2, x_3);
 lean_dec(x_1);
 return x_4;
 }
diff --git a/stage0/stdlib/Init/LeanInit.c b/stage0/stdlib/Init/LeanInit.c
index b1463b1f91..236218e2a2 100644
--- a/stage0/stdlib/Init/LeanInit.c
+++ b/stage0/stdlib/Init/LeanInit.c
@@ -27,12 +27,13 @@ lean_object* l_Lean_extractMacroScopes(lean_object*);
 lean_object* l_Lean_ParserDescr_pushLeading;
 lean_object* l_Lean_fieldIdxKind;
 lean_object* l_Lean_Syntax_isNatLit_x3f___boxed(lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_1__eraseMacroScopesAux___main___closed__1;
 lean_object* l_Lean_MacroM_monadQuotation;
 lean_object* l_Lean_Name_eraseMacroScopes(lean_object*);
 lean_object* l_Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
 lean_object* l_Lean_Macro_throwUnsupported___closed__1;
-lean_object* l_Array_findMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1___boxed(lean_object*, lean_object*);
+lean_object* l_Array_mapSepElemsM___boxed(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l___private_Init_LeanInit_12__decodeQuotedChar___boxed__const__1;
 lean_object* l_Lean_MacroScopesView_inhabited;
@@ -51,17 +52,20 @@ lean_object* l_Lean_ParserDescr_orelse(uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_MacroM_monadQuotation___lambda__2(lean_object*);
 lean_object* l___private_Init_LeanInit_8__decodeHexDigit___boxed(lean_object*, lean_object*);
 uint32_t l_Lean_idBeginEscape;
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___boxed(lean_object*);
 lean_object* l___private_Init_LeanInit_10__decodeDecimalLitAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_4__extractMainModule(lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
-lean_object* l_Array_findMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_filterSepElemsM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isAtom___boxed(lean_object*);
 lean_object* l_Lean_ParserDescr_optional(uint8_t, lean_object*);
+lean_object* l_Array_mapSepElemsM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_toNat___boxed(lean_object*);
 lean_object* l_Lean_identKind___closed__2;
 lean_object* l___private_Init_LeanInit_8__decodeHexDigit(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_1__eraseMacroScopesAux___main(lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux(lean_object*);
 lean_object* l_Lean_ParserDescr_lookahead(uint8_t, lean_object*);
 lean_object* l___private_Init_LeanInit_5__extractMacroScopesAux(lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
@@ -69,6 +73,7 @@ lean_object* l_Lean_Syntax_isOfKind___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_HasBeq;
 lean_object* l___private_Init_LeanInit_13__decodeNameLitAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_fieldIdxKind___closed__1;
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main(lean_object*);
 uint8_t l_Char_isDigit(uint32_t);
 lean_object* l_Lean_charLitKind___closed__2;
 lean_object* l_Lean_ParserDescr_many(uint8_t, lean_object*);
@@ -121,6 +126,7 @@ lean_object* l_Substring_takeWhileAux___main___at___private_Init_LeanInit_13__de
 lean_object* l_Lean_mkAppStx___closed__7;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_isSubScriptAlnum___boxed(lean_object*);
+lean_object* l_Array_mapSepElems(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_4__extractMainModule___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___at_Array_getSepElems___spec__1(lean_object*);
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
@@ -131,17 +137,20 @@ lean_object* l_Lean_Name_hashable;
 lean_object* l_Lean_mkTermIdFromIdent___closed__2;
 lean_object* l_Lean_Syntax_isSimpleTermId_x3f(lean_object*, uint8_t);
 lean_object* lean_string_utf8_next(lean_object*, lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___boxed(lean_object*);
 lean_object* l_Lean_Syntax_strLitToAtom(lean_object*);
 lean_object* l_Lean_Syntax_isLit_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_hasArgs___boxed(lean_object*);
 lean_object* l_Lean_mkStxNumLit(lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescrCore_inhabited(uint8_t);
 lean_object* l_Lean_Name_HasAppend___closed__1;
+lean_object* l_Array_mapSepElems___boxed(lean_object*, lean_object*);
 uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
 lean_object* l_Lean_MacroM_monadQuotation___lambda__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isLit_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_termIdToAntiquot___closed__4;
 lean_object* l_Lean_ParserDescr_many1(uint8_t, lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Array_mapSepElems___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isCharLit_x3f(lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNatLit_x3f(lean_object*);
@@ -152,6 +161,7 @@ lean_object* l_Lean_numLitKind;
 lean_object* l_Lean_ParserDescr_many___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_choiceKind___closed__1;
 lean_object* l___private_Init_LeanInit_7__decodeOctalLitAux___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_mapSepElemsM(lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_choiceKind___closed__2;
 lean_object* l_Lean_MacroM_monadQuotation___lambda__2___boxed(lean_object*);
@@ -178,6 +188,7 @@ lean_object* l_Lean_numLitKind___closed__1;
 lean_object* l_Lean_NameGenerator_next(lean_object*);
 lean_object* l_Lean_Syntax_decodeCharLit___boxed(lean_object*);
 lean_object* l___private_Init_LeanInit_1__eraseMacroScopesAux(lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_strLitKind___closed__1;
 lean_object* l___private_Init_LeanInit_12__decodeQuotedChar___boxed__const__5;
 lean_object* l_Lean_Syntax_isNatLitAux___boxed(lean_object*, lean_object*);
@@ -193,6 +204,7 @@ lean_object* l_Lean_NameGenerator_Inhabited___closed__1;
 size_t l_Lean_Name_hash(lean_object*);
 lean_object* l_Lean_ParserDescr_parser(uint8_t, lean_object*, lean_object*);
 lean_object* l_Nat_repr(lean_object*);
+lean_object* l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_HasToString;
 lean_object* l___private_Init_LeanInit_13__decodeNameLitAux___main___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescr_lookahead___boxed(lean_object*, lean_object*);
@@ -206,6 +218,7 @@ lean_object* l_Lean_ParserDescr_andthen(uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescr_charLit___boxed(lean_object*);
 lean_object* l___private_Init_LeanInit_6__decodeBinLitAux___main___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescr_symbol___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findSomeMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_9__decodeHexLitAux___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_numLitKind___closed__2;
 lean_object* l_Lean_ParserDescr_node(uint8_t, lean_object*, lean_object*);
@@ -272,6 +285,7 @@ lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l_Lean_MacroScopesView_review(lean_object*);
 lean_object* l_Lean_Syntax_getArg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_filterSepElems(lean_object*, lean_object*);
+lean_object* l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_identToAtom(lean_object*);
 lean_object* l_Lean_Name_Name_beq___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getHeadInfo___boxed(lean_object*);
@@ -282,6 +296,7 @@ extern lean_object* l___private_Init_Util_1__mkPanicMessage___closed__2;
 lean_object* l___private_Init_LeanInit_7__decodeOctalLitAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_NameGenerator_curr(lean_object*);
 lean_object* l_Lean_Syntax_isTermId_x3f___boxed(lean_object*, lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNameLit_x3f___boxed(lean_object*);
 lean_object* l___private_Init_LeanInit_12__decodeQuotedChar___boxed__const__2;
 lean_object* l_Lean_mkHole___closed__1;
@@ -326,11 +341,13 @@ lean_object* l_Lean_Macro_throwUnsupported(lean_object*, lean_object*);
 lean_object* lean_mk_syntax_ident(lean_object*);
 lean_object* l_Lean_mkStxLit(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Array_mapSepElems___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_toNat(lean_object*);
 lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main(lean_object*);
 lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Lean_Syntax_getOptional_x3f___boxed(lean_object*);
 lean_object* l_Lean_mkCIdentFrom___closed__2;
+lean_object* lean_nat_mod(lean_object*, lean_object*);
 lean_object* l_Lean_Name_eraseMacroScopes___boxed(lean_object*);
 lean_object* l_Lean_mkCTermIdFrom(lean_object*, lean_object*);
 lean_object* l_Substring_takeWhileAux___main___at___private_Init_LeanInit_13__decodeNameLitAux___main___spec__2___boxed(lean_object*, lean_object*, lean_object*);
@@ -371,6 +388,7 @@ lean_object* l___private_Init_LeanInit_14__filterSepElemsMAux___main___rarg(lean
 uint8_t l_Lean_isIdRest(uint32_t);
 lean_object* l_Lean_NameGenerator_Inhabited___closed__3;
 lean_object* l_Lean_Syntax_isIdent___boxed(lean_object*);
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MacroM_monadQuotation___closed__4;
 lean_object* l_Lean_nameLitKind___closed__1;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
@@ -2248,7 +2266,7 @@ lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
@@ -2300,7 +2318,7 @@ case 1:
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_unsigned_to_nat(0u);
-x_5 = l_Array_findMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(x_3, x_4);
+x_5 = l_Array_findSomeMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(x_3, x_4);
 return x_5;
 }
 default: 
@@ -2313,11 +2331,11 @@ return x_6;
 }
 }
 }
-lean_object* l_Array_findMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_findSomeMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Array_findMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(x_1, x_2);
+x_3 = l_Array_findSomeMAux___main___at_Lean_Syntax_getHeadInfo___main___spec__1(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
@@ -6498,6 +6516,250 @@ lean_dec(x_1);
 return x_3;
 }
 }
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_7 = lean_unsigned_to_nat(1u);
+x_8 = lean_nat_add(x_1, x_7);
+x_9 = lean_array_push(x_2, x_6);
+x_10 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg(x_3, x_4, x_5, x_8, x_9);
+return x_10;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_get_size(x_2);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_8 = lean_ctor_get(x_1, 0);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = lean_apply_2(x_9, lean_box(0), x_5);
+return x_10;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_11 = lean_array_fget(x_2, x_4);
+x_12 = lean_unsigned_to_nat(2u);
+x_13 = lean_nat_mod(x_4, x_12);
+x_14 = lean_unsigned_to_nat(0u);
+x_15 = lean_nat_dec_eq(x_13, x_14);
+lean_dec(x_13);
+if (x_15 == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_unsigned_to_nat(1u);
+x_17 = lean_nat_add(x_4, x_16);
+lean_dec(x_4);
+x_18 = lean_array_push(x_5, x_11);
+x_4 = x_17;
+x_5 = x_18;
+goto _start;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_1, 1);
+lean_inc(x_20);
+lean_inc(x_3);
+x_21 = lean_apply_1(x_3, x_11);
+x_22 = lean_alloc_closure((void*)(l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_22, 0, x_4);
+lean_closure_set(x_22, 1, x_5);
+lean_closure_set(x_22, 2, x_1);
+lean_closure_set(x_22, 3, x_2);
+lean_closure_set(x_22, 4, x_3);
+x_23 = lean_apply_4(x_20, lean_box(0), lean_box(0), x_21, x_22);
+return x_23;
+}
+}
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg), 5, 0);
+return x_2;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___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) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l___private_Init_LeanInit_15__mapSepElemsMAux___main(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg(x_1, x_2, x_3, x_4, x_5);
+return x_6;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Init_LeanInit_15__mapSepElemsMAux___rarg), 5, 0);
+return x_2;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l___private_Init_LeanInit_15__mapSepElemsMAux(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l_Array_mapSepElemsM___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = l_Array_empty___closed__1;
+x_6 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___rarg(x_1, x_2, x_3, x_4, x_5);
+return x_6;
+}
+}
+lean_object* l_Array_mapSepElemsM(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_mapSepElemsM___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Array_mapSepElemsM___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Array_mapSepElemsM(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Array_mapSepElems___spec__2(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_array_get_size(x_1);
+x_6 = lean_nat_dec_lt(x_3, x_5);
+lean_dec(x_5);
+if (x_6 == 0)
+{
+lean_dec(x_3);
+lean_dec(x_2);
+return x_4;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_7 = lean_array_fget(x_1, x_3);
+x_8 = lean_unsigned_to_nat(2u);
+x_9 = lean_nat_mod(x_3, x_8);
+x_10 = lean_unsigned_to_nat(0u);
+x_11 = lean_nat_dec_eq(x_9, x_10);
+lean_dec(x_9);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_3, x_12);
+lean_dec(x_3);
+x_14 = lean_array_push(x_4, x_7);
+x_3 = x_13;
+x_4 = x_14;
+goto _start;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+lean_inc(x_2);
+x_16 = lean_apply_1(x_2, x_7);
+x_17 = lean_unsigned_to_nat(1u);
+x_18 = lean_nat_add(x_3, x_17);
+lean_dec(x_3);
+x_19 = lean_array_push(x_4, x_16);
+x_3 = x_18;
+x_4 = x_19;
+goto _start;
+}
+}
+}
+}
+lean_object* l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_3 = lean_unsigned_to_nat(0u);
+x_4 = l_Array_empty___closed__1;
+x_5 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Array_mapSepElems___spec__2(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
+lean_object* l_Array_mapSepElems(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Array_mapSepElems___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Init_LeanInit_15__mapSepElemsMAux___main___at_Array_mapSepElems___spec__2(x_1, x_2, x_3, x_4);
+lean_dec(x_1);
+return x_5;
+}
+}
+lean_object* l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_mapSepElemsM___at_Array_mapSepElems___spec__1(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_Array_mapSepElems___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_mapSepElems(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
 lean_object* initialize_Init_Data_String_Basic(lean_object*);
 lean_object* initialize_Init_Data_Array_Basic(lean_object*);
 lean_object* initialize_Init_Data_UInt(lean_object*);