From 14fdb793f7bdc7358e2ff3bfbe536e7e2d4a32ee Mon Sep 17 00:00:00 2001
From: Sebastian Ullrich <sebasti@nullri.ch>
Date: Thu, 21 Oct 2021 22:11:27 +0200
Subject: [PATCH] chore: update stage0

---
 stage0/src/Init/Data/Array/Basic.lean         |    9 +-
 stage0/src/Init/Data/ByteArray/Basic.lean     |  102 +-
 stage0/src/Init/Data/FloatArray/Basic.lean    |  102 +-
 stage0/src/Init/Data/Hashable.lean            |    6 +
 stage0/src/Init/Data/Nat/Basic.lean           |   23 +-
 stage0/src/Lean/Attributes.lean               |   82 +-
 stage0/src/Lean/Elab/Match.lean               |    2 -
 .../Elab/PreDefinition/Structural/BRecOn.lean |    2 +-
 .../src/Lean/Elab/PreDefinition/WF/Fix.lean   |    2 +-
 .../src/Lean/Elab/PreDefinition/WF/Main.lean  |    8 +
 stage0/src/Lean/Elab/Syntax.lean              |    6 +-
 stage0/src/Lean/Environment.lean              |   11 +-
 stage0/src/Lean/Expr.lean                     |    9 +
 .../src/Lean/Meta/AbstractNestedProofs.lean   |    4 +-
 stage0/src/Lean/Meta/ExprDefEq.lean           |   51 +-
 stage0/src/Lean/Meta/Match/Basic.lean         |    9 -
 stage0/src/Lean/Meta/Tactic/Cleanup.lean      |    2 +-
 stage0/src/Lean/Meta/Tactic/Simp/Rewrite.lean |    1 +
 stage0/src/Lean/Parser/Syntax.lean            |    4 +-
 .../PrettyPrinter/Delaborator/Builtins.lean   |    2 +-
 stage0/src/Lean/Server/FileWorker.lean        |    5 +-
 stage0/src/include/lean/lean.h                |   75 +-
 stage0/src/runtime/compact.cpp                |    2 +-
 stage0/src/runtime/hash.cpp                   |    2 +-
 stage0/src/runtime/hash.h                     |    2 +-
 stage0/src/runtime/object.cpp                 |    2 +-
 stage0/src/runtime/sharecommon.cpp            |    2 +-
 stage0/src/shell/CMakeLists.txt               |    8 +
 stage0/stdlib/Init/Data/Array/Basic.c         |  282 +-
 stage0/stdlib/Init/Data/ByteArray/Basic.c     |  782 ++++-
 stage0/stdlib/Init/Data/FloatArray/Basic.c    |  753 ++++
 stage0/stdlib/Init/Data/Hashable.c            |   44 +
 stage0/stdlib/Lean/Attributes.c               |  279 +-
 stage0/stdlib/Lean/Elab/Match.c               |   78 +-
 .../Elab/PreDefinition/Structural/BRecOn.c    |   69 +-
 .../stdlib/Lean/Elab/PreDefinition/WF/Fix.c   |   69 +-
 .../stdlib/Lean/Elab/PreDefinition/WF/Main.c  |  366 +-
 stage0/stdlib/Lean/Elab/Syntax.c              |  216 +-
 stage0/stdlib/Lean/Environment.c              | 1415 +++++---
 stage0/stdlib/Lean/Expr.c                     |   54 +
 .../stdlib/Lean/Meta/AbstractNestedProofs.c   |    7 +-
 stage0/stdlib/Lean/Meta/ExprDefEq.c           | 3045 ++++++++---------
 stage0/stdlib/Lean/Meta/Match/Basic.c         |   62 +-
 stage0/stdlib/Lean/Meta/Tactic/Cleanup.c      |  518 +--
 stage0/stdlib/Lean/Meta/Tactic/Simp/Rewrite.c |  884 ++---
 stage0/stdlib/Lean/Parser/Syntax.c            |  374 +-
 .../Lean/PrettyPrinter/Delaborator/Builtins.c |    4 +-
 stage0/stdlib/Lean/Server/FileWorker.c        |  168 +-
 48 files changed, 6394 insertions(+), 3610 deletions(-)

diff --git a/stage0/src/Init/Data/Array/Basic.lean b/stage0/src/Init/Data/Array/Basic.lean
index 7ca753ad51..86765aa384 100644
--- a/stage0/src/Init/Data/Array/Basic.lean
+++ b/stage0/src/Init/Data/Array/Basic.lean
@@ -139,13 +139,6 @@ def modifyOp [Inhabited α] (self : Array α) (idx : Nat) (f : α → α) : Arra
       pure b
   loop 0 b
 
--- Move?
-private theorem zero_lt_of_lt : {a b : Nat} → a < b → 0 < b
-  | 0,   _, h => h
-  | a+1, b, h =>
-    have : a < b := Nat.lt_trans (Nat.lt_succ_self _) h
-    zero_lt_of_lt this
-
 /- Reference implementation for `forIn` -/
 @[implementedBy Array.forInUnsafe]
 protected def forIn {α : Type u} {β : Type v} {m : Type v → Type w} [Monad m] (as : Array α) (b : β) (f : α → β → m (ForInStep β)) : m β :=
@@ -154,7 +147,7 @@ protected def forIn {α : Type u} {β : Type v} {m : Type v → Type w} [Monad m
     | 0,   _ => pure b
     | i+1, h =>
       have h' : i < as.size            := Nat.lt_of_lt_of_le (Nat.lt_succ_self i) h
-      have : as.size - 1 < as.size     := Nat.sub_lt (zero_lt_of_lt h') (by decide)
+      have : as.size - 1 < as.size     := Nat.sub_lt (Nat.zero_lt_of_lt h') (by decide)
       have : as.size - 1 - i < as.size := Nat.lt_of_le_of_lt (Nat.sub_le (as.size - 1) i) this
       match (← f (as.get ⟨as.size - 1 - i, this⟩) b) with
       | ForInStep.done b  => pure b
diff --git a/stage0/src/Init/Data/ByteArray/Basic.lean b/stage0/src/Init/Data/ByteArray/Basic.lean
index 52437a6f88..a3d4e95c14 100644
--- a/stage0/src/Init/Data/ByteArray/Basic.lean
+++ b/stage0/src/Init/Data/ByteArray/Basic.lean
@@ -23,7 +23,11 @@ def mkEmpty (c : @& Nat) : ByteArray :=
 
 def empty : ByteArray := mkEmpty 0
 
-instance : Inhabited ByteArray := ⟨empty⟩
+instance : Inhabited ByteArray where
+  default := empty
+
+instance : EmptyCollection ByteArray where
+  emptyCollection := ByteArray.empty
 
 @[extern "lean_byte_array_push"]
 def push : ByteArray → UInt8 → ByteArray
@@ -33,14 +37,33 @@ def push : ByteArray → UInt8 → ByteArray
 def size : (@& ByteArray) → Nat
   | ⟨bs⟩ => bs.size
 
+@[extern "lean_byte_array_uget"]
+def uget : (a : @& ByteArray) → (i : USize) → i.toNat < a.size → UInt8
+  | ⟨bs⟩, i, h => bs.uget i h
+
 @[extern "lean_byte_array_get"]
 def get! : (@& ByteArray) → (@& Nat) → UInt8
   | ⟨bs⟩, i => bs.get! i
 
+@[extern "lean_byte_array_fget"]
+def get : (a : @& ByteArray) → (@& Fin a.size) → UInt8
+  | ⟨bs⟩, i => bs.get i
+
+@[inline] def getOp (self : ByteArray) (idx : Nat) : UInt8 :=
+  self.get! idx
+
 @[extern "lean_byte_array_set"]
 def set! : ByteArray → (@& Nat) → UInt8 → ByteArray
   | ⟨bs⟩, i, b => ⟨bs.set! i b⟩
 
+@[extern "lean_byte_array_fset"]
+def set : (a : ByteArray) → (@& Fin a.size) → UInt8 → ByteArray
+  | ⟨bs⟩, i, b => ⟨bs.set i b⟩
+
+@[extern "lean_byte_array_uset"]
+def uset : (a : ByteArray) → (i : USize) → UInt8 → i.toNat < a.size → ByteArray
+  | ⟨bs⟩, i, v, h => ⟨bs.uset i v h⟩
+
 def isEmpty (s : ByteArray) : Bool :=
   s.size == 0
 
@@ -76,6 +99,83 @@ partial def toList (bs : ByteArray) : List UInt8 :=
       none
   loop start
 
+/-
+  We claim this unsafe implementation is correct because an array cannot have more than `usizeSz` elements in our runtime.
+  This is similar to the `Array` version.
+
+  TODO: avoid code duplication in the future after we improve the compiler.
+-/
+@[inline] unsafe def forInUnsafe {β : Type v} {m : Type v → Type w} [Monad m] (as : ByteArray) (b : β) (f : UInt8 → β → m (ForInStep β)) : m β :=
+  let sz := USize.ofNat as.size
+  let rec @[specialize] loop (i : USize) (b : β) : m β := do
+    if i < sz then
+      let a := as.uget i lcProof
+      match (← f a b) with
+      | ForInStep.done  b => pure b
+      | ForInStep.yield b => loop (i+1) b
+    else
+      pure b
+  loop 0 b
+
+/- Reference implementation for `forIn` -/
+@[implementedBy ByteArray.forInUnsafe]
+protected def forIn {β : Type v} {m : Type v → Type w} [Monad m] (as : ByteArray) (b : β) (f : UInt8 → β → m (ForInStep β)) : m β :=
+  let rec loop (i : Nat) (h : i ≤ as.size) (b : β) : m β := do
+    match i, h with
+    | 0,   _ => pure b
+    | i+1, h =>
+      have h' : i < as.size            := Nat.lt_of_lt_of_le (Nat.lt_succ_self i) h
+      have : as.size - 1 < as.size     := Nat.sub_lt (Nat.zero_lt_of_lt h') (by decide)
+      have : as.size - 1 - i < as.size := Nat.lt_of_le_of_lt (Nat.sub_le (as.size - 1) i) this
+      match (← f (as.get ⟨as.size - 1 - i, this⟩) b) with
+      | ForInStep.done b  => pure b
+      | ForInStep.yield b => loop i (Nat.le_of_lt h') b
+  loop as.size (Nat.le_refl _) b
+
+instance : ForIn m ByteArray UInt8 where
+  forIn := ByteArray.forIn
+
+/-
+  See comment at forInUnsafe
+  TODO: avoid code duplication.
+-/
+@[inline]
+unsafe def foldlMUnsafe {β : Type v} {m : Type v → Type w} [Monad m] (f : β → UInt8 → m β) (init : β) (as : ByteArray) (start := 0) (stop := as.size) : m β :=
+  let rec @[specialize] fold (i : USize) (stop : USize) (b : β) : m β := do
+    if i == stop then
+      pure b
+    else
+      fold (i+1) stop (← f b (as.uget i lcProof))
+  if start < stop then
+    if stop ≤ as.size then
+      fold (USize.ofNat start) (USize.ofNat stop) init
+    else
+      pure init
+  else
+    pure init
+
+/- Reference implementation for `foldlM` -/
+@[implementedBy foldlMUnsafe]
+def foldlM {β : Type v} {m : Type v → Type w} [Monad m] (f : β → UInt8 → m β) (init : β) (as : ByteArray) (start := 0) (stop := as.size) : m β :=
+  let fold (stop : Nat) (h : stop ≤ as.size) :=
+    let rec loop (i : Nat) (j : Nat) (b : β) : m β := do
+      if hlt : j < stop then
+        match i with
+        | 0    => pure b
+        | i'+1 =>
+          loop i' (j+1) (← f b (as.get ⟨j, Nat.lt_of_lt_of_le hlt h⟩))
+      else
+        pure b
+    loop (stop - start) start init
+  if h : stop ≤ as.size then
+    fold stop h
+  else
+    fold as.size (Nat.le_refl _)
+
+@[inline]
+def foldl {β : Type v} (f : β → UInt8 → β) (init : β) (as : ByteArray) (start := 0) (stop := as.size) : β :=
+  Id.run <| as.foldlM f init start stop
+
 end ByteArray
 
 def List.toByteArray (bs : List UInt8) : ByteArray :=
diff --git a/stage0/src/Init/Data/FloatArray/Basic.lean b/stage0/src/Init/Data/FloatArray/Basic.lean
index 2c56cee764..f9b5a1b9bd 100644
--- a/stage0/src/Init/Data/FloatArray/Basic.lean
+++ b/stage0/src/Init/Data/FloatArray/Basic.lean
@@ -23,7 +23,11 @@ def mkEmpty (c : @& Nat) : FloatArray :=
 def empty : FloatArray :=
   mkEmpty 0
 
-instance : Inhabited FloatArray := ⟨empty⟩
+instance : Inhabited FloatArray where
+  default := empty
+
+instance : EmptyCollection FloatArray where
+  emptyCollection := FloatArray.empty
 
 @[extern "lean_float_array_push"]
 def push : FloatArray → Float → FloatArray
@@ -33,9 +37,12 @@ def push : FloatArray → Float → FloatArray
 def size : (@& FloatArray) → Nat
   | ⟨ds⟩ => ds.size
 
+@[extern "lean_float_array_uget"]
+def uget : (a : @& FloatArray) → (i : USize) → i.toNat < a.size → Float
+  | ⟨ds⟩, i, h => ds.uget i h
+
 @[extern "lean_float_array_fget"]
-def get (ds : @& FloatArray) (i : @& Fin ds.size) : Float :=
-  match ds, i with
+def get : (ds : @& FloatArray) → (@& Fin ds.size) → Float
   | ⟨ds⟩, i => ds.get i
 
 @[extern "lean_float_array_get"]
@@ -48,10 +55,16 @@ def get? (ds : FloatArray) (i : Nat) : Option Float :=
   else
     none
 
+@[inline] def getOp (self : FloatArray) (idx : Nat) : Float :=
+  self.get! idx
+
+@[extern "lean_float_array_uset"]
+def uset : (a : FloatArray) → (i : USize) → Float → i.toNat < a.size → FloatArray
+  | ⟨ds⟩, i, v, h => ⟨ds.uset i v h⟩
+
 @[extern "lean_float_array_fset"]
-def set (ds : FloatArray) (i : @& Fin ds.size) (d : Float) : FloatArray :=
-  match ds, i with
-  | ⟨ds⟩, i=> ⟨ds.set i d⟩
+def set : (ds : FloatArray) → (@& Fin ds.size) → Float → FloatArray
+  | ⟨ds⟩, i, d => ⟨ds.set i d⟩
 
 @[extern "lean_float_array_set"]
 def set! : FloatArray → (@& Nat) → Float → FloatArray
@@ -68,6 +81,83 @@ partial def toList (ds : FloatArray) : List Float :=
       r.reverse
   loop 0 []
 
+/-
+  We claim this unsafe implementation is correct because an array cannot have more than `usizeSz` elements in our runtime.
+  This is similar to the `Array` version.
+
+  TODO: avoid code duplication in the future after we improve the compiler.
+-/
+@[inline] unsafe def forInUnsafe {β : Type v} {m : Type v → Type w} [Monad m] (as : FloatArray) (b : β) (f : Float → β → m (ForInStep β)) : m β :=
+  let sz := USize.ofNat as.size
+  let rec @[specialize] loop (i : USize) (b : β) : m β := do
+    if i < sz then
+      let a := as.uget i lcProof
+      match (← f a b) with
+      | ForInStep.done  b => pure b
+      | ForInStep.yield b => loop (i+1) b
+    else
+      pure b
+  loop 0 b
+
+/- Reference implementation for `forIn` -/
+@[implementedBy FloatArray.forInUnsafe]
+protected def forIn {β : Type v} {m : Type v → Type w} [Monad m] (as : FloatArray) (b : β) (f : Float → β → m (ForInStep β)) : m β :=
+  let rec loop (i : Nat) (h : i ≤ as.size) (b : β) : m β := do
+    match i, h with
+    | 0,   _ => pure b
+    | i+1, h =>
+      have h' : i < as.size            := Nat.lt_of_lt_of_le (Nat.lt_succ_self i) h
+      have : as.size - 1 < as.size     := Nat.sub_lt (Nat.zero_lt_of_lt h') (by decide)
+      have : as.size - 1 - i < as.size := Nat.lt_of_le_of_lt (Nat.sub_le (as.size - 1) i) this
+      match (← f (as.get ⟨as.size - 1 - i, this⟩) b) with
+      | ForInStep.done b  => pure b
+      | ForInStep.yield b => loop i (Nat.le_of_lt h') b
+  loop as.size (Nat.le_refl _) b
+
+instance : ForIn m FloatArray Float where
+  forIn := FloatArray.forIn
+
+/-
+  See comment at forInUnsafe
+  TODO: avoid code duplication.
+-/
+@[inline]
+unsafe def foldlMUnsafe {β : Type v} {m : Type v → Type w} [Monad m] (f : β → Float → m β) (init : β) (as : FloatArray) (start := 0) (stop := as.size) : m β :=
+  let rec @[specialize] fold (i : USize) (stop : USize) (b : β) : m β := do
+    if i == stop then
+      pure b
+    else
+      fold (i+1) stop (← f b (as.uget i lcProof))
+  if start < stop then
+    if stop ≤ as.size then
+      fold (USize.ofNat start) (USize.ofNat stop) init
+    else
+      pure init
+  else
+    pure init
+
+/- Reference implementation for `foldlM` -/
+@[implementedBy foldlMUnsafe]
+def foldlM {β : Type v} {m : Type v → Type w} [Monad m] (f : β → Float → m β) (init : β) (as : FloatArray) (start := 0) (stop := as.size) : m β :=
+  let fold (stop : Nat) (h : stop ≤ as.size) :=
+    let rec loop (i : Nat) (j : Nat) (b : β) : m β := do
+      if hlt : j < stop then
+        match i with
+        | 0    => pure b
+        | i'+1 =>
+          loop i' (j+1) (← f b (as.get ⟨j, Nat.lt_of_lt_of_le hlt h⟩))
+      else
+        pure b
+    loop (stop - start) start init
+  if h : stop ≤ as.size then
+    fold stop h
+  else
+    fold as.size (Nat.le_refl _)
+
+@[inline]
+def foldl {β : Type v} (f : β → Float → β) (init : β) (as : FloatArray) (start := 0) (stop := as.size) : β :=
+  Id.run <| as.foldlM f init start stop
+
 end FloatArray
 
 def List.toFloatArray (ds : List Float) : FloatArray :=
diff --git a/stage0/src/Init/Data/Hashable.lean b/stage0/src/Init/Data/Hashable.lean
index 931725006d..3f81ec033e 100644
--- a/stage0/src/Init/Data/Hashable.lean
+++ b/stage0/src/Init/Data/Hashable.lean
@@ -27,6 +27,12 @@ instance [Hashable α] : Hashable (Option α) where
 instance [Hashable α] : Hashable (List α) where
   hash as := as.foldl (fun r a => mixHash r (hash a)) 7
 
+instance : Hashable UInt8 where
+  hash n := n.toUInt64
+
+instance : Hashable UInt16 where
+  hash n := n.toUInt64
+
 instance : Hashable UInt32 where
   hash n := n.toUInt64
 
diff --git a/stage0/src/Init/Data/Nat/Basic.lean b/stage0/src/Init/Data/Nat/Basic.lean
index e49a40a613..0be29b289e 100644
--- a/stage0/src/Init/Data/Nat/Basic.lean
+++ b/stage0/src/Init/Data/Nat/Basic.lean
@@ -39,17 +39,16 @@ namespace Nat
     | succ n, a => loop n (f a)
   loop n a
 
+/- Helper "packing" theorems -/
+
+@[simp] theorem zero_eq : Nat.zero = 0 := rfl
+@[simp] theorem add_eq : Nat.add x y = x + y := rfl
+@[simp] theorem mul_eq : Nat.mul x y = x * y := rfl
+@[simp] theorem lt_eq : Nat.lt x y = (x < y) := rfl
+@[simp] theorem le_eq : Nat.le x y = (x ≤ y) := rfl
+
 /- Nat.add theorems -/
 
-@[simp] theorem zero_eq : Nat.zero = 0 :=
-  rfl
-
-@[simp] theorem add_eq : Nat.add x y = x + y :=
-  rfl
-
-@[simp] theorem lt_eq : Nat.lt x y = (x < y) :=
-  rfl
-
 @[simp] protected theorem zero_add : ∀ (n : Nat), 0 + n = n
   | 0   => rfl
   | n+1 => congrArg succ (Nat.zero_add n)
@@ -261,6 +260,12 @@ theorem lt_of_succ_le {n m : Nat} (h : succ n ≤ m) : n < m :=
 theorem succ_le_of_lt {n m : Nat} (h : n < m) : succ n ≤ m :=
   h
 
+theorem zero_lt_of_lt : {a b : Nat} → a < b → 0 < b
+  | 0,   _, h => h
+  | a+1, b, h =>
+    have : a < b := Nat.lt_trans (Nat.lt_succ_self _) h
+    zero_lt_of_lt this
+
 theorem lt_or_eq_or_le_succ {m n : Nat} (h : m ≤ succ n) : m ≤ n ∨ m = succ n :=
   Decidable.byCases
     (fun (h' : m = succ n) => Or.inr h')
diff --git a/stage0/src/Lean/Attributes.lean b/stage0/src/Lean/Attributes.lean
index 9b2bcd1c60..d0f3cc911b 100644
--- a/stage0/src/Lean/Attributes.lean
+++ b/stage0/src/Lean/Attributes.lean
@@ -126,18 +126,18 @@ structure TagAttribute where
 
 def registerTagAttribute (name : Name) (descr : String) (validate : Name → AttrM Unit := fun _ => pure ()) : IO TagAttribute := do
   let ext : PersistentEnvExtension Name Name NameSet ← registerPersistentEnvExtension {
-    name            := name,
-    mkInitial       := pure {},
-    addImportedFn   := fun _ _ => pure {},
-    addEntryFn      := fun (s : NameSet) n => s.insert n,
+    name            := name
+    mkInitial       := pure {}
+    addImportedFn   := fun _ _ => pure {}
+    addEntryFn      := fun (s : NameSet) n => s.insert n
     exportEntriesFn := fun es =>
       let r : Array Name := es.fold (fun a e => a.push e) #[]
-      r.qsort Name.quickLt,
+      r.qsort Name.quickLt
     statsFn         := fun s => "tag attribute" ++ Format.line ++ "number of local entries: " ++ format s.size
   }
   let attrImpl : AttributeImpl := {
-    name  := name,
-    descr := descr,
+    name  := name
+    descr := descr
     add   := fun decl stx kind => do
       Attribute.Builtin.ensureNoArgs stx
       unless kind == AttributeKind.global do throwError "invalid attribute '{name}', must be global"
@@ -149,7 +149,7 @@ def registerTagAttribute (name : Name) (descr : String) (validate : Name → Att
       setEnv $ ext.addEntry env decl
   }
   registerBuiltinAttribute attrImpl
-  pure { attr := attrImpl, ext := ext }
+  return { attr := attrImpl, ext := ext }
 
 namespace TagAttribute
 
@@ -178,13 +178,13 @@ structure ParametricAttributeImpl (α : Type) extends AttributeImplCore where
 
 def registerParametricAttribute {α : Type} [Inhabited α] (impl : ParametricAttributeImpl α) : IO (ParametricAttribute α) := do
   let ext : PersistentEnvExtension (Name × α) (Name × α) (NameMap α) ← registerPersistentEnvExtension {
-    name            := impl.name,
-    mkInitial       := pure {},
-    addImportedFn   := fun s => impl.afterImport s *> pure {},
-    addEntryFn      := fun (s : NameMap α) (p : Name × α) => s.insert p.1 p.2,
+    name            := impl.name
+    mkInitial       := pure {}
+    addImportedFn   := fun s => impl.afterImport s *> pure {}
+    addEntryFn      := fun (s : NameMap α) (p : Name × α) => s.insert p.1 p.2
     exportEntriesFn := fun m =>
       let r : Array (Name × α) := m.fold (fun a n p => a.push (n, p)) #[]
-      r.qsort (fun a b => Name.quickLt a.1 b.1),
+      r.qsort (fun a b => Name.quickLt a.1 b.1)
     statsFn         := fun s => "parametric attribute" ++ Format.line ++ "number of local entries: " ++ format s.size
   }
   let attrImpl : AttributeImpl := {
@@ -236,18 +236,18 @@ def registerEnumAttributes {α : Type} [Inhabited α] (extName : Name) (attrDesc
     (validate : Name → α → AttrM Unit := fun _ _ => pure ())
     (applicationTime := AttributeApplicationTime.afterTypeChecking) : IO (EnumAttributes α) := do
   let ext : PersistentEnvExtension (Name × α) (Name × α) (NameMap α) ← registerPersistentEnvExtension {
-    name            := extName,
-    mkInitial       := pure {},
-    addImportedFn   := fun _ _ => pure {},
-    addEntryFn      := fun (s : NameMap α) (p : Name × α) => s.insert p.1 p.2,
+    name            := extName
+    mkInitial       := pure {}
+    addImportedFn   := fun _ _ => pure {}
+    addEntryFn      := fun (s : NameMap α) (p : Name × α) => s.insert p.1 p.2
     exportEntriesFn := fun m =>
       let r : Array (Name × α) := m.fold (fun a n p => a.push (n, p)) #[]
-      r.qsort (fun a b => Name.quickLt a.1 b.1),
+      r.qsort (fun a b => Name.quickLt a.1 b.1)
     statsFn         := fun s => "enumeration attribute extension" ++ Format.line ++ "number of local entries: " ++ format s.size
   }
   let attrs := attrDescrs.map fun (name, descr, val) => {
-    name            := name,
-    descr           := descr,
+    name            := name
+    descr           := descr
     add             := fun decl stx kind => do
       Attribute.Builtin.ensureNoArgs stx
       unless kind == AttributeKind.global do throwError "invalid attribute '{name}', must be global"
@@ -255,7 +255,7 @@ def registerEnumAttributes {α : Type} [Inhabited α] (extName : Name) (attrDesc
       unless (env.getModuleIdxFor? decl).isNone do
         throwError "invalid attribute '{name}', declaration is in an imported module"
       validate decl val
-      setEnv $ ext.addEntry env (decl, val),
+      setEnv $ ext.addEntry env (decl, val)
     applicationTime := applicationTime
     : AttributeImpl
   }
@@ -351,11 +351,11 @@ private def addAttrEntry (s : AttributeExtensionState) (e : AttributeExtensionOL
 
 builtin_initialize attributeExtension : AttributeExtension ←
   registerPersistentEnvExtension {
-    name            := `attrExt,
-    mkInitial       := AttributeExtension.mkInitial,
-    addImportedFn   := AttributeExtension.addImported,
-    addEntryFn      := addAttrEntry,
-    exportEntriesFn := fun s => s.newEntries.reverse.toArray,
+    name            := `attrExt
+    mkInitial       := AttributeExtension.mkInitial
+    addImportedFn   := AttributeExtension.addImported
+    addEntryFn      := addAttrEntry
+    exportEntriesFn := fun s => s.newEntries.reverse.toArray
     statsFn         := fun s => format "number of local entries: " ++ format s.newEntries.length
   }
 
@@ -397,14 +397,14 @@ def registerAttributeOfDecl (env : Environment) (opts : Options) (attrDeclName :
   if isAttribute env attrImpl.name then
     throw ("invalid builtin attribute declaration, '" ++ toString attrImpl.name ++ "' has already been used")
   else
-    pure $ attributeExtension.addEntry env (AttributeExtensionOLeanEntry.decl attrDeclName, attrImpl)
+    return attributeExtension.addEntry env (AttributeExtensionOLeanEntry.decl attrDeclName, attrImpl)
 
 def registerAttributeOfBuilder (env : Environment) (builderId : Name) (args : List DataValue) : IO Environment := do
   let attrImpl ← mkAttributeImplOfBuilder builderId args
   if isAttribute env attrImpl.name then
     throw (IO.userError ("invalid builtin attribute declaration, '" ++ toString attrImpl.name ++ "' has already been used"))
   else
-    pure $ attributeExtension.addEntry env (AttributeExtensionOLeanEntry.builder builderId args, attrImpl)
+    return attributeExtension.addEntry env (AttributeExtensionOLeanEntry.builder builderId args, attrImpl)
 
 def Attribute.add (declName : Name) (attrName : Name) (stx : Syntax) (kind := AttributeKind.global) : AttrM Unit := do
   let attr ← ofExcept <| getAttributeImpl (← getEnv) attrName
@@ -414,16 +414,20 @@ def Attribute.erase (declName : Name) (attrName : Name) : AttrM Unit := do
   let attr ← ofExcept <| getAttributeImpl (← getEnv) attrName
   attr.erase declName
 
-builtin_initialize
-  -- See comment at `updateEnvAttributesRef`
-  updateEnvAttributesRef.set fun env => do
-    let map ← attributeMapRef.get
-    let s ← attributeExtension.getState env
-    let s := map.foldl (init := s) fun s attrName attrImpl =>
-      if s.map.contains attrName then
-        s
-      else
-        { s with map := s.map.insert attrName attrImpl }
-    return attributeExtension.setState env s
+/-- `updateEnvAttributes` implementation -/
+@[export lean_update_env_attributes]
+def updateEnvAttributesImpl (env : Environment) : IO Environment := do
+  let map ← attributeMapRef.get
+  let s ← attributeExtension.getState env
+  let s := map.foldl (init := s) fun s attrName attrImpl =>
+    if s.map.contains attrName then
+      s
+    else
+      { s with map := s.map.insert attrName attrImpl }
+  return attributeExtension.setState env s
+
+/-- `getNumBuiltinAttributes` implementation -/
+@[export lean_get_num_attributes] def getNumBuiltiAttributesImpl : IO Nat :=
+  return (← attributeMapRef.get).size
 
 end Lean
diff --git a/stage0/src/Lean/Elab/Match.lean b/stage0/src/Lean/Elab/Match.lean
index b7c1f5c08a..266d5149ae 100644
--- a/stage0/src/Lean/Elab/Match.lean
+++ b/stage0/src/Lean/Elab/Match.lean
@@ -174,8 +174,6 @@ private def getMatchAlts : Syntax → Array MatchAltView
 
 builtin_initialize Parser.registerBuiltinNodeKind `MVarWithIdKind
 
-open Meta.Match (mkInaccessible inaccessible?)
-
 /--
   The elaboration function for `Syntax` created using `mkMVarSyntax`.
   It just converts the metavariable id wrapped by the Syntax into an `Expr`. -/
diff --git a/stage0/src/Lean/Elab/PreDefinition/Structural/BRecOn.lean b/stage0/src/Lean/Elab/PreDefinition/Structural/BRecOn.lean
index 7ded2ff237..39479ff6be 100644
--- a/stage0/src/Lean/Elab/PreDefinition/Structural/BRecOn.lean
+++ b/stage0/src/Lean/Elab/PreDefinition/Structural/BRecOn.lean
@@ -90,7 +90,7 @@ private partial def replaceRecApps (recFnName : Name) (recArgInfo : RecArgInfo)
         mkForallFVars #[x] (← loop below (b.instantiate1 x))
     | Expr.letE n type val body _ =>
       withLetDecl n (← loop below type) (← loop below val) fun x => do
-        mkLetFVars #[x] (← loop below (body.instantiate1 x))
+        mkLetFVars #[x] (← loop below (body.instantiate1 x)) (usedLetOnly := false)
     | Expr.mdata d e _   => return mkMData d (← loop below e)
     | Expr.proj n i e _  => return mkProj n i (← loop below e)
     | Expr.app _ _ _ =>
diff --git a/stage0/src/Lean/Elab/PreDefinition/WF/Fix.lean b/stage0/src/Lean/Elab/PreDefinition/WF/Fix.lean
index 10c9b07d32..0526170688 100644
--- a/stage0/src/Lean/Elab/PreDefinition/WF/Fix.lean
+++ b/stage0/src/Lean/Elab/PreDefinition/WF/Fix.lean
@@ -43,7 +43,7 @@ private partial def replaceRecApps (recFnName : Name) (decrTactic? : Option Synt
         mkForallFVars #[x] (← loop F (b.instantiate1 x))
     | Expr.letE n type val body _ =>
       withLetDecl n (← loop F type) (← loop F val) fun x => do
-        mkLetFVars #[x] (← loop F (body.instantiate1 x))
+        mkLetFVars #[x] (← loop F (body.instantiate1 x)) (usedLetOnly := false)
     | Expr.mdata d e _   => return mkMData d (← loop F e)
     | Expr.proj n i e _  => return mkProj n i (← loop F e)
     | Expr.app _ _ _ =>
diff --git a/stage0/src/Lean/Elab/PreDefinition/WF/Main.lean b/stage0/src/Lean/Elab/PreDefinition/WF/Main.lean
index eaf8d86202..a3b553d01b 100644
--- a/stage0/src/Lean/Elab/PreDefinition/WF/Main.lean
+++ b/stage0/src/Lean/Elab/PreDefinition/WF/Main.lean
@@ -14,7 +14,15 @@ namespace Lean.Elab
 open WF
 open Meta
 
+private def isOnlyOneUnaryDef (preDefs : Array PreDefinition) : MetaM Bool := do
+  if preDefs.size == 1 then
+    lambdaTelescope preDefs[0].value fun xs _ => return xs.size == 1
+  else
+    return false
+
 private partial def addNonRecPreDefs (preDefs : Array PreDefinition) (preDefNonRec : PreDefinition) : TermElabM Unit := do
+  if (← isOnlyOneUnaryDef preDefs) then
+    return ()
   let Expr.forallE _ domain _ _ ← preDefNonRec.type | unreachable!
   let us := preDefNonRec.levelParams.map mkLevelParam
   for fidx in [:preDefs.size] do
diff --git a/stage0/src/Lean/Elab/Syntax.lean b/stage0/src/Lean/Elab/Syntax.lean
index 5b74d6f5af..fc5f914441 100644
--- a/stage0/src/Lean/Elab/Syntax.lean
+++ b/stage0/src/Lean/Elab/Syntax.lean
@@ -183,9 +183,10 @@ where
     `(ParserDescr.sepBy1 $p $sep $psep $(quote allowTrailingSep))
 
   isValidAtom (s : String) : Bool :=
+    !s.isEmpty &&
     s[0] != '\'' &&
     s[0] != '\"' &&
-    s[0] != '`'  &&
+    !(s[0] == '`' && (s.bsize == 1 || isIdFirst s[1] || isIdBeginEscape s[1])) &&
     !s[0].isDigit
 
   processAtom (stx : Syntax) := do
@@ -342,8 +343,7 @@ def checkRuleKind (given expected : SyntaxNodeKind) : Bool :=
   given == expected || given == expected ++ `antiquot
 
 def inferMacroRulesAltKind : Syntax → CommandElabM SyntaxNodeKind
-  | `(matchAltExpr| | $pats,* => $rhs) => do
-    let pat := pats.elemsAndSeps[0]
+  | `(matchAltExpr| | $pat:term => $rhs) => do
     if !pat.isQuot then
       throwUnsupportedSyntax
     let quoted := getQuotContent pat
diff --git a/stage0/src/Lean/Environment.lean b/stage0/src/Lean/Environment.lean
index e87f555bbb..e4e4864ffb 100644
--- a/stage0/src/Lean/Environment.lean
+++ b/stage0/src/Lean/Environment.lean
@@ -569,7 +569,7 @@ private def setImportedEntries (env : Environment) (mods : Array ModuleData) (st
       env ← extDescr.toEnvExtension.modifyState env fun s => { s with importedEntries := s.importedEntries.push entries }
   return env
 
-/-
+/--
   "Forward declaration" needed for updating the attribute table with user-defined attributes.
   User-defined attributes are declared using the `initialize` command. The `initialize` command is just syntax sugar for the `init` attribute.
   The `init` attribute is initialized after the `attributeExtension` is initialized. We cannot change the order since the `init` attribute is an attribute,
@@ -578,7 +578,9 @@ private def setImportedEntries (env : Environment) (mods : Array ModuleData) (st
   When we a new user-defined attribute declaration is imported, `attributeMapRef` is updated.
   Later, we set this method with code that adds the user-defined attributes that were imported after we initialized `attributeExtension`.
 -/
-builtin_initialize updateEnvAttributesRef : IO.Ref (Environment → IO Environment) ← IO.mkRef (fun env => pure env)
+@[extern 2 "lean_update_env_attributes"] constant updateEnvAttributes : Environment → IO Environment
+/-- "Forward declaration" for retrieving the number of builtin attributes. -/
+@[extern 1 "lean_get_num_attributes"] constant getNumBuiltiAttributes : IO Nat
 
 private partial def finalizePersistentExtensions (env : Environment) (mods : Array ModuleData) (opts : Options) : IO Environment := do
   loop 0 env
@@ -590,16 +592,17 @@ where
       let extDescr := pExtDescrs[i]
       let s := extDescr.toEnvExtension.getState env
       let prevSize := (← persistentEnvExtensionsRef.get).size
+      let prevAttrSize ← getNumBuiltiAttributes
       let newState ← extDescr.addImportedFn s.importedEntries { env := env, opts := opts }
       let mut env ← extDescr.toEnvExtension.setState env { s with state := newState }
       env ← ensureExtensionsArraySize env
-      if (← persistentEnvExtensionsRef.get).size > prevSize then
+      if (← persistentEnvExtensionsRef.get).size > prevSize || (← getNumBuiltiAttributes) > prevAttrSize then
         -- This branch is executed when `pExtDescrs[i]` is the extension associated with the `init` attribute, and
         -- a user-defined persistent extension is imported.
         -- Thus, we invoke `setImportedEntries` to update the array `importedEntries` with the entries for the new extensions.
         env ← setImportedEntries env mods prevSize
         -- See comment at `updateEnvAttributesRef`
-        env ← (← updateEnvAttributesRef.get) env
+        env ← updateEnvAttributes env
       loop (i + 1) env
     else
       return env
diff --git a/stage0/src/Lean/Expr.lean b/stage0/src/Lean/Expr.lean
index e15fb72017..11b77283f8 100644
--- a/stage0/src/Lean/Expr.lean
+++ b/stage0/src/Lean/Expr.lean
@@ -1100,6 +1100,15 @@ def isLetFun (e : Expr) : Bool :=
   | none   => false
   | some e => e.isApp && e.appFn!.isLambda
 
+/--
+  Auxiliary annotation used to mark terms marked with the "inaccessible" annotation `.(t)` and
+  `_` in patterns. -/
+def mkInaccessible (e : Expr) : Expr :=
+  mkAnnotation `_inaccessible e
+
+def inaccessible? (e : Expr) : Option Expr :=
+  annotation? `_inaccessible e
+
 /--
   Annotate `e` with the LHS annotation. The delaborator displays
   expressions of the form `lhs = rhs` as `lhs` when they have this annotation.
diff --git a/stage0/src/Lean/Meta/AbstractNestedProofs.lean b/stage0/src/Lean/Meta/AbstractNestedProofs.lean
index de623639af..00c5fd1e96 100644
--- a/stage0/src/Lean/Meta/AbstractNestedProofs.lean
+++ b/stage0/src/Lean/Meta/AbstractNestedProofs.lean
@@ -54,8 +54,8 @@ partial def visit (e : Expr) : M Expr := do
       if (← isNonTrivialProof e) then
         mkAuxLemma e
       else match e with
-        | Expr.lam _ _ _ _     => lambdaLetTelescope e fun xs b => visitBinders xs do mkLambdaFVars xs (← visit b)
-        | Expr.letE _ _ _ _ _  => lambdaLetTelescope e fun xs b => visitBinders xs do mkLambdaFVars xs (← visit b)
+        | Expr.lam _ _ _ _     => lambdaLetTelescope e fun xs b => visitBinders xs do mkLambdaFVars xs (← visit b) (usedLetOnly := false)
+        | Expr.letE _ _ _ _ _  => lambdaLetTelescope e fun xs b => visitBinders xs do mkLambdaFVars xs (← visit b) (usedLetOnly := false)
         | Expr.forallE _ _ _ _ => forallTelescope e fun xs b => visitBinders xs do mkForallFVars xs (← visit b)
         | Expr.mdata _ b _     => return e.updateMData! (← visit b)
         | Expr.proj _ _ b _    => return e.updateProj! (← visit b)
diff --git a/stage0/src/Lean/Meta/ExprDefEq.lean b/stage0/src/Lean/Meta/ExprDefEq.lean
index f24df7da89..a3be35613b 100644
--- a/stage0/src/Lean/Meta/ExprDefEq.lean
+++ b/stage0/src/Lean/Meta/ExprDefEq.lean
@@ -885,9 +885,38 @@ private def processConstApprox (mvar : Expr) (numArgs : Nat) (v : Expr) : MetaM
   else
     pure false
 
+/--
+  Helper function for `processAssignment`. We used to eagerly consume
+  all metadata, but it was unnecessarily removing helpful annotations
+  for the pretty-printer. For example, consider the following example.
+  ```
+  constant p : Nat → Prop
+  constant q : Nat → Prop
+
+  theorem p_of_q : q x → p x := sorry
+
+  theorem pletfun : p (let_fun x := 0; x + 1) := by
+    -- ⊢ p (let_fun x := 0; x + 1)
+    apply p_of_q -- If we eagerly consume all metadata, the let_fun annotation is lost during `isDefEq`
+    -- ⊢ q ((fun x => x + 1) 0)
+    sorry
+  ```
+  However, the inaccessible pattern annotation must be consumed.
+  The frontend relies on the fact that is must be not propagated by `isDefEq`.
+  Thus, we consume it here. This is a bit hackish since it is very adhoc.
+  We might other annotations in the future that we should not preserve.
+  Perhaps, we should mark the annotation we do want to preserve ones
+  (e.g., hints for the pretty printer), and consume all other
+-/
+partial def consumeInaccessibleAnnotations (e : Expr) : Expr :=
+  match inaccessible? e with
+  | some e => consumeInaccessibleAnnotations e
+  | none   => e
+
 /-- Tries to solve `?m a₁ ... aₙ =?= v` by assigning `?m`.
     It assumes `?m` is unassigned. -/
 private partial def processAssignment (mvarApp : Expr) (v : Expr) : MetaM Bool :=
+  let v := consumeInaccessibleAnnotations v
   traceCtx `Meta.isDefEq.assign do
     trace[Meta.isDefEq.assign] "{mvarApp} := {v}"
     let mvar := mvarApp.getAppFn
@@ -1259,8 +1288,8 @@ private partial def isDefEqQuick (t s : Expr) : MetaM LBool :=
   | Expr.sort u _,       Expr.sort v _       => toLBoolM <| isLevelDefEqAux u v
   | Expr.lam ..,         Expr.lam ..         => if t == s then pure LBool.true else toLBoolM <| isDefEqBinding t s
   | Expr.forallE ..,     Expr.forallE ..     => if t == s then pure LBool.true else toLBoolM <| isDefEqBinding t s
-  | Expr.mdata _ t _,    s                   => isDefEqQuick t s
-  | t,                   Expr.mdata _ s _    => isDefEqQuick t s
+  -- | Expr.mdata _ t _,    s                   => isDefEqQuick t s
+  -- | t,                   Expr.mdata _ s _    => isDefEqQuick t s
   | Expr.fvar fvarId₁ _, Expr.fvar fvarId₂ _ => do
     if (← isLetFVar fvarId₁ <||> isLetFVar fvarId₂) then
       pure LBool.undef
@@ -1271,6 +1300,20 @@ private partial def isDefEqQuick (t s : Expr) : MetaM LBool :=
   | t, s =>
     isDefEqQuickOther t s
 
+/--
+  We used to eagerly remove metadata at `isDefEqQuick`. See commented lines above.
+  This eager removal was unnecessarily removing hints to the pretty printer when solving
+  `?m =?= hint ...`
+  See comment at `consumeInaccessibleAnnotations`
+-/
+private partial def isDefEqMData (t s : Expr) : MetaM LBool := do
+  if t.isMData then
+    isDefEqQuick t.mdataExpr! s
+  else if s.isMData then
+    isDefEqQuick t s.mdataExpr!
+  else
+    return LBool.undef
+
 private partial def isDefEqQuickOther (t s : Expr) : MetaM LBool := do
   if t == s then
     pure LBool.true
@@ -1280,7 +1323,7 @@ private partial def isDefEqQuickOther (t s : Expr) : MetaM LBool := do
     let tFn := t.getAppFn
     let sFn := s.getAppFn
     if !tFn.isMVar && !sFn.isMVar then
-      pure LBool.undef
+      isDefEqMData t s
     else if (← isAssigned tFn) then
       let t ← instantiateMVars t
       isDefEqQuick t s
@@ -1322,7 +1365,7 @@ private partial def isDefEqQuickOther (t s : Expr) : MetaM LBool := do
           else
             pure LBool.false
         else
-          pure LBool.undef
+          isDefEqMData t s
       else
         isDefEqQuickMVarMVar t s
 
diff --git a/stage0/src/Lean/Meta/Match/Basic.lean b/stage0/src/Lean/Meta/Match/Basic.lean
index f10d04373c..f56b38bcfc 100644
--- a/stage0/src/Lean/Meta/Match/Basic.lean
+++ b/stage0/src/Lean/Meta/Match/Basic.lean
@@ -9,15 +9,6 @@ import Lean.Meta.Match.CaseArraySizes
 
 namespace Lean.Meta.Match
 
-/--
-  Auxiliary annotation used to mark terms marked with the "inaccessible" annotation `.(t)` and
-  `_` in patterns. -/
-def mkInaccessible (e : Expr) : Expr :=
-  mkAnnotation `_inaccessible e
-
-def inaccessible? (e : Expr) : Option Expr :=
-  annotation? `_inaccessible e
-
 inductive Pattern : Type where
   | inaccessible (e : Expr) : Pattern
   | var          (fvarId : FVarId) : Pattern
diff --git a/stage0/src/Lean/Meta/Tactic/Cleanup.lean b/stage0/src/Lean/Meta/Tactic/Cleanup.lean
index a970fb57f3..5be8a94532 100644
--- a/stage0/src/Lean/Meta/Tactic/Cleanup.lean
+++ b/stage0/src/Lean/Meta/Tactic/Cleanup.lean
@@ -24,7 +24,7 @@ partial def cleanup (mvarId : MVarId) : MetaM MVarId := do
       unless used.contains localDecl.fvarId do
         lctx := lctx.erase localDecl.fvarId
     let localInsts := (← getLocalInstances).filter fun inst => used.contains inst.fvar.fvarId!
-    let mvarNew ← mkFreshExprMVarAt lctx localInsts (← getMVarType' mvarId) MetavarKind.syntheticOpaque (← getMVarTag mvarId)
+    let mvarNew ← mkFreshExprMVarAt lctx localInsts (← instantiateMVars (← getMVarType mvarId)) MetavarKind.syntheticOpaque (← getMVarTag mvarId)
     assignExprMVar mvarId mvarNew
     return mvarNew.mvarId!
 where
diff --git a/stage0/src/Lean/Meta/Tactic/Simp/Rewrite.lean b/stage0/src/Lean/Meta/Tactic/Simp/Rewrite.lean
index d41f7e48dd..b64f555520 100644
--- a/stage0/src/Lean/Meta/Tactic/Simp/Rewrite.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp/Rewrite.lean
@@ -73,6 +73,7 @@ private def tryLemmaCore (lhs : Expr) (xs : Array Expr) (bis : Array BinderInfo)
   for i in [:numExtraArgs] do
     extraArgs := extraArgs.push e.appArg!
     e := e.appFn!
+  extraArgs := extraArgs.reverse
   match (← go e) with
   | none => return none
   | some { expr := eNew, proof? := none } => return some { expr := mkAppN eNew extraArgs }
diff --git a/stage0/src/Lean/Parser/Syntax.lean b/stage0/src/Lean/Parser/Syntax.lean
index 54dc9952e7..1c44599a65 100644
--- a/stage0/src/Lean/Parser/Syntax.lean
+++ b/stage0/src/Lean/Parser/Syntax.lean
@@ -76,7 +76,7 @@ def catBehaviorSymbol := leading_parser nonReservedSymbol "symbol"
 def catBehavior := optional ("(" >> nonReservedSymbol "behavior" >> " := " >> (catBehaviorBoth <|> catBehaviorSymbol) >> ")")
 @[builtinCommandParser] def syntaxCat := leading_parser "declare_syntax_cat " >> ident >> catBehavior
 def macroArg  := leading_parser optional (atomic (ident >> checkNoWsBefore "no space before ':'" >> ":")) >> syntaxParser argPrec
-def macroRhs (quotP : Parser) : Parser := leading_parser "`(" >> incQuotDepth quotP >> ")" <|> termParser
+def macroRhs (quotP : Parser) : Parser := leading_parser "`(" >> incQuotDepth quotP >> ")" <|> withPosition termParser
 def macroTailTactic   : Parser := atomic (" : " >> identEq "tactic") >> darrow >> macroRhs Tactic.seq1
 def macroTailCommand  : Parser := atomic (" : " >> identEq "command") >> darrow >> macroRhs (many1Unbox commandParser)
 def macroTailDefault  : Parser := atomic (" : " >> ident) >> darrow >> macroRhs (categoryParserOfStack 2)
@@ -85,7 +85,7 @@ def macroTail := leading_parser macroTailTactic <|> macroTailCommand <|> macroTa
 
 @[builtinCommandParser] def «elab_rules» := leading_parser suppressInsideQuot (optional docComment >> Term.attrKind >> "elab_rules" >> optKind >> optional (" : " >> ident)  >> optional (" <= " >> ident) >> Term.matchAlts)
 def elabArg  := macroArg
-def elabTail := leading_parser atomic (" : " >> ident >> optional (" <= " >> ident)) >> darrow >> termParser
+def elabTail := leading_parser atomic (" : " >> ident >> optional (" <= " >> ident)) >> darrow >> withPosition termParser
 @[builtinCommandParser] def «elab»       := leading_parser suppressInsideQuot (optional docComment >> Term.attrKind >> "elab " >> optPrecedence >> optNamedName >> optNamedPrio >> many1 elabArg >> elabTail)
 
 end Command
diff --git a/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean b/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean
index cd051b11ac..bc5f9f21d2 100644
--- a/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean
+++ b/stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean
@@ -424,7 +424,7 @@ def delabLetFun : Delab := do
 
 @[builtinDelab mdata]
 def delabMData : Delab := do
-  if let some _ := Lean.Meta.Match.inaccessible? (← getExpr) then
+  if let some _ := inaccessible? (← getExpr) then
     let s ← withMDataExpr delab
     if (← read).inPattern then
       `(.($s)) -- We only include the inaccessible annotation when we are delaborating patterns
diff --git a/stage0/src/Lean/Server/FileWorker.lean b/stage0/src/Lean/Server/FileWorker.lean
index 2c09ab6a37..7f19870558 100644
--- a/stage0/src/Lean/Server/FileWorker.lean
+++ b/stage0/src/Lean/Server/FileWorker.lean
@@ -170,9 +170,10 @@ section Initialization
           | some path => pure <| System.FilePath.mk path / "bin" / lakePath
           | _         => pure <| (← appDir) / lakePath
         lakePath.withExtension System.FilePath.exeExtension
-    let mut srcSearchPath := [(← appDir) / ".." / "lib" / "lean" / "src"]
+    let srcPath := (← appDir) / ".." / "lib" / "lean" / "src"
+    let mut srcSearchPath := [srcPath, srcPath / "lake"]
     if let some p := (← IO.getEnv "LEAN_SRC_PATH") then
-      srcSearchPath := srcSearchPath ++ System.SearchPath.parse p
+      srcSearchPath := System.SearchPath.parse p ++ srcSearchPath
     let (headerEnv, msgLog) ← try
       -- NOTE: lake does not exist in stage 0 (yet?)
       if (← System.FilePath.pathExists lakePath) then
diff --git a/stage0/src/include/lean/lean.h b/stage0/src/include/lean/lean.h
index 474a8be47a..a64677cd5a 100644
--- a/stage0/src/include/lean/lean.h
+++ b/stage0/src/include/lean/lean.h
@@ -862,19 +862,34 @@ static inline lean_obj_res lean_mk_empty_byte_array(b_lean_obj_arg capacity) {
 static inline lean_obj_res lean_byte_array_size(b_lean_obj_arg a) {
     return lean_box(lean_sarray_size(a));
 }
-
+static inline uint8_t lean_byte_array_uget(b_lean_obj_arg a, size_t i) {
+    assert(i < lean_sarray_size(a));
+    return lean_sarray_cptr(a)[i];
+}
 static inline uint8_t lean_byte_array_get(b_lean_obj_arg a, b_lean_obj_arg i) {
     if (lean_is_scalar(i)) {
         size_t idx = lean_unbox(i);
-        return idx < lean_sarray_size(a) ? lean_sarray_cptr(a)[idx] : 0;
+        return idx < lean_sarray_size(a) ? lean_byte_array_uget(a, idx) : 0;
     } else {
         /* The index must be out of bounds. Otherwise we would be out of memory. */
         return 0;
     }
 }
+static inline uint8_t lean_byte_array_fget(b_lean_obj_arg a, b_lean_obj_arg i) {
+    return lean_byte_array_uget(a, lean_unbox(i));
+}
 
 LEAN_SHARED lean_obj_res lean_byte_array_push(lean_obj_arg a, uint8_t b);
 
+static inline lean_object * lean_byte_array_uset(lean_obj_arg a, size_t i, uint8_t v) {
+    lean_obj_res r;
+    if (lean_is_exclusive(a)) r = a;
+    else r = lean_copy_byte_array(a);
+    uint8_t * it = lean_sarray_cptr(r) + i;
+    *it = v;
+    return r;
+}
+
 static inline lean_obj_res lean_byte_array_set(lean_obj_arg a, b_lean_obj_arg i, uint8_t b) {
     if (!lean_is_scalar(i)) {
         return a;
@@ -883,16 +898,15 @@ static inline lean_obj_res lean_byte_array_set(lean_obj_arg a, b_lean_obj_arg i,
         if (idx >= lean_sarray_size(a)) {
             return a;
         } else {
-            lean_obj_res r;
-            if (lean_is_exclusive(a)) r = a;
-            else r = lean_copy_byte_array(a);
-            uint8_t * it = lean_sarray_cptr(r) + idx;
-            *it = b;
-            return r;
+            return lean_byte_array_uset(a, idx, b);
         }
     }
 }
 
+static inline lean_obj_res lean_byte_array_fset(lean_obj_arg a, b_lean_obj_arg i, uint8_t b) {
+    return lean_byte_array_uset(a, lean_unbox(i), b);
+}
+
 /* FloatArray (special case of Array of Scalars) */
 
 LEAN_SHARED lean_obj_res lean_float_array_mk(lean_obj_arg a);
@@ -912,10 +926,18 @@ static inline double * lean_float_array_cptr(b_lean_obj_arg a) {
     return (double*)(lean_sarray_cptr(a)); // NOLINT
 }
 
+static inline double lean_float_array_uget(b_lean_obj_arg a, size_t i) {
+    return lean_float_array_cptr(a)[i];
+}
+
+static inline double lean_float_array_fget(b_lean_obj_arg a, b_lean_obj_arg i) {
+    return lean_float_array_uget(a, lean_unbox(i));
+}
+
 static inline double lean_float_array_get(b_lean_obj_arg a, b_lean_obj_arg i) {
     if (lean_is_scalar(i)) {
         size_t idx = lean_unbox(i);
-        return idx < lean_sarray_size(a) ? lean_float_array_cptr(a)[idx] : 0.0;
+        return idx < lean_sarray_size(a) ? lean_float_array_uget(a, idx) : 0.0;
     } else {
         /* The index must be out of bounds. Otherwise we would be out of memory. */
         return 0.0;
@@ -924,6 +946,19 @@ static inline double lean_float_array_get(b_lean_obj_arg a, b_lean_obj_arg i) {
 
 LEAN_SHARED lean_obj_res lean_float_array_push(lean_obj_arg a, double d);
 
+static inline lean_obj_res lean_float_array_uset(lean_obj_arg a, size_t i, double d) {
+    lean_obj_res r;
+    if (lean_is_exclusive(a)) r = a;
+    else r = lean_copy_float_array(a);
+    double * it = lean_float_array_cptr(r) + i;
+    *it = d;
+    return r;
+}
+
+static inline lean_obj_res lean_float_array_fset(lean_obj_arg a, b_lean_obj_arg i, double d) {
+    return lean_float_array_uset(a, lean_unbox(i), d);
+}
+
 static inline lean_obj_res lean_float_array_set(lean_obj_arg a, b_lean_obj_arg i, double d) {
     if (!lean_is_scalar(i)) {
         return a;
@@ -932,31 +967,11 @@ static inline lean_obj_res lean_float_array_set(lean_obj_arg a, b_lean_obj_arg i
         if (idx >= lean_sarray_size(a)) {
             return a;
         } else {
-            lean_obj_res r;
-            if (lean_is_exclusive(a)) r = a;
-            else r = lean_copy_float_array(a);
-            double * it = lean_float_array_cptr(r) + idx;
-            *it = d;
-            return r;
+            return lean_float_array_uset(a, idx, d);
         }
     }
 }
 
-static inline double lean_float_array_fget(b_lean_obj_arg a, b_lean_obj_arg i) {
-    size_t idx = lean_unbox(i);
-    return lean_float_array_cptr(a)[idx];
-}
-
-static inline lean_obj_res lean_float_array_fset(lean_obj_arg a, b_lean_obj_arg i, double d) {
-    size_t idx = lean_unbox(i);
-    lean_obj_res r;
-    if (lean_is_exclusive(a)) r = a;
-    else r = lean_copy_float_array(a);
-    double * it = lean_float_array_cptr(r) + idx;
-    *it = d;
-    return r;
-}
-
 /* Strings */
 
 static inline lean_obj_res lean_alloc_string(size_t size, size_t capacity, size_t len) {
diff --git a/stage0/src/runtime/compact.cpp b/stage0/src/runtime/compact.cpp
index c22c33d7c2..c3f0b9a7b3 100644
--- a/stage0/src/runtime/compact.cpp
+++ b/stage0/src/runtime/compact.cpp
@@ -34,7 +34,7 @@ struct max_sharing_hash {
     object_compactor * m;
     max_sharing_hash(object_compactor * manager):m(manager) {}
     unsigned operator()(max_sharing_key const & k) const {
-        return hash_str(k.m_size, reinterpret_cast<char const *>(m->m_begin) + k.m_offset, 17);
+        return hash_str(k.m_size, reinterpret_cast<unsigned char const *>(m->m_begin) + k.m_offset, 17);
     }
 };
 
diff --git a/stage0/src/runtime/hash.cpp b/stage0/src/runtime/hash.cpp
index e25f016fc4..eb3c7550c3 100644
--- a/stage0/src/runtime/hash.cpp
+++ b/stage0/src/runtime/hash.cpp
@@ -22,7 +22,7 @@ void mix(unsigned & a, unsigned & b, unsigned & c) {
 
 // Bob Jenkin's hash function.
 // http://burtleburtle.net/bob/hash/doobs.html
-unsigned hash_str(size_t length, char const * str, unsigned init_value) {
+unsigned hash_str(size_t length, unsigned char const * str, unsigned init_value) {
     unsigned a, b, c;
     size_t len;
 
diff --git a/stage0/src/runtime/hash.h b/stage0/src/runtime/hash.h
index 7b0775e7d5..091cfb3acc 100644
--- a/stage0/src/runtime/hash.h
+++ b/stage0/src/runtime/hash.h
@@ -12,7 +12,7 @@ namespace lean {
 
 void mix(unsigned & a, unsigned & b, unsigned & c);
 
-unsigned hash_str(size_t len, char const * str, unsigned init_value);
+unsigned hash_str(size_t len, unsigned char const * str, unsigned init_value);
 
 inline unsigned hash(unsigned h1, unsigned h2) {
     h2 -= h1; h2 ^= (h1 << 8);
diff --git a/stage0/src/runtime/object.cpp b/stage0/src/runtime/object.cpp
index 0fd7efc05a..53eed48d94 100644
--- a/stage0/src/runtime/object.cpp
+++ b/stage0/src/runtime/object.cpp
@@ -1885,7 +1885,7 @@ extern "C" LEAN_EXPORT obj_res lean_string_utf8_set(obj_arg s, b_obj_arg i0, uin
 extern "C" LEAN_EXPORT uint64 lean_string_hash(b_obj_arg s) {
     usize sz = lean_string_size(s) - 1;
     char const * str = lean_string_cstr(s);
-    return hash_str(sz, str, 11);
+    return hash_str(sz, (unsigned char const *) str, 11);
 }
 
 // =======================================
diff --git a/stage0/src/runtime/sharecommon.cpp b/stage0/src/runtime/sharecommon.cpp
index 78172a72aa..eff5ac952c 100644
--- a/stage0/src/runtime/sharecommon.cpp
+++ b/stage0/src/runtime/sharecommon.cpp
@@ -32,7 +32,7 @@ extern "C" LEAN_EXPORT uint64_t lean_sharecommon_hash(b_obj_arg o) {
     // hash relevant parts of the header
     unsigned init = hash(lean_ptr_tag(o), lean_ptr_other(o));
     // hash body
-    return hash_str(sz - header_sz, reinterpret_cast<char const *>(o) + header_sz, init);
+    return hash_str(sz - header_sz, reinterpret_cast<unsigned char const *>(o) + header_sz, init);
 }
 
 // unsafe def mkObjectMap : Unit → ObjectMap
diff --git a/stage0/src/shell/CMakeLists.txt b/stage0/src/shell/CMakeLists.txt
index b6ad916c5c..ff87361740 100644
--- a/stage0/src/shell/CMakeLists.txt
+++ b/stage0/src/shell/CMakeLists.txt
@@ -203,6 +203,14 @@ add_test(NAME leanpkgtest_user_attr_app
            find . -name '*.olean' -delete
            leanmake bin LINK_OPTS='${LEAN_DYN_EXE_LINKER_FLAGS}' && build/bin/UserAttr")
 
+add_test(NAME leanpkgtest_builtin_attr
+         WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../tests/leanpkg/builtin_attr"
+         COMMAND bash -c "
+           set -eu
+           export PATH=${LEAN_BIN}:$PATH
+           find . -name '*.olean' -delete
+           leanmake")
+
 add_test(NAME laketest
          WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/lake/examples"
          COMMAND bash -c "
diff --git a/stage0/stdlib/Init/Data/Array/Basic.c b/stage0/stdlib/Init/Data/Array/Basic.c
index 965f2501cb..431861693a 100644
--- a/stage0/stdlib/Init/Data/Array/Basic.c
+++ b/stage0/stdlib/Init/Data/Array/Basic.c
@@ -45,7 +45,6 @@ LEAN_EXPORT lean_object* l_Array_mkArray___boxed(lean_object*, lean_object*, lea
 LEAN_EXPORT lean_object* l_Array_findSome_x3f___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM(lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_allDiffAux___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_split(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
@@ -60,14 +59,13 @@ LEAN_EXPORT lean_object* l_Array_zipWith___rarg(lean_object*, lean_object*, lean
 LEAN_EXPORT lean_object* l_term_x23_x5b___x2c_x5d;
 LEAN_EXPORT lean_object* l_Array_filterMapM___at_Array_filterMap___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Array_all___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__4;
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24;
 LEAN_EXPORT lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRev_x3f___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_getEvenElems___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Array_modifyM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_mapM___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9;
 LEAN_EXPORT lean_object* l_Array_uset___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRevM_x3f___spec__1___rarg___lambda__1(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findSomeRev_x3f___spec__1(lean_object*, lean_object*);
@@ -76,6 +74,7 @@ LEAN_EXPORT lean_object* l_Array_filterMapM___rarg___lambda__1(lean_object*, lea
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_swapAt(lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__16;
 lean_object* lean_array_fswap(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_zip___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_allM___spec__1___rarg___lambda__2(size_t, lean_object*, lean_object*, lean_object*, lean_object*, size_t, uint8_t);
@@ -99,17 +98,18 @@ LEAN_EXPORT lean_object* l_Array_uget___boxed(lean_object*, lean_object*, lean_o
 static lean_object* l_Array_instReprArray___rarg___closed__6;
 LEAN_EXPORT lean_object* l_Array_foldl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__20;
 LEAN_EXPORT lean_object* l_Array_isEqvAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRevM_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_all___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyM(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_all(lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__3;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_foldl___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1(lean_object*, lean_object*);
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__13;
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__10;
 LEAN_EXPORT uint8_t l_Array_isEqvAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_instToStringArray___rarg(lean_object*, lean_object*);
@@ -128,16 +128,14 @@ LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Array_contains___spec__1___rarg(
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSome_x3f___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyM_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__14;
 LEAN_EXPORT lean_object* l_Array_anyM_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_map___rarg(lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1___rarg___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__5;
 LEAN_EXPORT lean_object* l_Array_findRev_x3f___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_shrink___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19;
 LEAN_EXPORT lean_object* l_Array_findIdx_x3f___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_find_x3f___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_back(lean_object*);
@@ -146,12 +144,10 @@ LEAN_EXPORT lean_object* l_Array_findM_x3f___rarg(lean_object*, lean_object*, le
 lean_object* lean_string_utf8_byte_size(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeM_x3f___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__6;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_foldr___spec__2___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_singleton(lean_object*);
 LEAN_EXPORT lean_object* l_Array_find_x3f(lean_object*);
 uint8_t lean_usize_dec_lt(size_t, size_t);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__18;
 LEAN_EXPORT lean_object* l_Array_mapM(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_unzip___spec__1___rarg(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__2;
@@ -198,10 +194,10 @@ LEAN_EXPORT lean_object* l_Array_getLit(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_isPrefixOf___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_foldr___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__12;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_forRevM___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldl(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_getMax_x3f(lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__12;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findM_x3f___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_isEqv(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_mapM___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
@@ -216,7 +212,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_allDiffAuxAu
 LEAN_EXPORT lean_object* l_Array_forInUnsafe(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_instAppendArray___closed__1;
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__10;
 LEAN_EXPORT lean_object* l_Array_toArrayLit___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_all___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -228,7 +223,6 @@ LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_all___spec__1(lean_ob
 LEAN_EXPORT lean_object* l_Array_get_x3f___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findIdx_x3f___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapM___rarg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__20;
 static lean_object* l_Array_instReprArray___rarg___closed__7;
 LEAN_EXPORT lean_object* l_Array_findRev_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Array_appendList___rarg(lean_object*, lean_object*);
@@ -243,6 +237,7 @@ static lean_object* l_Array_instReprArray___rarg___closed__9;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_contains___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_any___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_allM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11;
 LEAN_EXPORT lean_object* l_Array_allDiff(lean_object*);
 LEAN_EXPORT lean_object* l_Array_findIdxM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -256,7 +251,6 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___rarg___lambda__1___boxed(lea
 static lean_object* l_Array_instReprArray___rarg___closed__10;
 LEAN_EXPORT lean_object* l_Array_instReprArray___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__12;
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23;
 LEAN_EXPORT lean_object* l_Array_feraseIdx(lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -267,7 +261,6 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_forM___spec__1(lea
 LEAN_EXPORT lean_object* l_Array_reverse(lean_object*);
 LEAN_EXPORT lean_object* l_Array_modifyM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__13;
 LEAN_EXPORT lean_object* l_Array_zipWithAux(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_eraseIdx(lean_object*);
 LEAN_EXPORT lean_object* l_Array_appendList(lean_object*);
@@ -281,6 +274,7 @@ LEAN_EXPORT lean_object* l_Array_foldlM_loop___rarg(lean_object*, lean_object*,
 LEAN_EXPORT lean_object* l_Array_forIn_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_toArrayLit(lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRevM_x3f___spec__1___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21;
 LEAN_EXPORT lean_object* l_Array_shrink___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -288,6 +282,7 @@ static lean_object* l_Array_swapAt_x21___rarg___closed__4;
 LEAN_EXPORT lean_object* l_Array_instBEqArray___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_getLit___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___rarg___lambda__1(lean_object*, size_t, lean_object*, lean_object*, size_t, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Array_swapAt_x21___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRev_x3f___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -305,12 +300,12 @@ static lean_object* l_Array_instReprArray___rarg___closed__4;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_concatMapM___spec__1___rarg___lambda__2(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* lean_array_to_list(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_eraseIdxSzAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21;
 LEAN_EXPORT lean_object* l_Array_eraseIdxSzAux(lean_object*);
 LEAN_EXPORT 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_EXPORT lean_object* l_Array_findSomeRevM_x3f(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRevM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__13;
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRev_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__15;
 LEAN_EXPORT lean_object* l_Array_indexOfAux(lean_object*);
@@ -333,8 +328,8 @@ LEAN_EXPORT lean_object* l_Array_find_x3f___rarg___lambda__1(lean_object*, lean_
 LEAN_EXPORT lean_object* l_Array_any(lean_object*);
 LEAN_EXPORT lean_object* l_Array_findRevM_x3f___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_swapAt___rarg(lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__6;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_allM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__16;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__2(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findM_x3f___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -349,8 +344,8 @@ LEAN_EXPORT lean_object* l_Array_mapIdxM___rarg(lean_object*, lean_object*, lean
 LEAN_EXPORT lean_object* l_Array_allDiff___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_eraseIdx_x27(lean_object*);
 LEAN_EXPORT lean_object* l_Array_findIdx_x3f_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24;
 LEAN_EXPORT lean_object* l_Array_shrink_loop(lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__4;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
@@ -367,10 +362,12 @@ LEAN_EXPORT lean_object* l_Array_zipWith___rarg___boxed(lean_object*, lean_objec
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_foldr___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM_map(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_partition___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17;
 LEAN_EXPORT lean_object* l_Array_swapAt___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_feraseIdx___rarg(lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8;
 LEAN_EXPORT uint8_t l_Array_contains___rarg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22;
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterMap___spec__2___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMap___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -405,12 +402,14 @@ lean_object* l_List_redLength___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Array_indexOf_x3f___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyM_loop(lean_object*, lean_object*);
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__7;
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__2;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_forM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forRevM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_foldl___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_indexOf_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Array_partition___rarg___boxed(lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__1;
 LEAN_EXPORT uint8_t l_Array_isEqv___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_partition___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Array_getLit___boxed(lean_object*, lean_object*);
@@ -419,20 +418,23 @@ LEAN_EXPORT lean_object* l_Array_modify(lean_object*);
 extern lean_object* l_Id_instMonadId;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRev_x3f___rarg(lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__5;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_all___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_modifyM(lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 LEAN_EXPORT lean_object* l_Array_shrink(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Array_swapAt_x21___spec__1___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_isEmpty(lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15;
 LEAN_EXPORT uint8_t l_Array_any___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11;
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__18;
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__14;
 static lean_object* l_Array_instToStringArray___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_insertAtAux___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_elem___rarg(lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__3;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSome_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findM_x3f___spec__1___rarg___lambda__2(lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSome_x21___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
@@ -465,6 +467,7 @@ LEAN_EXPORT lean_object* l_Array_eraseIdx___rarg___boxed(lean_object*, lean_obje
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findSomeRev_x3f___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1___rarg___lambda__2(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_append___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__7;
 LEAN_EXPORT lean_object* l_Array_concatMapM___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdx___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -480,6 +483,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_find_x3f___spec__1_
 LEAN_EXPORT lean_object* l_Array_modify___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findIdx_x3f(lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_insertAt___rarg___closed__3;
 LEAN_EXPORT lean_object* l_Array_feraseIdx___rarg___boxed(lean_object*, lean_object*);
@@ -492,7 +496,6 @@ static lean_object* l_Array_instReprArray___rarg___closed__2;
 lean_object* lean_mk_array(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyM_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_unzip___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Array_unzip___rarg___boxed(lean_object*);
@@ -501,7 +504,6 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_concatMapM___spec_
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_eraseIdxSzAuxInstance(lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8;
 static lean_object* l_Array_instReprArray___rarg___closed__1;
 lean_object* lean_string_length(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -517,7 +519,6 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1_
 LEAN_EXPORT lean_object* l_Array_instInhabitedArray(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_partition___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__3(lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__2;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Array_allM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Array_foldlM_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -544,13 +545,13 @@ LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__1__
 LEAN_EXPORT lean_object* l_Array_filterM(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Array_concatMapM___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM___at_Array_filterMap___spec__1(lean_object*, lean_object*);
+static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22;
 LEAN_EXPORT uint8_t l_Array_allDiff___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_isEqv___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_findSome_x3f___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_instEmptyCollectionArray___closed__1;
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_insertAt(lean_object*);
 LEAN_EXPORT lean_object* l_Array_elem(lean_object*);
@@ -561,7 +562,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spe
 LEAN_EXPORT lean_object* l_Array_foldrM_fold(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_insertAt___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Array_map___spec__1___rarg(lean_object*, size_t, size_t, lean_object*);
-LEAN_EXPORT lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170_(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095_(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_contains___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_to_int(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Array_insertAt___spec__1___rarg(lean_object*);
@@ -581,7 +582,6 @@ LEAN_EXPORT lean_object* l_Array_toArrayLit___rarg(lean_object*, lean_object*, l
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_term_x23_x5b___x2c_x5d___closed__6;
 LEAN_EXPORT lean_object* l_Array_concatMap___rarg(lean_object*, lean_object*);
-static lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__7;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at_Array_forRevM___spec__2___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_any___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
@@ -5360,7 +5360,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Array_swapAt_x21___rarg___closed__3;
 x_2 = l_Array_findSome_x21___rarg___closed__1;
-x_3 = lean_unsigned_to_nat(393u);
+x_3 = lean_unsigned_to_nat(386u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Array_findSome_x21___rarg___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -7357,7 +7357,7 @@ x_1 = l_term_x23_x5b___x2c_x5d___closed__15;
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__1() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -7365,17 +7365,17 @@ x_1 = lean_mk_string("Lean");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__2() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__1;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__3() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -7383,17 +7383,17 @@ x_1 = lean_mk_string("Parser");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__4() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__2;
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__3;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__2;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__5() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -7401,17 +7401,17 @@ x_1 = lean_mk_string("Term");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__6() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__4;
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__5;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__4;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__5;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__7() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -7419,17 +7419,17 @@ x_1 = lean_mk_string("app");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__6;
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__7;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__6;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__7;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9() {
 _start:
 {
 lean_object* x_1; 
@@ -7437,22 +7437,22 @@ x_1 = lean_mk_string("List.toArray");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__10() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__10;
+x_3 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__10;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -7460,7 +7460,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__12() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__12() {
 _start:
 {
 lean_object* x_1; 
@@ -7468,17 +7468,17 @@ x_1 = lean_mk_string("List");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__13() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__12;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__12;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__14() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__14() {
 _start:
 {
 lean_object* x_1; 
@@ -7486,41 +7486,41 @@ x_1 = lean_mk_string("toArray");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__13;
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__14;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__13;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__14;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__16() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__16() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__16;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__16;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__18() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__18() {
 _start:
 {
 lean_object* x_1; 
@@ -7528,17 +7528,17 @@ x_1 = lean_mk_string("null");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__18;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__18;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__20() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__20() {
 _start:
 {
 lean_object* x_1; 
@@ -7546,17 +7546,17 @@ x_1 = lean_mk_string("term[_]");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__20;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__20;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22() {
 _start:
 {
 lean_object* x_1; 
@@ -7564,7 +7564,7 @@ x_1 = lean_mk_string("[");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -7573,7 +7573,7 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -7582,7 +7582,7 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -7591,7 +7591,7 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4170_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_4095_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -7629,24 +7629,24 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_2, 1);
 lean_inc(x_15);
 lean_dec(x_2);
-x_16 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15;
+x_16 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15;
 x_17 = l_Lean_addMacroScope(x_15, x_16, x_14);
-x_18 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11;
-x_19 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17;
+x_18 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11;
+x_19 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17;
 lean_inc(x_13);
 x_20 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_20, 0, x_13);
 lean_ctor_set(x_20, 1, x_18);
 lean_ctor_set(x_20, 2, x_17);
 lean_ctor_set(x_20, 3, x_19);
-x_21 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22;
+x_21 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22;
 lean_inc(x_13);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_13);
 lean_ctor_set(x_22, 1, x_21);
 x_23 = l_Array_instEmptyCollectionArray___closed__1;
 x_24 = l_Array_append___rarg(x_23, x_10);
-x_25 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19;
+x_25 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19;
 x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_24);
@@ -7654,23 +7654,23 @@ x_27 = l_Array_instReprArray___rarg___closed__8;
 x_28 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_28, 0, x_13);
 lean_ctor_set(x_28, 1, x_27);
-x_29 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23;
+x_29 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23;
 x_30 = lean_array_push(x_29, x_22);
 x_31 = lean_array_push(x_30, x_26);
 x_32 = lean_array_push(x_31, x_28);
-x_33 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21;
+x_33 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21;
 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_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24;
+x_35 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24;
 x_36 = lean_array_push(x_35, x_34);
 x_37 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_37, 0, x_25);
 lean_ctor_set(x_37, 1, x_36);
-x_38 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25;
+x_38 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25;
 x_39 = lean_array_push(x_38, x_20);
 x_40 = lean_array_push(x_39, x_37);
-x_41 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8;
+x_41 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8;
 x_42 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_42, 0, x_41);
 lean_ctor_set(x_42, 1, x_40);
@@ -7690,24 +7690,24 @@ lean_inc(x_45);
 x_46 = lean_ctor_get(x_2, 1);
 lean_inc(x_46);
 lean_dec(x_2);
-x_47 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15;
+x_47 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15;
 x_48 = l_Lean_addMacroScope(x_46, x_47, x_45);
-x_49 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11;
-x_50 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17;
+x_49 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11;
+x_50 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17;
 lean_inc(x_43);
 x_51 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_51, 0, x_43);
 lean_ctor_set(x_51, 1, x_49);
 lean_ctor_set(x_51, 2, x_48);
 lean_ctor_set(x_51, 3, x_50);
-x_52 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22;
+x_52 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22;
 lean_inc(x_43);
 x_53 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_53, 0, x_43);
 lean_ctor_set(x_53, 1, x_52);
 x_54 = l_Array_instEmptyCollectionArray___closed__1;
 x_55 = l_Array_append___rarg(x_54, x_10);
-x_56 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19;
+x_56 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19;
 x_57 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_57, 0, x_56);
 lean_ctor_set(x_57, 1, x_55);
@@ -7715,23 +7715,23 @@ x_58 = l_Array_instReprArray___rarg___closed__8;
 x_59 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_59, 0, x_43);
 lean_ctor_set(x_59, 1, x_58);
-x_60 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23;
+x_60 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23;
 x_61 = lean_array_push(x_60, x_53);
 x_62 = lean_array_push(x_61, x_57);
 x_63 = lean_array_push(x_62, x_59);
-x_64 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21;
+x_64 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21;
 x_65 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_65, 0, x_64);
 lean_ctor_set(x_65, 1, x_63);
-x_66 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24;
+x_66 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24;
 x_67 = lean_array_push(x_66, x_65);
 x_68 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_68, 0, x_56);
 lean_ctor_set(x_68, 1, x_67);
-x_69 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25;
+x_69 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25;
 x_70 = lean_array_push(x_69, x_51);
 x_71 = lean_array_push(x_70, x_68);
-x_72 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8;
+x_72 = l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8;
 x_73 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_73, 0, x_72);
 lean_ctor_set(x_73, 1, x_71);
@@ -9121,7 +9121,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Array_swapAt_x21___rarg___closed__3;
 x_2 = l_Array_insertAt___rarg___closed__1;
-x_3 = lean_unsigned_to_nat(679u);
+x_3 = lean_unsigned_to_nat(672u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l_Array_insertAt___rarg___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10094,56 +10094,56 @@ l_term_x23_x5b___x2c_x5d___closed__15 = _init_l_term_x23_x5b___x2c_x5d___closed_
 lean_mark_persistent(l_term_x23_x5b___x2c_x5d___closed__15);
 l_term_x23_x5b___x2c_x5d = _init_l_term_x23_x5b___x2c_x5d();
 lean_mark_persistent(l_term_x23_x5b___x2c_x5d);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__1 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__1();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__1);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__2 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__2();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__2);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__3 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__3();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__3);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__4 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__4();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__4);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__5 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__5();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__5);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__6 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__6();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__6);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__7 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__7();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__7);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__8);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__9);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__10 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__10();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__10);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__11);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__12 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__12();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__12);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__13 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__13();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__13);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__14 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__14();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__14);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__15);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__16 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__16();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__16);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__17);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__18 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__18();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__18);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__19);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__20 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__20();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__20);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__21);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__22);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__23);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__24);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4170____closed__25);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__1 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__1();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__1);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__2 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__2();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__2);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__3 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__3();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__3);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__4 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__4();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__4);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__5 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__5();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__5);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__6 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__6();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__6);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__7 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__7();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__7);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__8);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__9);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__10 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__10();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__10);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__11);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__12 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__12();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__12);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__13 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__13();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__13);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__14 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__14();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__14);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__15);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__16 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__16();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__16);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__17);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__18 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__18();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__18);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__19);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__20 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__20();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__20);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__21);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__22);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__23);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__24);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_4095____closed__25);
 l_Array_partition___rarg___closed__1 = _init_l_Array_partition___rarg___closed__1();
 lean_mark_persistent(l_Array_partition___rarg___closed__1);
 l_Array_insertAt___rarg___closed__1 = _init_l_Array_insertAt___rarg___closed__1();
diff --git a/stage0/stdlib/Init/Data/ByteArray/Basic.c b/stage0/stdlib/Init/Data/ByteArray/Basic.c
index bddbe35909..241b1a5b49 100644
--- a/stage0/stdlib/Init/Data/ByteArray/Basic.c
+++ b/stage0/stdlib/Init/Data/ByteArray/Basic.c
@@ -16,12 +16,21 @@ extern "C" {
 LEAN_EXPORT lean_object* l_ByteArray_push___boxed(lean_object*, lean_object*);
 lean_object* l_List_reverse___rarg(lean_object*);
 static lean_object* l_ByteArray_instAppendByteArray___closed__1;
+LEAN_EXPORT lean_object* l_ByteArray_foldl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+size_t lean_usize_add(size_t, size_t);
+LEAN_EXPORT lean_object* l_ByteArray_uget___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_instAppendByteArray;
 LEAN_EXPORT lean_object* l_ByteArray_toList_loop(lean_object*, lean_object*, lean_object*);
 uint64_t lean_uint8_to_uint64(uint8_t);
+LEAN_EXPORT lean_object* l_ByteArray_forIn(lean_object*, lean_object*);
+uint8_t lean_usize_dec_eq(size_t, size_t);
 LEAN_EXPORT lean_object* l_ByteArray_toList_loop___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_get___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forIn___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_toStringAux___at_instToStringByteArray___spec__2(uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_instToStringByteArray(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_findIdx_x3f_loop(lean_object*, lean_object*, lean_object*);
 static lean_object* l_ByteArray_toUInt64LE_x21___closed__3;
 lean_object* lean_byte_array_data(lean_object*);
@@ -30,27 +39,39 @@ static lean_object* l_ByteArray_toUInt64LE_x21___closed__5;
 LEAN_EXPORT lean_object* l_ByteArray_findIdx_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_ByteArray_toUInt64LE_x21___spec__1(lean_object*);
+uint8_t lean_usize_dec_lt(size_t, size_t);
 LEAN_EXPORT lean_object* l_ByteArray_data___boxed(lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_toByteArray_loop(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_toString___at_instToStringByteArray___spec__1___closed__1;
 static lean_object* l_ByteArray_toUInt64LE_x21___closed__6;
 extern uint64_t l_instInhabitedUInt64;
+LEAN_EXPORT lean_object* l_ByteArray_set___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_toString___at_instToStringByteArray___spec__1___closed__2;
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_empty;
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_getOp___boxed(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_extract(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_ByteArray_empty___closed__1;
 LEAN_EXPORT lean_object* l_List_toString___at_instToStringByteArray___spec__1(lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 static lean_object* l_List_toStringAux___at_instToStringByteArray___spec__2___closed__2;
 lean_object* lean_byte_array_set(lean_object*, lean_object*, uint8_t);
 static lean_object* l_List_toStringAux___at_instToStringByteArray___spec__2___closed__1;
+lean_object* lean_byte_array_uset(lean_object*, size_t, uint8_t);
 LEAN_EXPORT lean_object* l_ByteArray_toList___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_List_toStringAux___at_instToStringByteArray___spec__2___boxed(lean_object*, lean_object*);
 lean_object* lean_byte_array_size(lean_object*);
 lean_object* lean_byte_array_push(lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___rarg___lambda__1(lean_object*, size_t, lean_object*, lean_object*, size_t, lean_object*);
 static lean_object* l_List_toString___at_instToStringByteArray___spec__1___closed__3;
 static lean_object* l_ByteArray_toUInt64LE_x21___closed__1;
 LEAN_EXPORT lean_object* l_ByteArray_get_x21___boxed(lean_object*, lean_object*);
@@ -58,30 +79,61 @@ LEAN_EXPORT uint8_t l_ByteArray_isEmpty(lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_byte_array_mk(lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_copySlice___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_instEmptyCollectionByteArray;
+size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_append___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_instInhabitedByteArray;
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
+uint8_t lean_byte_array_fget(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldl(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_toUInt64BE_x21(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM(lean_object*, lean_object*);
+uint8_t lean_nat_dec_le(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_instForInByteArrayUInt8___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_ByteArray_toUInt64LE_x21___closed__2;
 uint64_t lean_uint64_shift_left(uint64_t, uint64_t);
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint64_t lean_uint64_lor(uint64_t, uint64_t);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_byte_array_copy_slice(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop(lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_isEmpty___boxed(lean_object*);
+lean_object* lean_byte_array_fset(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_ByteArray_findIdx_x3f___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_ByteArray_getOp(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_extract___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_append(lean_object*, lean_object*);
 static lean_object* l_ByteArray_toUInt64BE_x21___closed__2;
 LEAN_EXPORT lean_object* l_List_toByteArray(lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_findIdx_x3f_loop___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_byte_array_get(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_toList(lean_object*);
 static lean_object* l_ByteArray_toUInt64BE_x21___closed__1;
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_ByteArray_toUInt64LE_x21___spec__1___boxed__const__1;
 static lean_object* l_ByteArray_toUInt64LE_x21___closed__4;
+LEAN_EXPORT lean_object* l_ByteArray_instForInByteArrayUInt8(lean_object*, lean_object*);
+uint8_t lean_byte_array_uget(lean_object*, size_t);
+LEAN_EXPORT lean_object* l_ByteArray_uset___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_toUInt64LE_x21(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_set_x21___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_byte_array(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_mk___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_mkEmpty___boxed(lean_object*);
 lean_object* lean_uint8_to_nat(uint8_t);
 LEAN_EXPORT lean_object* l_ByteArray_size___boxed(lean_object*);
@@ -136,6 +188,14 @@ x_1 = l_ByteArray_empty;
 return x_1;
 }
 }
+static lean_object* _init_l_ByteArray_instEmptyCollectionByteArray() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_ByteArray_empty;
+return x_1;
+}
+}
 LEAN_EXPORT lean_object* l_ByteArray_push___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -155,6 +215,18 @@ lean_dec(x_1);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_ByteArray_uget___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; uint8_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = lean_byte_array_uget(x_1, x_4);
+lean_dec(x_1);
+x_6 = lean_box(x_5);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l_ByteArray_get_x21___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -166,6 +238,36 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
+LEAN_EXPORT lean_object* l_ByteArray_get___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = lean_byte_array_fget(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT uint8_t l_ByteArray_getOp(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; 
+x_3 = lean_byte_array_get(x_1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_getOp___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_ByteArray_getOp(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_ByteArray_set_x21___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -177,6 +279,29 @@ lean_dec(x_2);
 return x_5;
 }
 }
+LEAN_EXPORT lean_object* l_ByteArray_set___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; lean_object* x_5; 
+x_4 = lean_unbox(x_3);
+lean_dec(x_3);
+x_5 = lean_byte_array_fset(x_1, x_2, x_4);
+lean_dec(x_2);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_uset___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+size_t x_5; uint8_t x_6; lean_object* x_7; 
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = lean_unbox(x_3);
+lean_dec(x_3);
+x_7 = lean_byte_array_uset(x_1, x_5, x_6);
+return x_7;
+}
+}
 LEAN_EXPORT uint8_t l_ByteArray_isEmpty(lean_object* x_1) {
 _start:
 {
@@ -397,6 +522,657 @@ lean_dec(x_1);
 return x_4;
 }
 }
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___rarg___lambda__1(lean_object* x_1, size_t x_2, lean_object* x_3, lean_object* x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+if (lean_obj_tag(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);
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+lean_dec(x_6);
+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_7);
+return x_10;
+}
+else
+{
+lean_object* x_11; size_t x_12; size_t x_13; lean_object* x_14; 
+x_11 = lean_ctor_get(x_6, 0);
+lean_inc(x_11);
+lean_dec(x_6);
+x_12 = 1;
+x_13 = lean_usize_add(x_2, x_12);
+x_14 = l_ByteArray_forInUnsafe_loop___rarg(x_1, x_3, x_4, x_5, x_13, x_11);
+return x_14;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_lt(x_5, x_4);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+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_6);
+return x_10;
+}
+else
+{
+uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_11 = lean_byte_array_uget(x_2, x_5);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
+x_13 = lean_box(x_11);
+lean_inc(x_3);
+x_14 = lean_apply_2(x_3, x_13, x_6);
+x_15 = lean_box_usize(x_5);
+x_16 = lean_box_usize(x_4);
+x_17 = lean_alloc_closure((void*)(l_ByteArray_forInUnsafe_loop___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_17, 0, x_1);
+lean_closure_set(x_17, 1, x_15);
+lean_closure_set(x_17, 2, x_2);
+lean_closure_set(x_17, 3, x_3);
+lean_closure_set(x_17, 4, x_16);
+x_18 = lean_apply_4(x_12, lean_box(0), lean_box(0), x_14, x_17);
+return x_18;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_forInUnsafe_loop___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_ByteArray_forInUnsafe_loop___rarg___lambda__1(x_1, x_7, x_3, x_4, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_ByteArray_forInUnsafe_loop___rarg(x_1, x_2, x_3, x_7, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; size_t x_6; size_t x_7; lean_object* x_8; 
+x_5 = lean_byte_array_size(x_2);
+x_6 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+x_7 = 0;
+x_8 = l_ByteArray_forInUnsafe_loop___rarg(x_1, x_2, x_4, x_6, x_7, x_3);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_forInUnsafe___rarg), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___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; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_6 = lean_ctor_get(x_5, 0);
+lean_inc(x_6);
+lean_dec(x_5);
+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_apply_2(x_8, lean_box(0), x_6);
+return x_9;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_ctor_get(x_5, 0);
+lean_inc(x_10);
+lean_dec(x_5);
+x_11 = l_ByteArray_forIn_loop___rarg(x_1, x_2, x_3, x_4, lean_box(0), x_10);
+return x_11;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = lean_nat_dec_eq(x_4, x_7);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_9 = lean_unsigned_to_nat(1u);
+x_10 = lean_nat_sub(x_4, x_9);
+x_11 = lean_ctor_get(x_1, 1);
+lean_inc(x_11);
+x_12 = lean_byte_array_size(x_2);
+x_13 = lean_nat_sub(x_12, x_9);
+lean_dec(x_12);
+x_14 = lean_nat_sub(x_13, x_10);
+lean_dec(x_13);
+x_15 = lean_byte_array_fget(x_2, x_14);
+lean_dec(x_14);
+x_16 = lean_box(x_15);
+lean_inc(x_3);
+x_17 = lean_apply_2(x_3, x_16, x_6);
+x_18 = lean_alloc_closure((void*)(l_ByteArray_forIn_loop___rarg___lambda__1___boxed), 5, 4);
+lean_closure_set(x_18, 0, x_1);
+lean_closure_set(x_18, 1, x_2);
+lean_closure_set(x_18, 2, x_3);
+lean_closure_set(x_18, 3, x_10);
+x_19 = lean_apply_4(x_11, lean_box(0), lean_box(0), x_17, x_18);
+return x_19;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_20 = lean_ctor_get(x_1, 0);
+lean_inc(x_20);
+lean_dec(x_1);
+x_21 = lean_ctor_get(x_20, 1);
+lean_inc(x_21);
+lean_dec(x_20);
+x_22 = lean_apply_2(x_21, lean_box(0), x_6);
+return x_22;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_forIn_loop___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___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_ByteArray_forIn_loop___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___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_ByteArray_forIn_loop___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn___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_byte_array_size(x_2);
+x_6 = l_ByteArray_forIn_loop___rarg(x_1, x_2, x_4, x_5, lean_box(0), x_3);
+lean_dec(x_5);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_forIn(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_forIn___rarg), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_instForInByteArrayUInt8___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; size_t x_6; size_t x_7; lean_object* x_8; 
+x_5 = lean_byte_array_size(x_2);
+x_6 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+x_7 = 0;
+x_8 = l_ByteArray_forInUnsafe_loop___rarg(x_1, x_2, x_4, x_6, x_7, x_3);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_instForInByteArrayUInt8(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_instForInByteArrayUInt8___rarg), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___rarg___lambda__1(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = 1;
+x_8 = lean_usize_add(x_1, x_7);
+x_9 = l_ByteArray_foldlMUnsafe_fold___rarg(x_2, x_3, x_4, x_8, x_5, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_eq(x_4, x_5);
+if (x_7 == 0)
+{
+lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_8 = lean_ctor_get(x_1, 1);
+lean_inc(x_8);
+x_9 = lean_byte_array_uget(x_3, x_4);
+x_10 = lean_box(x_9);
+lean_inc(x_2);
+x_11 = lean_apply_2(x_2, x_6, x_10);
+x_12 = lean_box_usize(x_4);
+x_13 = lean_box_usize(x_5);
+x_14 = lean_alloc_closure((void*)(l_ByteArray_foldlMUnsafe_fold___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_14, 0, x_12);
+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_13);
+x_15 = lean_apply_4(x_8, lean_box(0), lean_box(0), x_11, x_14);
+return x_15;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_16 = lean_ctor_get(x_1, 0);
+lean_inc(x_16);
+lean_dec(x_1);
+x_17 = lean_ctor_get(x_16, 1);
+lean_inc(x_17);
+lean_dec(x_16);
+x_18 = lean_apply_2(x_17, lean_box(0), x_6);
+return x_18;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_foldlMUnsafe_fold___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_ByteArray_foldlMUnsafe_fold___rarg___lambda__1(x_7, x_2, x_3, x_4, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_ByteArray_foldlMUnsafe_fold___rarg(x_1, x_2, x_3, x_7, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe___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:
+{
+uint8_t x_7; 
+x_7 = lean_nat_dec_lt(x_5, 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_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_3);
+return x_10;
+}
+else
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_byte_array_size(x_4);
+x_12 = lean_nat_dec_le(x_6, x_11);
+lean_dec(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_dec(x_4);
+lean_dec(x_2);
+x_13 = lean_ctor_get(x_1, 0);
+lean_inc(x_13);
+lean_dec(x_1);
+x_14 = lean_ctor_get(x_13, 1);
+lean_inc(x_14);
+lean_dec(x_13);
+x_15 = lean_apply_2(x_14, lean_box(0), x_3);
+return x_15;
+}
+else
+{
+size_t x_16; size_t x_17; lean_object* x_18; 
+x_16 = lean_usize_of_nat(x_5);
+x_17 = lean_usize_of_nat(x_6);
+x_18 = l_ByteArray_foldlMUnsafe_fold___rarg(x_1, x_2, x_4, x_16, x_17, x_3);
+return x_18;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_foldlMUnsafe___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe___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_ByteArray_foldlMUnsafe___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_unsigned_to_nat(1u);
+x_9 = lean_nat_add(x_1, x_8);
+lean_dec(x_1);
+x_10 = l_ByteArray_foldlM_loop___rarg(x_2, x_3, x_4, x_5, lean_box(0), x_6, x_9, x_7);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; 
+x_9 = lean_nat_dec_lt(x_7, x_4);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_10 = lean_ctor_get(x_1, 0);
+lean_inc(x_10);
+lean_dec(x_1);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_apply_2(x_11, lean_box(0), x_8);
+return x_12;
+}
+else
+{
+lean_object* x_13; uint8_t x_14; 
+x_13 = lean_unsigned_to_nat(0u);
+x_14 = lean_nat_dec_eq(x_6, x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_15 = lean_unsigned_to_nat(1u);
+x_16 = lean_nat_sub(x_6, x_15);
+x_17 = lean_ctor_get(x_1, 1);
+lean_inc(x_17);
+x_18 = lean_byte_array_fget(x_3, x_7);
+x_19 = lean_box(x_18);
+lean_inc(x_2);
+x_20 = lean_apply_2(x_2, x_8, x_19);
+x_21 = lean_alloc_closure((void*)(l_ByteArray_foldlM_loop___rarg___lambda__1___boxed), 7, 6);
+lean_closure_set(x_21, 0, x_7);
+lean_closure_set(x_21, 1, x_1);
+lean_closure_set(x_21, 2, x_2);
+lean_closure_set(x_21, 3, x_3);
+lean_closure_set(x_21, 4, x_4);
+lean_closure_set(x_21, 5, x_16);
+x_22 = lean_apply_4(x_17, lean_box(0), lean_box(0), x_20, x_21);
+return x_22;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_23 = lean_ctor_get(x_1, 0);
+lean_inc(x_23);
+lean_dec(x_1);
+x_24 = lean_ctor_get(x_23, 1);
+lean_inc(x_24);
+lean_dec(x_23);
+x_25 = lean_apply_2(x_24, lean_box(0), x_8);
+return x_25;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_foldlM_loop___rarg___boxed), 8, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_ByteArray_foldlM_loop___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_ByteArray_foldlM_loop___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM___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; 
+x_7 = lean_byte_array_size(x_4);
+x_8 = lean_nat_dec_le(x_6, x_7);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; 
+lean_dec(x_6);
+x_9 = lean_nat_sub(x_7, x_5);
+x_10 = l_ByteArray_foldlM_loop___rarg(x_1, x_2, x_4, x_7, lean_box(0), x_9, x_5, x_3);
+lean_dec(x_9);
+return x_10;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; 
+lean_dec(x_7);
+x_11 = lean_nat_sub(x_6, x_5);
+x_12 = l_ByteArray_foldlM_loop___rarg(x_1, x_2, x_4, x_6, lean_box(0), x_11, x_5, x_3);
+lean_dec(x_11);
+return x_12;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlM(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_ByteArray_foldlM___rarg), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; 
+x_6 = lean_usize_dec_eq(x_3, x_4);
+if (x_6 == 0)
+{
+uint8_t x_7; lean_object* x_8; lean_object* x_9; size_t x_10; size_t x_11; 
+x_7 = lean_byte_array_uget(x_2, x_3);
+x_8 = lean_box(x_7);
+lean_inc(x_1);
+x_9 = lean_apply_2(x_1, x_5, x_8);
+x_10 = 1;
+x_11 = lean_usize_add(x_3, x_10);
+x_3 = x_11;
+x_5 = x_9;
+goto _start;
+}
+else
+{
+lean_dec(x_1);
+return x_5;
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldl___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; 
+x_6 = lean_nat_dec_lt(x_4, x_5);
+if (x_6 == 0)
+{
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_2;
+}
+else
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_byte_array_size(x_3);
+x_8 = lean_nat_dec_le(x_5, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_2;
+}
+else
+{
+size_t x_9; size_t x_10; lean_object* x_11; 
+x_9 = lean_usize_of_nat(x_4);
+lean_dec(x_4);
+x_10 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+x_11 = l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg(x_1, x_3, x_9, x_10, x_2);
+lean_dec(x_3);
+return x_11;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldl(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_ByteArray_foldl___rarg), 5, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+size_t x_6; size_t x_7; lean_object* x_8; 
+x_6 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = l_ByteArray_foldlMUnsafe_fold___at_ByteArray_foldl___spec__1___rarg(x_1, x_2, x_6, x_7, x_5);
+lean_dec(x_2);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_List_toByteArray_loop(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -666,7 +1442,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_ByteArray_toUInt64LE_x21___closed__4;
 x_2 = l_ByteArray_toUInt64LE_x21___closed__5;
-x_3 = lean_unsigned_to_nat(91u);
+x_3 = lean_unsigned_to_nat(191u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l_ByteArray_toUInt64LE_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -757,7 +1533,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_ByteArray_toUInt64LE_x21___closed__4;
 x_2 = l_ByteArray_toUInt64BE_x21___closed__1;
-x_3 = lean_unsigned_to_nat(103u);
+x_3 = lean_unsigned_to_nat(203u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l_ByteArray_toUInt64LE_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -868,6 +1644,8 @@ l_ByteArray_empty = _init_l_ByteArray_empty();
 lean_mark_persistent(l_ByteArray_empty);
 l_ByteArray_instInhabitedByteArray = _init_l_ByteArray_instInhabitedByteArray();
 lean_mark_persistent(l_ByteArray_instInhabitedByteArray);
+l_ByteArray_instEmptyCollectionByteArray = _init_l_ByteArray_instEmptyCollectionByteArray();
+lean_mark_persistent(l_ByteArray_instEmptyCollectionByteArray);
 l_ByteArray_instAppendByteArray___closed__1 = _init_l_ByteArray_instAppendByteArray___closed__1();
 lean_mark_persistent(l_ByteArray_instAppendByteArray___closed__1);
 l_ByteArray_instAppendByteArray = _init_l_ByteArray_instAppendByteArray();
diff --git a/stage0/stdlib/Init/Data/FloatArray/Basic.c b/stage0/stdlib/Init/Data/FloatArray/Basic.c
index 5daf6146be..8f45261ff9 100644
--- a/stage0/stdlib/Init/Data/FloatArray/Basic.c
+++ b/stage0/stdlib/Init/Data/FloatArray/Basic.c
@@ -15,50 +15,99 @@ extern "C" {
 #endif
 lean_object* l_List_reverse___rarg(lean_object*);
 lean_object* lean_float_array_size(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_get_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_toList_loop(lean_object*, lean_object*, lean_object*);
+size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_List_toFloatArray(lean_object*);
+uint8_t lean_usize_dec_eq(size_t, size_t);
 LEAN_EXPORT lean_object* l_FloatArray_push___boxed(lean_object*, lean_object*);
+lean_object* lean_float_array_uset(lean_object*, size_t, double);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_float_array_push(lean_object*, double);
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_toString___at_instToStringFloatArray___spec__1___closed__2;
 LEAN_EXPORT lean_object* l_FloatArray_get___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_size___boxed(lean_object*);
 static lean_object* l_List_toString___at_instToStringFloatArray___spec__1___closed__1;
+LEAN_EXPORT lean_object* l_FloatArray_uget___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_toList___boxed(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_toList(lean_object*);
 lean_object* lean_float_array_data(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop(lean_object*, lean_object*);
+uint8_t lean_usize_dec_lt(size_t, size_t);
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_FloatArray_empty___closed__1;
 lean_object* lean_nat_add(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_toList_loop___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_toFloatArray_loop(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_set___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* lean_nat_sub(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_instEmptyCollectionFloatArray;
 static lean_object* l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__2;
 LEAN_EXPORT lean_object* l_FloatArray_empty;
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_isEmpty___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_List_toStringAux___at_instToStringFloatArray___spec__2___boxed(lean_object*, lean_object*);
 static lean_object* l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__1;
 lean_object* lean_float_to_string(double);
 LEAN_EXPORT lean_object* l_FloatArray_mk___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forIn(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___rarg___lambda__1(lean_object*, size_t, lean_object*, lean_object*, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldl(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 double lean_float_array_fget(lean_object*, lean_object*);
+size_t lean_usize_of_nat(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forIn___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_instForInFloatArrayFloat(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_instForInFloatArrayFloat___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_instInhabitedFloatArray;
 lean_object* lean_float_array_mk(lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_set_x21___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_FloatArray_isEmpty(lean_object*);
+uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_get_x21___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_mkEmpty___boxed(lean_object*);
 lean_object* lean_float_array_set(lean_object*, lean_object*, double);
 LEAN_EXPORT lean_object* l_List_toString___at_instToStringFloatArray___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_instToStringFloatArray(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_float_array(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_getOp___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_get_x3f___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_toStringAux___at_instToStringFloatArray___spec__2(uint8_t, lean_object*);
 double lean_float_array_get(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_uset___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_float_array_fset(lean_object*, lean_object*, double);
+LEAN_EXPORT double l_FloatArray_getOp(lean_object*, lean_object*);
+double lean_float_array_uget(lean_object*, size_t);
 static lean_object* l_List_toString___at_instToStringFloatArray___spec__1___closed__3;
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_data___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_mk___boxed(lean_object* x_1) {
 _start:
 {
@@ -109,6 +158,14 @@ x_1 = l_FloatArray_empty;
 return x_1;
 }
 }
+static lean_object* _init_l_FloatArray_instEmptyCollectionFloatArray() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_FloatArray_empty;
+return x_1;
+}
+}
 LEAN_EXPORT lean_object* l_FloatArray_push___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -128,6 +185,18 @@ lean_dec(x_1);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_FloatArray_uget___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; double x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = lean_float_array_uget(x_1, x_4);
+lean_dec(x_1);
+x_6 = lean_box_float(x_5);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l_FloatArray_get___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -184,6 +253,37 @@ lean_dec(x_1);
 return x_3;
 }
 }
+LEAN_EXPORT double l_FloatArray_getOp(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+double x_3; 
+x_3 = lean_float_array_get(x_1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_getOp___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+double x_3; lean_object* x_4; 
+x_3 = l_FloatArray_getOp(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box_float(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_uset___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+size_t x_5; double x_6; lean_object* x_7; 
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = lean_unbox_float(x_3);
+lean_dec(x_3);
+x_7 = lean_float_array_uset(x_1, x_5, x_6);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_FloatArray_set___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -286,6 +386,657 @@ lean_dec(x_1);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___rarg___lambda__1(lean_object* x_1, size_t x_2, lean_object* x_3, lean_object* x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+if (lean_obj_tag(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);
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+lean_dec(x_6);
+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_7);
+return x_10;
+}
+else
+{
+lean_object* x_11; size_t x_12; size_t x_13; lean_object* x_14; 
+x_11 = lean_ctor_get(x_6, 0);
+lean_inc(x_11);
+lean_dec(x_6);
+x_12 = 1;
+x_13 = lean_usize_add(x_2, x_12);
+x_14 = l_FloatArray_forInUnsafe_loop___rarg(x_1, x_3, x_4, x_5, x_13, x_11);
+return x_14;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_lt(x_5, x_4);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+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_6);
+return x_10;
+}
+else
+{
+double x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_11 = lean_float_array_uget(x_2, x_5);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
+x_13 = lean_box_float(x_11);
+lean_inc(x_3);
+x_14 = lean_apply_2(x_3, x_13, x_6);
+x_15 = lean_box_usize(x_5);
+x_16 = lean_box_usize(x_4);
+x_17 = lean_alloc_closure((void*)(l_FloatArray_forInUnsafe_loop___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_17, 0, x_1);
+lean_closure_set(x_17, 1, x_15);
+lean_closure_set(x_17, 2, x_2);
+lean_closure_set(x_17, 3, x_3);
+lean_closure_set(x_17, 4, x_16);
+x_18 = lean_apply_4(x_12, lean_box(0), lean_box(0), x_14, x_17);
+return x_18;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_forInUnsafe_loop___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_FloatArray_forInUnsafe_loop___rarg___lambda__1(x_1, x_7, x_3, x_4, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe_loop___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_FloatArray_forInUnsafe_loop___rarg(x_1, x_2, x_3, x_7, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; size_t x_6; size_t x_7; lean_object* x_8; 
+x_5 = lean_float_array_size(x_2);
+x_6 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+x_7 = 0;
+x_8 = l_FloatArray_forInUnsafe_loop___rarg(x_1, x_2, x_4, x_6, x_7, x_3);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_forInUnsafe___rarg), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___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; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_6 = lean_ctor_get(x_5, 0);
+lean_inc(x_6);
+lean_dec(x_5);
+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_apply_2(x_8, lean_box(0), x_6);
+return x_9;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_ctor_get(x_5, 0);
+lean_inc(x_10);
+lean_dec(x_5);
+x_11 = l_FloatArray_forIn_loop___rarg(x_1, x_2, x_3, x_4, lean_box(0), x_10);
+return x_11;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = lean_nat_dec_eq(x_4, x_7);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; double x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_9 = lean_unsigned_to_nat(1u);
+x_10 = lean_nat_sub(x_4, x_9);
+x_11 = lean_ctor_get(x_1, 1);
+lean_inc(x_11);
+x_12 = lean_float_array_size(x_2);
+x_13 = lean_nat_sub(x_12, x_9);
+lean_dec(x_12);
+x_14 = lean_nat_sub(x_13, x_10);
+lean_dec(x_13);
+x_15 = lean_float_array_fget(x_2, x_14);
+lean_dec(x_14);
+x_16 = lean_box_float(x_15);
+lean_inc(x_3);
+x_17 = lean_apply_2(x_3, x_16, x_6);
+x_18 = lean_alloc_closure((void*)(l_FloatArray_forIn_loop___rarg___lambda__1___boxed), 5, 4);
+lean_closure_set(x_18, 0, x_1);
+lean_closure_set(x_18, 1, x_2);
+lean_closure_set(x_18, 2, x_3);
+lean_closure_set(x_18, 3, x_10);
+x_19 = lean_apply_4(x_11, lean_box(0), lean_box(0), x_17, x_18);
+return x_19;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_20 = lean_ctor_get(x_1, 0);
+lean_inc(x_20);
+lean_dec(x_1);
+x_21 = lean_ctor_get(x_20, 1);
+lean_inc(x_21);
+lean_dec(x_20);
+x_22 = lean_apply_2(x_21, lean_box(0), x_6);
+return x_22;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_forIn_loop___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___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_FloatArray_forIn_loop___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn_loop___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_FloatArray_forIn_loop___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn___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_float_array_size(x_2);
+x_6 = l_FloatArray_forIn_loop___rarg(x_1, x_2, x_4, x_5, lean_box(0), x_3);
+lean_dec(x_5);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_forIn(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_forIn___rarg), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_instForInFloatArrayFloat___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; size_t x_6; size_t x_7; lean_object* x_8; 
+x_5 = lean_float_array_size(x_2);
+x_6 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+x_7 = 0;
+x_8 = l_FloatArray_forInUnsafe_loop___rarg(x_1, x_2, x_4, x_6, x_7, x_3);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_instForInFloatArrayFloat(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_instForInFloatArrayFloat___rarg), 4, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___rarg___lambda__1(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = 1;
+x_8 = lean_usize_add(x_1, x_7);
+x_9 = l_FloatArray_foldlMUnsafe_fold___rarg(x_2, x_3, x_4, x_8, x_5, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_eq(x_4, x_5);
+if (x_7 == 0)
+{
+lean_object* x_8; double x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_8 = lean_ctor_get(x_1, 1);
+lean_inc(x_8);
+x_9 = lean_float_array_uget(x_3, x_4);
+x_10 = lean_box_float(x_9);
+lean_inc(x_2);
+x_11 = lean_apply_2(x_2, x_6, x_10);
+x_12 = lean_box_usize(x_4);
+x_13 = lean_box_usize(x_5);
+x_14 = lean_alloc_closure((void*)(l_FloatArray_foldlMUnsafe_fold___rarg___lambda__1___boxed), 6, 5);
+lean_closure_set(x_14, 0, x_12);
+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_13);
+x_15 = lean_apply_4(x_8, lean_box(0), lean_box(0), x_11, x_14);
+return x_15;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_16 = lean_ctor_get(x_1, 0);
+lean_inc(x_16);
+lean_dec(x_1);
+x_17 = lean_ctor_get(x_16, 1);
+lean_inc(x_17);
+lean_dec(x_16);
+x_18 = lean_apply_2(x_17, lean_box(0), x_6);
+return x_18;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_foldlMUnsafe_fold___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_FloatArray_foldlMUnsafe_fold___rarg___lambda__1(x_7, x_2, x_3, x_4, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___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:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_9 = l_FloatArray_foldlMUnsafe_fold___rarg(x_1, x_2, x_3, x_7, x_8, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe___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:
+{
+uint8_t x_7; 
+x_7 = lean_nat_dec_lt(x_5, 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_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_3);
+return x_10;
+}
+else
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_float_array_size(x_4);
+x_12 = lean_nat_dec_le(x_6, x_11);
+lean_dec(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_dec(x_4);
+lean_dec(x_2);
+x_13 = lean_ctor_get(x_1, 0);
+lean_inc(x_13);
+lean_dec(x_1);
+x_14 = lean_ctor_get(x_13, 1);
+lean_inc(x_14);
+lean_dec(x_13);
+x_15 = lean_apply_2(x_14, lean_box(0), x_3);
+return x_15;
+}
+else
+{
+size_t x_16; size_t x_17; lean_object* x_18; 
+x_16 = lean_usize_of_nat(x_5);
+x_17 = lean_usize_of_nat(x_6);
+x_18 = l_FloatArray_foldlMUnsafe_fold___rarg(x_1, x_2, x_4, x_16, x_17, x_3);
+return x_18;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_foldlMUnsafe___rarg___boxed), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe___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_FloatArray_foldlMUnsafe___rarg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_unsigned_to_nat(1u);
+x_9 = lean_nat_add(x_1, x_8);
+lean_dec(x_1);
+x_10 = l_FloatArray_foldlM_loop___rarg(x_2, x_3, x_4, x_5, lean_box(0), x_6, x_9, x_7);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; 
+x_9 = lean_nat_dec_lt(x_7, x_4);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_10 = lean_ctor_get(x_1, 0);
+lean_inc(x_10);
+lean_dec(x_1);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_apply_2(x_11, lean_box(0), x_8);
+return x_12;
+}
+else
+{
+lean_object* x_13; uint8_t x_14; 
+x_13 = lean_unsigned_to_nat(0u);
+x_14 = lean_nat_dec_eq(x_6, x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; double x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_15 = lean_unsigned_to_nat(1u);
+x_16 = lean_nat_sub(x_6, x_15);
+x_17 = lean_ctor_get(x_1, 1);
+lean_inc(x_17);
+x_18 = lean_float_array_fget(x_3, x_7);
+x_19 = lean_box_float(x_18);
+lean_inc(x_2);
+x_20 = lean_apply_2(x_2, x_8, x_19);
+x_21 = lean_alloc_closure((void*)(l_FloatArray_foldlM_loop___rarg___lambda__1___boxed), 7, 6);
+lean_closure_set(x_21, 0, x_7);
+lean_closure_set(x_21, 1, x_1);
+lean_closure_set(x_21, 2, x_2);
+lean_closure_set(x_21, 3, x_3);
+lean_closure_set(x_21, 4, x_4);
+lean_closure_set(x_21, 5, x_16);
+x_22 = lean_apply_4(x_17, lean_box(0), lean_box(0), x_20, x_21);
+return x_22;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_23 = lean_ctor_get(x_1, 0);
+lean_inc(x_23);
+lean_dec(x_1);
+x_24 = lean_ctor_get(x_23, 1);
+lean_inc(x_24);
+lean_dec(x_23);
+x_25 = lean_apply_2(x_24, lean_box(0), x_8);
+return x_25;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_foldlM_loop___rarg___boxed), 8, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_FloatArray_foldlM_loop___rarg___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM_loop___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_FloatArray_foldlM_loop___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM___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; 
+x_7 = lean_float_array_size(x_4);
+x_8 = lean_nat_dec_le(x_6, x_7);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; 
+lean_dec(x_6);
+x_9 = lean_nat_sub(x_7, x_5);
+x_10 = l_FloatArray_foldlM_loop___rarg(x_1, x_2, x_4, x_7, lean_box(0), x_9, x_5, x_3);
+lean_dec(x_9);
+return x_10;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; 
+lean_dec(x_7);
+x_11 = lean_nat_sub(x_6, x_5);
+x_12 = l_FloatArray_foldlM_loop___rarg(x_1, x_2, x_4, x_6, lean_box(0), x_11, x_5, x_3);
+lean_dec(x_11);
+return x_12;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlM(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_FloatArray_foldlM___rarg), 6, 0);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; 
+x_6 = lean_usize_dec_eq(x_3, x_4);
+if (x_6 == 0)
+{
+double x_7; lean_object* x_8; lean_object* x_9; size_t x_10; size_t x_11; 
+x_7 = lean_float_array_uget(x_2, x_3);
+x_8 = lean_box_float(x_7);
+lean_inc(x_1);
+x_9 = lean_apply_2(x_1, x_5, x_8);
+x_10 = 1;
+x_11 = lean_usize_add(x_3, x_10);
+x_3 = x_11;
+x_5 = x_9;
+goto _start;
+}
+else
+{
+lean_dec(x_1);
+return x_5;
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldl___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; 
+x_6 = lean_nat_dec_lt(x_4, x_5);
+if (x_6 == 0)
+{
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_2;
+}
+else
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_float_array_size(x_3);
+x_8 = lean_nat_dec_le(x_5, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_2;
+}
+else
+{
+size_t x_9; size_t x_10; lean_object* x_11; 
+x_9 = lean_usize_of_nat(x_4);
+lean_dec(x_4);
+x_10 = lean_usize_of_nat(x_5);
+lean_dec(x_5);
+x_11 = l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg(x_1, x_3, x_9, x_10, x_2);
+lean_dec(x_3);
+return x_11;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldl(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_FloatArray_foldl___rarg), 5, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+size_t x_6; size_t x_7; lean_object* x_8; 
+x_6 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = l_FloatArray_foldlMUnsafe_fold___at_FloatArray_foldl___spec__1___rarg(x_1, x_2, x_6, x_7, x_5);
+lean_dec(x_2);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_List_toFloatArray_loop(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -510,6 +1261,8 @@ l_FloatArray_empty = _init_l_FloatArray_empty();
 lean_mark_persistent(l_FloatArray_empty);
 l_FloatArray_instInhabitedFloatArray = _init_l_FloatArray_instInhabitedFloatArray();
 lean_mark_persistent(l_FloatArray_instInhabitedFloatArray);
+l_FloatArray_instEmptyCollectionFloatArray = _init_l_FloatArray_instEmptyCollectionFloatArray();
+lean_mark_persistent(l_FloatArray_instEmptyCollectionFloatArray);
 l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__1 = _init_l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__1();
 lean_mark_persistent(l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__1);
 l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__2 = _init_l_List_toStringAux___at_instToStringFloatArray___spec__2___closed__2();
diff --git a/stage0/stdlib/Init/Data/Hashable.c b/stage0/stdlib/Init/Data/Hashable.c
index 44d7374828..b8146ea8af 100644
--- a/stage0/stdlib/Init/Data/Hashable.c
+++ b/stage0/stdlib/Init/Data/Hashable.c
@@ -13,11 +13,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+uint64_t lean_uint8_to_uint64(uint8_t);
 LEAN_EXPORT uint64_t l_instHashableProd___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint64_t l_instHashableUSize(size_t);
 LEAN_EXPORT lean_object* l_instHashableList(lean_object*);
 LEAN_EXPORT lean_object* l_instHashableUSize___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_List_foldl___at_instHashableList___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
+uint64_t lean_uint16_to_uint64(uint16_t);
 LEAN_EXPORT lean_object* l_instHashable___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint64_t l_instHashableBool(uint8_t);
 LEAN_EXPORT lean_object* l_instHashableOption(lean_object*);
@@ -28,6 +30,8 @@ LEAN_EXPORT lean_object* l_List_foldl___at_instHashableList___spec__1(lean_objec
 LEAN_EXPORT lean_object* l_instHashableUInt64___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_instHashableProd(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_instHashableUInt16___boxed(lean_object*);
+LEAN_EXPORT uint64_t l_instHashableUInt16(uint16_t);
 uint64_t lean_uint64_of_nat(lean_object*);
 LEAN_EXPORT uint64_t l_instHashableUInt64(uint64_t);
 LEAN_EXPORT lean_object* l_instHashableList___rarg___boxed(lean_object*, lean_object*);
@@ -52,6 +56,8 @@ LEAN_EXPORT lean_object* l_instHashableBool___boxed(lean_object*);
 LEAN_EXPORT uint64_t l_instHashableUInt32(uint32_t);
 LEAN_EXPORT uint64_t l_List_foldl___at_instHashableList___spec__1___rarg(lean_object*, uint64_t, lean_object*);
 static lean_object* l_instHashableInt___closed__1;
+LEAN_EXPORT lean_object* l_instHashableUInt8___boxed(lean_object*);
+LEAN_EXPORT uint64_t l_instHashableUInt8(uint8_t);
 lean_object* lean_nat_to_int(lean_object*);
 LEAN_EXPORT lean_object* l_instHashableInt___boxed(lean_object*);
 LEAN_EXPORT uint64_t l_instHashableNat(lean_object* x_1) {
@@ -250,6 +256,44 @@ x_4 = lean_box_uint64(x_3);
 return x_4;
 }
 }
+LEAN_EXPORT uint64_t l_instHashableUInt8(uint8_t x_1) {
+_start:
+{
+uint64_t x_2; 
+x_2 = lean_uint8_to_uint64(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_instHashableUInt8___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; uint64_t x_3; lean_object* x_4; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_instHashableUInt8(x_2);
+x_4 = lean_box_uint64(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT uint64_t l_instHashableUInt16(uint16_t x_1) {
+_start:
+{
+uint64_t x_2; 
+x_2 = lean_uint16_to_uint64(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_instHashableUInt16___boxed(lean_object* x_1) {
+_start:
+{
+uint16_t x_2; uint64_t x_3; lean_object* x_4; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_instHashableUInt16(x_2);
+x_4 = lean_box_uint64(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT uint64_t l_instHashableUInt32(uint32_t x_1) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Attributes.c b/stage0/stdlib/Lean/Attributes.c
index 0a7faedf1f..e0c42c62ea 100644
--- a/stage0/stdlib/Lean/Attributes.c
+++ b/stage0/stdlib/Lean/Attributes.c
@@ -21,7 +21,6 @@ lean_object* l_Lean_initializing(lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerEnumAttributes___spec__4(lean_object*);
 static lean_object* l_Lean_instInhabitedTagAttribute___closed__1;
 static lean_object* l_Array_qsort_sort___at_Lean_registerParametricAttribute___spec__2___rarg___closed__1;
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeKind_noConfusion___rarg(uint8_t, uint8_t, lean_object*);
 static lean_object* l_Lean_instBEqAttributeApplicationTime___closed__1;
 LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAtAux___at_Lean_registerBuiltinAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -31,11 +30,11 @@ LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes___rarg___lambda__1___boxe
 LEAN_EXPORT lean_object* l_Lean_ParametricAttributeImpl_afterSet___default(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_AttributeKind_toCtorIdx(uint8_t);
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__7;
 static lean_object* l_Lean_registerTagAttribute___closed__3;
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__7;
 lean_object* l_Lean_stringToMessageData(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_updateEnvAttributesRef;
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedTagAttribute___lambda__4___boxed(lean_object*);
 static lean_object* l_Lean_mkAttributeImplOfBuilder___closed__1;
 LEAN_EXPORT uint8_t l_Std_AssocList_contains___at_Lean_registerAttributeImplBuilder___spec__2(lean_object*, lean_object*);
@@ -45,7 +44,6 @@ LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_getBuiltinAttr
 lean_object* lean_nat_div(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Attribute_add___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_getBuiltinAttributeNames___spec__3(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAtAux___at_Lean_registerBuiltinAttribute___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerParametricAttribute___rarg___lambda__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -53,22 +51,25 @@ extern lean_object* l_Lean_NameSet_instInhabitedNameSet;
 LEAN_EXPORT lean_object* l_Lean_registerParametricAttribute___rarg___lambda__4(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_getAttrParamOptPrio___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_registerParametricAttribute___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2633____spec__1___boxed(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
 static lean_object* l_Lean_Attribute_Builtin_getIdent_x3f___closed__2;
 lean_object* lean_io_error_to_string(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instMonadLiftImportMAttrM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_ParametricAttribute_setParam___rarg___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Attributes_0__Lean_AttributeExtension_mkInitial(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Attributes_0__Lean_AttributeExtension_addImported___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* lean_update_env_attributes(lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedTagAttribute___closed__7;
 LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__8(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Attribute_Builtin_getIdent(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_registerEnumAttributes___spec__9___rarg___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_getIdent_x3f___closed__4;
 LEAN_EXPORT lean_object* lean_attribute_application_time(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getBuiltinAttributeImpl(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_ParametricAttribute_getParam___spec__3(lean_object*);
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
@@ -81,9 +82,9 @@ LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_registerEnumAttributes___s
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_registerParametricAttribute___spec__7___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forM___at_Lean_registerEnumAttributes___spec__10(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_EnumAttributes_getValue___spec__7(lean_object*);
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2634____spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_EnumAttributes_getValue___spec__2___rarg___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_ParametricAttribute_setParam___rarg___closed__2;
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2633____spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_ParametricAttribute_setParam___spec__2___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerParametricAttribute___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeExtensionState_newEntries___default;
@@ -125,7 +126,6 @@ LEAN_EXPORT lean_object* l_panic___at_Lean_isAttribute___spec__3(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_ParametricAttribute_setParam___spec__2___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3694____lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_EnumAttributes_getValue___spec__1___rarg___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_registerEnumAttributes___rarg___lambda__3___closed__2;
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*);
@@ -134,14 +134,12 @@ LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__4(
 LEAN_EXPORT lean_object* l_Std_RBNode_fold___at_Lean_registerEnumAttributes___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_attributeMapRef;
 LEAN_EXPORT lean_object* l_Lean_attributeImplBuilderTableRef;
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2(lean_object*, lean_object*);
 size_t lean_usize_shift_right(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_attributeExtension___elambda__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_fold___at_Lean_registerParametricAttribute___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_227_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3694_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_2634_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_2633_(lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_ensureNoArgs___closed__5;
 LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at_Lean_getAttrParamOptPrio___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes___rarg___lambda__3___boxed(lean_object*);
@@ -164,6 +162,7 @@ static lean_object* l_Lean_registerTagAttribute___closed__2;
 LEAN_EXPORT lean_object* l_Lean_attributeExtension___elambda__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Attribute_add___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_ParametricAttribute_getParam___spec__7(lean_object*);
+static lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___closed__1;
 static size_t l_Std_PersistentHashMap_containsAux___at_Lean_registerBuiltinAttribute___spec__2___closed__2;
 static lean_object* l_Lean_registerEnumAttributes___rarg___lambda__3___closed__4;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_EnumAttributes_getValue___spec__1___rarg(lean_object*, lean_object*);
@@ -172,8 +171,8 @@ static lean_object* l_Lean_instInhabitedAttributeImpl___closed__1;
 LEAN_EXPORT lean_object* l_Lean_mkAttributeImplOfConstant___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_ParametricAttribute_setParam___spec__1___rarg___boxed(lean_object*, lean_object*);
 static size_t l_Std_PersistentHashMap_containsAux___at_Lean_registerBuiltinAttribute___spec__2___closed__1;
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__1(lean_object*);
 extern lean_object* l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_invalidExtMsg;
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__1;
 size_t lean_uint64_to_usize(uint64_t);
 static lean_object* l_Lean_instInhabitedAttributeExtensionState___closed__1;
 static lean_object* l_Lean_mkAttributeImplOfConstant___closed__1;
@@ -191,6 +190,7 @@ LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_EnumAttributes_setValue___s
 LEAN_EXPORT lean_object* l_Lean_getAttrParamOptPrio(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ParametricAttributeImpl_afterImport___default___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_mkAttributeImplOfBuilder___spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_EnumAttributes_getValue___spec__1(lean_object*);
 static lean_object* l_Lean_instInhabitedAttributeImpl___closed__2;
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_EnumAttributes_setValue___spec__4___rarg___boxed(lean_object*, lean_object*);
@@ -200,19 +200,21 @@ static lean_object* l_Lean_attributeExtension___closed__5;
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_EnumAttributes_getValue___spec__8(lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedAttributeExtensionState;
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_updateEnvAttributesImpl___spec__3(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Lean_instToStringAttributeKind___closed__3;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Attributes_0__Lean_beqAttributeKind____x40_Lean_Attributes___hyg_130_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_getBuiltinAttributeNames___spec__1___rarg(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__1;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_getBuiltinAttributeNames___spec__2___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 extern lean_object* l_Lean_numLitKind;
 lean_object* l_EStateM_bind___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__1(lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_updateEnvAttributesImpl___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_ensureNoArgs___closed__9;
 static lean_object* l_Lean_instBEqAttributeKind___closed__1;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_isAttribute___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerParametricAttribute___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_ParametricAttribute_setParam___spec__1___rarg(lean_object*, lean_object*);
@@ -227,7 +229,6 @@ static lean_object* l_Lean_attributeExtension___closed__3;
 LEAN_EXPORT lean_object* l_Lean_registerAttributeOfBuilder(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instToStringAttributeKind___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_EnumAttributes_setValue___spec__2___rarg(lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__4;
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_EnumAttributes_setValue___spec__4(lean_object*);
 static lean_object* l_Lean_instToStringAttributeKind___closed__1;
 static lean_object* l_Lean_instInhabitedEnumAttributes___closed__1;
@@ -236,11 +237,13 @@ LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerEnumAttribute
 static lean_object* l_Lean_instToStringAttributeKind___closed__2;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedAttributeImplCore;
 LEAN_EXPORT lean_object* lean_is_attribute(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__2;
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_AttributeApplicationTime_noConfusion___rarg(uint8_t, uint8_t, lean_object*);
 lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* lean_get_num_attributes(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instBEqAttributeApplicationTime;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_ParametricAttribute_getParam___spec__6___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeApplicationTime_noConfusion___rarg___lambda__1___boxed(lean_object*);
@@ -292,7 +295,6 @@ lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_obje
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_EnumAttributes_setValue___spec__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedAttributeImpl___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ParametricAttribute_setParam(lean_object*);
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_EnumAttributes_getValue___spec__4___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerEnumAttributes___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_attributeExtension___closed__1;
@@ -303,29 +305,27 @@ size_t lean_usize_shift_left(size_t, size_t);
 lean_object* lean_eval_const(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_EnumAttributes_getValue___spec__3___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__1(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__2;
 static lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_getBuiltinAttributeNames___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes___rarg___lambda__3(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedTagAttribute___closed__3;
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__8;
 static lean_object* l_Lean_attributeExtension___closed__4;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_registerEnumAttributes___spec__8___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_qsort_sort___at_Lean_mkTagDeclarationExtension___spec__1(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__8;
 static lean_object* l_Lean_instInhabitedTagAttribute___closed__5;
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__4;
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerEnumAttributes___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ofExcept___at_Lean_Attribute_add___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_persistentEnvExtensionsRef;
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerParametricAttribute___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_registerParametricAttribute___rarg___closed__1;
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__3;
 static lean_object* l_Lean_registerTagAttribute___lambda__6___closed__3;
 static lean_object* l_panic___at_Lean_isAttribute___spec__3___closed__1;
 static lean_object* l_Lean_registerTagAttribute___lambda__4___closed__6;
 static lean_object* l_Lean_registerParametricAttribute___rarg___closed__2;
 LEAN_EXPORT lean_object* l_Lean_getBuiltinAttributeNames(lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__5;
 size_t lean_usize_modn(size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerParametricAttribute___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -373,13 +373,14 @@ static lean_object* l_Lean_registerTagAttribute___lambda__4___closed__2;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_getBuiltinAttributeNames___spec__2___lambda__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_mkAttributeImplOfConstantUnsafe___closed__4;
 LEAN_EXPORT lean_object* l_Lean_ParametricAttribute_setParam___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__5;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_contains___at_Lean_registerBuiltinAttribute___spec__1___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Attribute_add(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_IO_ofExcept___at_Lean_mkAttributeImplOfBuilder___spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_ParametricAttribute_getParam___spec__2___rarg___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_getPrio___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Attribute_add___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__3;
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___lambda__1(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Attributes_0__Lean_AttributeExtension_addImported___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getAttributeImpl___boxed(lean_object*, lean_object*);
@@ -387,6 +388,7 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_E
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lean_EnumAttributes_getValue___spec__5___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_registerEnumAttributes___spec__9___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerParametricAttribute___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_mkAttributeImplOfBuilder___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lean_TagAttribute_hasTag___spec__4___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_ParametricAttribute_getParam___spec__7___rarg(lean_object*);
@@ -412,6 +414,7 @@ LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_Parame
 LEAN_EXPORT lean_object* l_Lean_registerAttributeOfDecl___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lean_ParametricAttribute_getParam___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Attributes_0__Lean_AttributeExtension_addImported___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_TagAttribute_hasTag___spec__2___closed__3;
 LEAN_EXPORT lean_object* l_panic___at_Lean_TagAttribute_hasTag___spec__3(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -451,17 +454,15 @@ static lean_object* l_Lean_registerBuiltinAttribute___closed__2;
 lean_object* l_Lean_instInhabitedPersistentEnvExtensionState___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_registerTagAttribute___spec__2___lambda__2(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Attributes_0__Lean_beqAttributeApplicationTime____x40_Lean_Attributes___hyg_14_(uint8_t, uint8_t);
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___lambda__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedName;
 static lean_object* l_Lean_Attribute_Builtin_getIdent___closed__2;
 LEAN_EXPORT lean_object* l_Lean_registerBuiltinAttribute___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Environment_getModuleIdxFor_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at_Lean_Attribute_Builtin_ensureNoArgs___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
-static lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___closed__1;
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Attribute_Builtin_getIdent_x3f___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__6;
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_registerParametricAttribute___spec__2___rarg___lambda__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_registerEnumAttributes___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_ParametricAttribute_getParam___spec__4___rarg(lean_object*, lean_object*);
@@ -477,6 +478,7 @@ static lean_object* l_Lean_Attribute_Builtin_ensureNoArgs___closed__4;
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_registerParametricAttribute___spec__7(lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_contains___at_Lean_registerAttributeImplBuilder___spec__2___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_getBuiltinAttributeNames___spec__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_ensureNoArgs___closed__8;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_registerEnumAttributes___spec__8(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerBuiltinAttribute___lambda__1(lean_object*, lean_object*, lean_object*);
@@ -500,10 +502,8 @@ static lean_object* l_Lean_instInhabitedTagAttribute___lambda__3___closed__1;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_TagAttribute_hasTag___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnumAttributes_setValue___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeApplicationTime_toCtorIdx(uint8_t);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__3(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerParametricAttribute___rarg___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_registerEnumAttributes___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__6;
 lean_object* l_List_lengthTRAux___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_EnumAttributes_getValue___spec__3(lean_object*);
 uint8_t l_Lean_NameSet_contains(lean_object*, lean_object*);
@@ -522,14 +522,13 @@ LEAN_EXPORT uint8_t l_Lean_AttributeImplCore_applicationTime___default;
 static lean_object* l_Lean_Attribute_Builtin_getIdent___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Attributes_0__Lean_AttributeExtension_addImported___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ParametricAttributeImpl_afterImport___default___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3694____closed__1;
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2(lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Std_PersistentHashMap_find_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_227____closed__3;
 lean_object* l_IO_mkRef___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_registerEnumAttributes___spec__7___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_AttributeApplicationTime_noConfusion___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_TagAttribute_hasTag___spec__2___boxed(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_ParametricAttribute_getParam___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAux___at_Lean_registerBuiltinAttribute___spec__2(lean_object*, size_t, lean_object*);
@@ -549,6 +548,7 @@ LEAN_EXPORT lean_object* l_Lean_registerAttributeOfDecl(lean_object*, lean_objec
 static lean_object* l_Lean_registerTagAttribute___lambda__4___closed__4;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedTagAttribute___lambda__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeApplicationTime_noConfusion___rarg___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_EnumAttributes_getValue___spec__4(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_EnumAttributes_setValue___spec__2___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeImpl_erase___default___rarg(lean_object*, lean_object*, lean_object*);
@@ -569,7 +569,6 @@ LEAN_EXPORT lean_object* l_Lean_getAttributeImpl(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_AttributeImpl_erase___default___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_EnumAttributes_getValue___spec__6(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_registerEnumAttributes___spec__9___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkAttributeImplOfBuilder(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Attribute_Builtin_getId_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -577,7 +576,6 @@ LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_ParametricAttribute_getPara
 static lean_object* l_Lean_registerBuiltinAttribute___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_TagAttribute_hasTag___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_ensureNoArgs___closed__10;
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2634____spec__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnumAttributes_getValue(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes___rarg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
@@ -8804,7 +8802,7 @@ lean_dec(x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2634____spec__1(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2633____spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -8812,7 +8810,7 @@ x_2 = l_Std_mkHashMapImp___rarg(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_2634_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_2633_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
@@ -8822,11 +8820,11 @@ x_4 = l_IO_mkRef___rarg(x_3, x_1);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2634____spec__1___boxed(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2633____spec__1___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2634____spec__1(x_1);
+x_2 = l_Std_mkHashMap___at_Lean_initFn____x40_Lean_Attributes___hyg_2633____spec__1(x_1);
 lean_dec(x_1);
 return x_2;
 }
@@ -10049,7 +10047,7 @@ lean_ctor_set(x_13, 1, x_12);
 return x_13;
 }
 }
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -10087,7 +10085,7 @@ return x_14;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -10132,7 +10130,7 @@ size_t x_16; size_t x_17; uint8_t x_18;
 x_16 = 0;
 x_17 = lean_usize_of_nat(x_8);
 lean_dec(x_8);
-x_18 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2(x_1, x_6, x_16, x_17);
+x_18 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2(x_1, x_6, x_16, x_17);
 lean_dec(x_6);
 if (x_18 == 0)
 {
@@ -10203,7 +10201,7 @@ size_t x_39; size_t x_40; uint8_t x_41;
 x_39 = 0;
 x_40 = lean_usize_of_nat(x_31);
 lean_dec(x_31);
-x_41 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2(x_1, x_29, x_39, x_40);
+x_41 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2(x_1, x_29, x_39, x_40);
 lean_dec(x_29);
 if (x_41 == 0)
 {
@@ -10237,7 +10235,7 @@ return x_52;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__1(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
@@ -10252,7 +10250,7 @@ x_6 = l_List_toArrayAux___rarg(x_3, x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__2(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
@@ -10269,7 +10267,7 @@ lean_ctor_set(x_8, 1, x_6);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__1() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -10277,17 +10275,17 @@ x_1 = lean_mk_string("attrExt");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__2() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__1;
+x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__3() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -10295,7 +10293,7 @@ x_1 = lean_alloc_closure((void*)(l___private_Lean_Attributes_0__Lean_AttributeEx
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__4() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -10303,7 +10301,7 @@ x_1 = lean_alloc_closure((void*)(l___private_Lean_Attributes_0__Lean_AttributeEx
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__5() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -10311,32 +10309,32 @@ x_1 = lean_alloc_closure((void*)(l___private_Lean_Attributes_0__Lean_addAttrEntr
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__6() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__6() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__1), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__1), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__7() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__7() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__2___boxed), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__2___boxed), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__8() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_1 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__2;
-x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__3;
-x_3 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__4;
-x_4 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__5;
-x_5 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__6;
-x_6 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__7;
+x_1 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__2;
+x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__3;
+x_3 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__4;
+x_4 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__5;
+x_5 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__6;
+x_6 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__7;
 x_7 = lean_alloc_ctor(0, 6, 0);
 lean_ctor_set(x_7, 0, x_1);
 lean_ctor_set(x_7, 1, x_2);
@@ -10347,16 +10345,16 @@ lean_ctor_set(x_7, 5, x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__8;
-x_3 = l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__1(x_2, x_1);
+x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__8;
+x_3 = l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__1(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; uint8_t x_7; lean_object* x_8; 
@@ -10364,18 +10362,18 @@ x_5 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_6 = lean_unbox_usize(x_4);
 lean_dec(x_4);
-x_7 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3209____spec__2(x_1, x_2, x_5, x_6);
+x_7 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Attributes___hyg_3208____spec__2(x_1, x_2, x_5, x_6);
 lean_dec(x_2);
 lean_dec(x_1);
 x_8 = lean_box(x_7);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__2___boxed(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__2___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3209____lambda__2(x_1);
+x_2 = l_Lean_initFn____x40_Lean_Attributes___hyg_3208____lambda__2(x_1);
 lean_dec(x_1);
 return x_2;
 }
@@ -11573,7 +11571,7 @@ return x_19;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_updateEnvAttributesImpl___spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -11649,7 +11647,7 @@ lean_object* x_27; lean_object* x_28;
 x_27 = lean_ctor_get(x_6, 0);
 lean_inc(x_27);
 lean_dec(x_6);
-x_28 = l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2(x_27, x_4);
+x_28 = l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2(x_27, x_4);
 x_2 = x_8;
 x_4 = x_28;
 goto _start;
@@ -11667,7 +11665,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; uint8_t x_6; 
@@ -11718,15 +11716,15 @@ return x_1;
 }
 }
 }
-static lean_object* _init_l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___closed__1() {
+static lean_object* _init_l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___lambda__1), 3, 0);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -11760,7 +11758,7 @@ size_t x_8; size_t x_9; lean_object* x_10;
 x_8 = 0;
 x_9 = lean_usize_of_nat(x_4);
 lean_dec(x_4);
-x_10 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__3(x_3, x_8, x_9, x_2);
+x_10 = l_Array_foldlMUnsafe_fold___at_Lean_updateEnvAttributesImpl___spec__3(x_3, x_8, x_9, x_2);
 lean_dec(x_3);
 return x_10;
 }
@@ -11774,7 +11772,7 @@ lean_inc(x_11);
 x_12 = lean_ctor_get(x_1, 1);
 lean_inc(x_12);
 lean_dec(x_1);
-x_13 = l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___closed__1;
+x_13 = l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___closed__1;
 x_14 = lean_unsigned_to_nat(0u);
 x_15 = l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_mkModuleData___spec__8___rarg(x_13, x_11, x_12, lean_box(0), x_14, x_2);
 lean_dec(x_12);
@@ -11783,26 +11781,26 @@ return x_15;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___rarg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___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_1, 0);
 lean_inc(x_3);
 lean_dec(x_1);
-x_4 = l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2(x_3, x_2);
+x_4 = l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2(x_3, x_2);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___rarg), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1___rarg), 2, 0);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3694____lambda__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* lean_update_env_attributes(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -11815,7 +11813,7 @@ lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_obj
 x_6 = lean_ctor_get(x_4, 0);
 x_7 = l_Lean_attributeExtension;
 x_8 = l_Lean_PersistentEnvExtension_getState___at_Lean_isAttribute___spec__1(x_7, x_1);
-x_9 = l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___rarg(x_6, x_8);
+x_9 = l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1___rarg(x_6, x_8);
 x_10 = l_Lean_PersistentEnvExtension_setState___rarg(x_7, x_1, x_9);
 lean_ctor_set(x_4, 0, x_10);
 return x_4;
@@ -11830,7 +11828,7 @@ lean_inc(x_11);
 lean_dec(x_4);
 x_13 = l_Lean_attributeExtension;
 x_14 = l_Lean_PersistentEnvExtension_getState___at_Lean_isAttribute___spec__1(x_13, x_1);
-x_15 = l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___rarg(x_11, x_14);
+x_15 = l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1___rarg(x_11, x_14);
 x_16 = l_Lean_PersistentEnvExtension_setState___rarg(x_13, x_1, x_15);
 x_17 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_17, 0, x_16);
@@ -11839,42 +11837,7 @@ return x_17;
 }
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3694____closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Attributes___hyg_3694____lambda__1), 2, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3694_(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; lean_object* x_3; lean_object* x_4; uint8_t x_5; 
-x_2 = l_Lean_updateEnvAttributesRef;
-x_3 = l_Lean_initFn____x40_Lean_Attributes___hyg_3694____closed__1;
-x_4 = lean_st_ref_set(x_2, x_3, x_1);
-x_5 = !lean_is_exclusive(x_4);
-if (x_5 == 0)
-{
-return x_4;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_6 = lean_ctor_get(x_4, 0);
-x_7 = lean_ctor_get(x_4, 1);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_dec(x_4);
-x_8 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_8, 0, x_6);
-lean_ctor_set(x_8, 1, x_7);
-return x_8;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_updateEnvAttributesImpl___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -11882,21 +11845,56 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__3(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_updateEnvAttributesImpl___spec__3(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_PersistentHashMap_foldlM___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__1(x_1, x_2);
+x_3 = l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
+LEAN_EXPORT lean_object* lean_get_num_attributes(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; uint8_t x_4; 
+x_2 = l_Lean_attributeMapRef;
+x_3 = lean_st_ref_get(x_2, x_1);
+x_4 = !lean_is_exclusive(x_3);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; 
+x_5 = lean_ctor_get(x_3, 0);
+x_6 = lean_ctor_get(x_5, 1);
+lean_inc(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_3, 0, x_6);
+return x_3;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_7 = lean_ctor_get(x_3, 0);
+x_8 = lean_ctor_get(x_3, 1);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_dec(x_3);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_9);
+lean_ctor_set(x_10, 1, x_8);
+return x_10;
+}
+}
+}
 lean_object* initialize_Init(lean_object*);
 lean_object* initialize_Lean_Syntax(lean_object*);
 lean_object* initialize_Lean_CoreM(lean_object*);
@@ -12136,7 +12134,7 @@ l_Lean_EnumAttributes_setValue___rarg___closed__1 = _init_l_Lean_EnumAttributes_
 lean_mark_persistent(l_Lean_EnumAttributes_setValue___rarg___closed__1);
 l_Lean_EnumAttributes_setValue___rarg___closed__2 = _init_l_Lean_EnumAttributes_setValue___rarg___closed__2();
 lean_mark_persistent(l_Lean_EnumAttributes_setValue___rarg___closed__2);
-res = l_Lean_initFn____x40_Lean_Attributes___hyg_2634_(lean_io_mk_world());
+res = l_Lean_initFn____x40_Lean_Attributes___hyg_2633_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_attributeImplBuilderTableRef = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_attributeImplBuilderTableRef);
@@ -12165,22 +12163,22 @@ l_Lean_mkAttributeImplOfConstantUnsafe___closed__4 = _init_l_Lean_mkAttributeImp
 lean_mark_persistent(l_Lean_mkAttributeImplOfConstantUnsafe___closed__4);
 l_Lean_mkAttributeImplOfConstant___closed__1 = _init_l_Lean_mkAttributeImplOfConstant___closed__1();
 lean_mark_persistent(l_Lean_mkAttributeImplOfConstant___closed__1);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__1 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__1();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__1);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__2 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__2();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__2);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__3 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__3();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__3);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__4 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__4();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__4);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__5 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__5();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__5);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__6 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__6();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__6);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__7 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__7();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__7);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__8 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__8();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3209____closed__8);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__1 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__1();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__1);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__2 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__2();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__2);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__3 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__3();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__3);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__4 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__4();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__4);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__5 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__5();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__5);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__6 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__6();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__6);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__7 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__7();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__7);
+l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__8 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__8();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3208____closed__8);
 l_Lean_attributeExtension___closed__1 = _init_l_Lean_attributeExtension___closed__1();
 lean_mark_persistent(l_Lean_attributeExtension___closed__1);
 l_Lean_attributeExtension___closed__2 = _init_l_Lean_attributeExtension___closed__2();
@@ -12191,7 +12189,7 @@ l_Lean_attributeExtension___closed__4 = _init_l_Lean_attributeExtension___closed
 lean_mark_persistent(l_Lean_attributeExtension___closed__4);
 l_Lean_attributeExtension___closed__5 = _init_l_Lean_attributeExtension___closed__5();
 lean_mark_persistent(l_Lean_attributeExtension___closed__5);
-res = l_Lean_initFn____x40_Lean_Attributes___hyg_3209_(lean_io_mk_world());
+res = l_Lean_initFn____x40_Lean_Attributes___hyg_3208_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_attributeExtension = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_attributeExtension);
@@ -12202,13 +12200,8 @@ l_Lean_getBuiltinAttributeImpl___closed__1 = _init_l_Lean_getBuiltinAttributeImp
 lean_mark_persistent(l_Lean_getBuiltinAttributeImpl___closed__1);
 l_panic___at_Lean_isAttribute___spec__3___closed__1 = _init_l_panic___at_Lean_isAttribute___spec__3___closed__1();
 lean_mark_persistent(l_panic___at_Lean_isAttribute___spec__3___closed__1);
-l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___closed__1 = _init_l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___closed__1();
-lean_mark_persistent(l_Std_PersistentHashMap_foldlMAux___at_Lean_initFn____x40_Lean_Attributes___hyg_3694____spec__2___closed__1);
-l_Lean_initFn____x40_Lean_Attributes___hyg_3694____closed__1 = _init_l_Lean_initFn____x40_Lean_Attributes___hyg_3694____closed__1();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Attributes___hyg_3694____closed__1);
-res = l_Lean_initFn____x40_Lean_Attributes___hyg_3694_(lean_io_mk_world());
-if (lean_io_result_is_error(res)) return res;
-lean_dec_ref(res);
+l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___closed__1 = _init_l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___closed__1();
+lean_mark_persistent(l_Std_PersistentHashMap_foldlMAux___at_Lean_updateEnvAttributesImpl___spec__2___closed__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Elab/Match.c b/stage0/stdlib/Lean/Elab/Match.c
index 6b5fc07557..e6f6e50055 100644
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
@@ -62,7 +62,6 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatch
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchGeneralizing_x3f___closed__3;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars_loop(lean_object*);
-lean_object* l_Lean_Meta_Match_inaccessible_x3f(lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_mkFreshBinderName___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__3___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
@@ -209,6 +208,7 @@ LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__7___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__3___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__4(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__1(lean_object*, size_t, size_t, lean_object*);
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_precheckMatch___lambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkEqRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -221,10 +221,8 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_finalizePatternDecls(lean_object*, lea
 static lean_object* l_Lean_Elab_Term_isAuxDiscrName___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1;
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__2;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___rarg___closed__1;
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__5;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_precheckMatch___spec__3(size_t, size_t, lean_object*);
@@ -232,6 +230,7 @@ static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__2___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_finalizePatternDecls___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__2;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrs___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -324,6 +323,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatte
 LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_withDepElimPatterns___spec__2(lean_object*, size_t, size_t, lean_object*);
+lean_object* l_Lean_inaccessible_x3f(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar_isAtomicIdent___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__3___boxed(lean_object**);
 lean_object* l_Lean_Meta_instantiateLocalDeclMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -374,7 +374,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault(lean_object
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___spec__1___lambda__1___closed__1;
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__7;
-lean_object* l_Lean_Meta_Match_mkInaccessible(lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshBinderName___at___private_Lean_Elab_Binders_0__Lean_Elab_Term_expandBinderIdent___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatch___closed__17;
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -387,13 +386,13 @@ uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_alreadyVisited(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveId_x3f(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__8___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__5;
 LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__7___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__5;
 lean_object* l_Lean_MetavarContext_localDeclDependsOn(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__3;
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__2___closed__1;
@@ -451,11 +450,11 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElim
 LEAN_EXPORT lean_object* l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_734____at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__10___boxed(lean_object*, lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1;
 LEAN_EXPORT lean_object* l_List_mapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__4;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__4___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_eraseIndices(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_fvarId(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar___spec__1___closed__2;
@@ -579,8 +578,8 @@ uint8_t l_Lean_LocalDecl_hasExprMVar(lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Term_traceAtCmdPos___spec__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_TagAttribute_hasTag(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goIndex___closed__8;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__3;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__3;
 lean_object* l_Lean_LocalContext_addDecl(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -734,8 +733,8 @@ LEAN_EXPORT lean_object* l_Lean_addTrace___at___private_Lean_Elab_Match_0__Lean_
 lean_object* l_Lean_Elab_Term_isLocalIdent_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(size_t, size_t, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12952_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12951_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_2531_(lean_object*);
 lean_object* l_Lean_mkSimpleThunk(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_isAtomicDiscr_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -762,6 +761,7 @@ static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__L
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS(lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___lambda__1(lean_object*, lean_object*);
+lean_object* l_Lean_mkInaccessible(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(lean_object*, size_t, size_t, lean_object*);
@@ -4680,7 +4680,7 @@ _start:
 lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_10 = l_Lean_Elab_Term_getMVarSyntaxMVarId(x_1);
 x_11 = l_Lean_mkMVar(x_10);
-x_12 = l_Lean_Meta_Match_mkInaccessible(x_11);
+x_12 = l_Lean_mkInaccessible(x_11);
 x_13 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_13, 0, x_12);
 lean_ctor_set(x_13, 1, x_9);
@@ -4777,7 +4777,7 @@ if (x_14 == 0)
 {
 lean_object* x_15; lean_object* x_16; 
 x_15 = lean_ctor_get(x_13, 0);
-x_16 = l_Lean_Meta_Match_mkInaccessible(x_15);
+x_16 = l_Lean_mkInaccessible(x_15);
 lean_ctor_set(x_13, 0, x_16);
 return x_13;
 }
@@ -4789,7 +4789,7 @@ x_18 = lean_ctor_get(x_13, 1);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_dec(x_13);
-x_19 = l_Lean_Meta_Match_mkInaccessible(x_17);
+x_19 = l_Lean_mkInaccessible(x_17);
 x_20 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_20, 0, x_19);
 lean_ctor_set(x_20, 1, x_18);
@@ -16470,7 +16470,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_main(lean_object* x_1
 _start:
 {
 lean_object* x_10; 
-x_10 = l_Lean_Meta_Match_inaccessible_x3f(x_1);
+x_10 = l_Lean_inaccessible_x3f(x_1);
 if (lean_obj_tag(x_10) == 0)
 {
 lean_object* x_11; 
@@ -24736,7 +24736,7 @@ lean_dec(x_2);
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -24746,7 +24746,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -24754,17 +24754,17 @@ x_1 = lean_mk_string("ignoreUnusedAlts");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1;
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__2;
+x_1 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__2;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__4() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -24772,13 +24772,13 @@ x_1 = lean_mk_string("if true, do not generate error if an alternative is not us
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__5() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__5() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = 0;
 x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_elabDiscrsWitMatchType___spec__1___closed__15;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__4;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__4;
 x_4 = lean_box(x_1);
 x_5 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_5, 0, x_4);
@@ -24787,12 +24787,12 @@ lean_ctor_set(x_5, 2, x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__3;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__5;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__3;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__5;
 x_4 = l_Lean_Option_register___at_Lean_Elab_initFn____x40_Lean_Elab_AutoBound___hyg_6____spec__1(x_2, x_3, x_1);
 return x_4;
 }
@@ -25438,7 +25438,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__4;
 x_2 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__5;
-x_3 = lean_unsigned_to_nat(758u);
+x_3 = lean_unsigned_to_nat(756u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -27973,7 +27973,7 @@ if (lean_obj_tag(x_28) == 0)
 lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 lean_dec(x_21);
 x_30 = lean_array_get_size(x_22);
-x_31 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1;
+x_31 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1;
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
@@ -31309,7 +31309,7 @@ x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_5, x_1);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12952_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12951_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -31949,19 +31949,19 @@ l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___closed__2);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__3);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__4);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__5 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726____closed__5);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__1);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__2);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__3);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__4);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__5 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__5();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725____closed__5);
 l_Lean_Elab_Term_match_ignoreUnusedAlts___closed__1 = _init_l_Lean_Elab_Term_match_ignoreUnusedAlts___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_match_ignoreUnusedAlts___closed__1);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9726_(lean_io_mk_world());
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9725_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Elab_Term_match_ignoreUnusedAlts = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Elab_Term_match_ignoreUnusedAlts);
@@ -32057,7 +32057,7 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabMatch___closed__3);
 res = l___regBuiltin_Lean_Elab_Term_elabMatch(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12952_(lean_io_mk_world());
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_12951_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Term_elabNoMatch___closed__1 = _init_l_Lean_Elab_Term_elabNoMatch___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/PreDefinition/Structural/BRecOn.c b/stage0/stdlib/Lean/Elab/PreDefinition/Structural/BRecOn.c
index 7ecf4752bf..2938fa3096 100644
--- a/stage0/stdlib/Lean/Elab/PreDefinition/Structural/BRecOn.c
+++ b/stage0/stdlib/Lean/Elab/PreDefinition/Structural/BRecOn.c
@@ -45,6 +45,7 @@ lean_object* l_Lean_Meta_mkAppM(lean_object*, lean_object*, lean_object*, lean_o
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___spec__14___lambda__2___closed__3;
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___spec__10___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_saveState___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -182,6 +183,7 @@ static lean_object* l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lea
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_withBelowDict___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_withBelowDict___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___spec__7___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Structural_mkBRecOn(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Structural_mkBRecOn___lambda__10___closed__2;
@@ -5065,6 +5067,62 @@ return x_24;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; lean_object* x_13; 
+x_12 = lean_expr_instantiate1(x_1, x_5);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_13 = l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop(x_2, x_3, x_4, x_12, x_6, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_13) == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_toBelowAux___lambda__5___closed__6;
+x_17 = lean_array_push(x_16, x_5);
+x_18 = 0;
+x_19 = l_Lean_Meta_mkLambdaFVars(x_17, x_14, x_18, x_18, x_7, x_8, x_9, x_10, x_15);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+return x_19;
+}
+else
+{
+uint8_t x_20; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+x_20 = !lean_is_exclusive(x_13);
+if (x_20 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_13, 0);
+x_22 = lean_ctor_get(x_13, 1);
+lean_inc(x_22);
+lean_inc(x_21);
+lean_dec(x_13);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
+}
+}
+}
+}
 static lean_object* _init_l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___closed__1() {
 _start:
 {
@@ -5477,7 +5535,7 @@ lean_inc(x_105);
 x_106 = lean_ctor_get(x_104, 1);
 lean_inc(x_106);
 lean_dec(x_104);
-x_107 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__3___boxed), 11, 4);
+x_107 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__5___boxed), 11, 4);
 lean_closure_set(x_107, 0, x_100);
 lean_closure_set(x_107, 1, x_1);
 lean_closure_set(x_107, 2, x_2);
@@ -5906,6 +5964,15 @@ lean_dec(x_1);
 return x_12;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; 
+x_12 = l___private_Lean_Elab_PreDefinition_Structural_BRecOn_0__Lean_Elab_Structural_replaceRecApps_loop___lambda__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_1);
+return x_12;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Structural_mkBRecOn___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Elab/PreDefinition/WF/Fix.c b/stage0/stdlib/Lean/Elab/PreDefinition/WF/Fix.c
index 181e760228..75838bd431 100644
--- a/stage0/stdlib/Lean/Elab/PreDefinition/WF/Fix.c
+++ b/stage0/stdlib/Lean/Elab/PreDefinition/WF/Fix.c
@@ -84,6 +84,7 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_PreDefi
 uint8_t lean_usize_dec_lt(size_t, size_t);
 lean_object* l_Lean_Meta_mkAppOptM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_processSumCasesOn___closed__5;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_matchMatcherApp_x3f___at___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___spec__1___closed__1;
 extern lean_object* l_Lean_levelZero;
 lean_object* lean_nat_add(lean_object*, lean_object*);
@@ -232,6 +233,7 @@ static lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_t
 static lean_object* l_panic___at___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_processPSigmaCasesOn___spec__1___closed__1;
 static lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_toUnfold___closed__15;
 LEAN_EXPORT lean_object* l_Lean_Meta_getMatcherInfo_x3f___at___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_processSumCasesOn___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 extern lean_object* l_Lean_Name_instBEqName;
@@ -3435,6 +3437,62 @@ return x_25;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_expr_instantiate1(x_1, x_5);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+x_14 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop(x_2, x_3, x_4, x_13, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__2___closed__1;
+x_18 = lean_array_push(x_17, x_5);
+x_19 = 0;
+x_20 = l_Lean_Meta_mkLambdaFVars(x_18, x_15, x_19, x_19, x_8, x_9, x_10, x_11, x_16);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+return x_20;
+}
+else
+{
+uint8_t x_21; 
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_5);
+x_21 = !lean_is_exclusive(x_14);
+if (x_21 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_14, 0);
+x_23 = lean_ctor_get(x_14, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_14);
+x_24 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_24, 0, x_22);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
+}
+}
+}
+}
 static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___closed__1() {
 _start:
 {
@@ -3952,7 +4010,7 @@ lean_inc(x_135);
 x_136 = lean_ctor_get(x_134, 1);
 lean_inc(x_136);
 lean_dec(x_134);
-x_137 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__2___boxed), 12, 4);
+x_137 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__4___boxed), 12, 4);
 lean_closure_set(x_137, 0, x_130);
 lean_closure_set(x_137, 1, x_1);
 lean_closure_set(x_137, 2, x_2);
@@ -4291,6 +4349,15 @@ lean_dec(x_1);
 return x_13;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+lean_object* x_13; 
+x_13 = l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps_loop___lambda__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+lean_dec(x_1);
+return x_13;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Fix_0__Lean_Elab_WF_replaceRecApps(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Elab/PreDefinition/WF/Main.c b/stage0/stdlib/Lean/Elab/PreDefinition/WF/Main.c
index bcccbbee13..eb46c16249 100644
--- a/stage0/stdlib/Lean/Elab/PreDefinition/WF/Main.c
+++ b/stage0/stdlib/Lean/Elab/PreDefinition/WF/Main.c
@@ -26,7 +26,9 @@ lean_object* lean_array_uget(lean_object*, size_t);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_wfRecursion___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__11;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
+static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___closed__1;
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__5;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_wfRecursion___closed__1;
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__10;
 lean_object* lean_array_get_size(lean_object*);
@@ -38,27 +40,28 @@ LEAN_EXPORT lean_object* l_Lean_Elab_wfRecursion___lambda__1(lean_object*, lean_
 extern lean_object* l_Lean_levelZero;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__7;
+static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__2;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_constLevels_x21(lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__3;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___closed__1;
 lean_object* l_Lean_Elab_WF_mkUnaryArg_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkLambdaFVars(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_PreDefinition_WF_Main___hyg_787_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_PreDefinition_WF_Main___hyg_881_(lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__10;
 extern lean_object* l_Lean_Elab_instInhabitedPreDefinition;
-static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__2;
 lean_object* l___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_addNonRecAux(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__3;
 lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr;
+static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__3;
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_wfRecursion___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__6;
@@ -73,8 +76,11 @@ lean_object* l_Lean_Elab_addAndCompilePartialRec(lean_object*, lean_object*, lea
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__1___closed__1;
+lean_object* l_Lean_Meta_lambdaTelescope___at_Lean_Meta_MatcherApp_addArg___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__5;
+static lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__1;
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -84,6 +90,7 @@ lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__2;
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_wfRecursion___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_wfRecursion(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__8;
@@ -106,6 +113,89 @@ static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinitio
 static lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__1;
 lean_object* l_Lean_Elab_WF_packDomain(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_11; lean_object* x_12; 
+x_8 = lean_array_get_size(x_1);
+x_9 = lean_unsigned_to_nat(1u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+x_11 = lean_box(x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_7);
+return x_12;
+}
+}
+static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___lambda__1___boxed), 7, 0);
+return x_1;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_array_get_size(x_1);
+x_8 = lean_unsigned_to_nat(1u);
+x_9 = lean_nat_dec_eq(x_7, x_8);
+lean_dec(x_7);
+if (x_9 == 0)
+{
+uint8_t x_10; lean_object* x_11; lean_object* x_12; 
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_10 = 0;
+x_11 = lean_box(x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_6);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_13 = l_Lean_Elab_instInhabitedPreDefinition;
+x_14 = lean_unsigned_to_nat(0u);
+x_15 = lean_array_get(x_13, x_1, x_14);
+x_16 = lean_ctor_get(x_15, 5);
+lean_inc(x_16);
+lean_dec(x_15);
+x_17 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___closed__1;
+x_18 = l_Lean_Meta_lambdaTelescope___at_Lean_Meta_MatcherApp_addArg___spec__2___rarg(x_16, x_17, x_2, x_3, x_4, x_5, x_6);
+return x_18;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___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_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 static lean_object* _init_l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__1() {
 _start:
 {
@@ -154,7 +244,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__4;
 x_2 = l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__5;
-x_3 = lean_unsigned_to_nat(30u);
+x_3 = lean_unsigned_to_nat(38u);
 x_4 = lean_unsigned_to_nat(12u);
 x_5 = l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -1193,7 +1283,7 @@ return x_101;
 }
 }
 }
-static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__1() {
+static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -1201,7 +1291,7 @@ x_1 = lean_mk_string("_private.Lean.Elab.PreDefinition.WF.Main.0.Lean.Elab.addNo
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__2() {
+static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -1209,102 +1299,196 @@ x_1 = lean_mk_string("unreachable code has been reached");
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__3() {
+static lean_object* _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__4;
-x_2 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__1;
-x_3 = lean_unsigned_to_nat(18u);
+x_2 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__1;
+x_3 = lean_unsigned_to_nat(26u);
 x_4 = lean_unsigned_to_nat(54u);
-x_5 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__2;
+x_5 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
+lean_dec(x_3);
+x_11 = lean_ctor_get(x_1, 4);
+lean_inc(x_11);
+if (lean_obj_tag(x_11) == 7)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_12 = lean_ctor_get(x_11, 1);
+lean_inc(x_12);
+lean_dec(x_11);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
+x_14 = lean_box(0);
+x_15 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_13, x_14);
+x_16 = lean_array_get_size(x_2);
+x_17 = lean_unsigned_to_nat(0u);
+x_18 = lean_unsigned_to_nat(1u);
+lean_inc(x_16);
+x_19 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_19, 0, x_17);
+lean_ctor_set(x_19, 1, x_16);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_box(0);
+x_21 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2(x_2, x_1, x_12, x_15, x_19, x_16, x_17, x_20, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_19);
+if (lean_obj_tag(x_21) == 0)
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_21);
+if (x_22 == 0)
+{
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_21, 0);
+lean_dec(x_23);
+lean_ctor_set(x_21, 0, x_20);
+return x_21;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_ctor_get(x_21, 1);
+lean_inc(x_24);
+lean_dec(x_21);
+x_25 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_25, 0, x_20);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
+}
+}
+else
+{
+uint8_t x_26; 
+x_26 = !lean_is_exclusive(x_21);
+if (x_26 == 0)
+{
+return x_21;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_21, 0);
+x_28 = lean_ctor_get(x_21, 1);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_dec(x_21);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
+}
+}
+}
+else
+{
+lean_object* x_30; lean_object* x_31; 
+lean_dec(x_11);
+lean_dec(x_2);
+lean_dec(x_1);
+x_30 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__3;
+x_31 = l_panic___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__1(x_30, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_31;
+}
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
-x_10 = lean_ctor_get(x_2, 4);
-lean_inc(x_10);
-if (lean_obj_tag(x_10) == 7)
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_10 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef(x_1, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_11 = lean_ctor_get(x_10, 1);
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
+x_12 = lean_unbox(x_11);
+lean_dec(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_ctor_get(x_10, 1);
+lean_inc(x_13);
 lean_dec(x_10);
-x_12 = lean_ctor_get(x_2, 1);
-lean_inc(x_12);
-x_13 = lean_box(0);
-x_14 = l_List_mapTRAux___at_Lean_mkConstWithLevelParams___spec__1(x_12, x_13);
-x_15 = lean_array_get_size(x_1);
-x_16 = lean_unsigned_to_nat(0u);
-x_17 = lean_unsigned_to_nat(1u);
-lean_inc(x_15);
-x_18 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_18, 0, x_16);
-lean_ctor_set(x_18, 1, x_15);
-lean_ctor_set(x_18, 2, x_17);
-x_19 = lean_box(0);
-x_20 = l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2(x_1, x_2, x_11, x_14, x_18, x_15, x_16, x_19, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec(x_18);
-if (lean_obj_tag(x_20) == 0)
-{
-uint8_t x_21; 
-x_21 = !lean_is_exclusive(x_20);
-if (x_21 == 0)
-{
-lean_object* x_22; 
-x_22 = lean_ctor_get(x_20, 0);
-lean_dec(x_22);
-lean_ctor_set(x_20, 0, x_19);
-return x_20;
+x_14 = lean_box(0);
+x_15 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1(x_2, x_1, x_14, x_3, x_4, x_5, x_6, x_7, x_8, x_13);
+return x_15;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; 
-x_23 = lean_ctor_get(x_20, 1);
-lean_inc(x_23);
-lean_dec(x_20);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_19);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
-}
-}
-else
-{
-uint8_t x_25; 
-x_25 = !lean_is_exclusive(x_20);
-if (x_25 == 0)
-{
-return x_20;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_20, 0);
-x_27 = lean_ctor_get(x_20, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_20);
-x_28 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_28, 0, x_26);
-lean_ctor_set(x_28, 1, x_27);
-return x_28;
-}
-}
-}
-else
-{
-lean_object* x_29; lean_object* x_30; 
-lean_dec(x_10);
+uint8_t x_16; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_29 = l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__3;
-x_30 = l_panic___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__1(x_29, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_30;
+x_16 = !lean_is_exclusive(x_10);
+if (x_16 == 0)
+{
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_ctor_get(x_10, 0);
+lean_dec(x_17);
+x_18 = lean_box(0);
+lean_ctor_set(x_10, 0, x_18);
+return x_10;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_10, 1);
+lean_inc(x_19);
+lean_dec(x_10);
+x_20 = lean_box(0);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_19);
+return x_21;
+}
+}
+}
+else
+{
+uint8_t x_22; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_22 = !lean_is_exclusive(x_10);
+if (x_22 == 0)
+{
+return x_10;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_10, 0);
+x_24 = lean_ctor_get(x_10, 1);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_dec(x_10);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
+}
 }
 }
 }
@@ -1964,7 +2148,7 @@ lean_dec(x_3);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_PreDefinition_WF_Main___hyg_787_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_PreDefinition_WF_Main___hyg_881_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -2006,6 +2190,8 @@ lean_dec_ref(res);
 res = initialize_Lean_Elab_PreDefinition_WF_Fix(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___closed__1 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___closed__1();
+lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_isOnlyOneUnaryDef___closed__1);
 l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__1 = _init_l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__1();
 lean_mark_persistent(l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__1);
 l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__2 = _init_l_Lean_Expr_withAppAux___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs_mkSum___spec__1___closed__2();
@@ -2056,17 +2242,17 @@ l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_El
 lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__9);
 l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__10 = _init_l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__10();
 lean_mark_persistent(l_Std_Range_forIn_loop___at___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___spec__2___closed__10);
-l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__1 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__1();
-lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__1);
-l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__2 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__2();
-lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__2);
-l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__3 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__3();
-lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___closed__3);
+l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__1 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__1();
+lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__1);
+l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__2 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__2();
+lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__2);
+l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__3 = _init_l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__3();
+lean_mark_persistent(l___private_Lean_Elab_PreDefinition_WF_Main_0__Lean_Elab_addNonRecPreDefs___lambda__1___closed__3);
 l_Lean_Elab_wfRecursion___closed__1 = _init_l_Lean_Elab_wfRecursion___closed__1();
 lean_mark_persistent(l_Lean_Elab_wfRecursion___closed__1);
 l_Lean_Elab_wfRecursion___closed__2 = _init_l_Lean_Elab_wfRecursion___closed__2();
 lean_mark_persistent(l_Lean_Elab_wfRecursion___closed__2);
-res = l_Lean_Elab_initFn____x40_Lean_Elab_PreDefinition_WF_Main___hyg_787_(lean_io_mk_world());
+res = l_Lean_Elab_initFn____x40_Lean_Elab_PreDefinition_WF_Main___hyg_881_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Elab/Syntax.c b/stage0/stdlib/Lean/Elab/Syntax.c
index 5b0f4312c5..3b5c971350 100644
--- a/stage0/stdlib/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Lean/Elab/Syntax.c
@@ -59,6 +59,7 @@ LEAN_EXPORT uint8_t l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_isAtomLike
 static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Elab_Syntax_0__Lean_Elab_Term_mkParserSeq___spec__1___closed__19;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_expandNoKindMacroRulesAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819____closed__1;
 lean_object* l_Array_eraseIdx___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_toParserDescr_processSepBy1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -68,6 +69,7 @@ lean_object* lean_io_error_to_string(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Command_elabDeclareSyntaxCat___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_checkLeftRec___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__3;
+extern uint32_t l_Lean_idBeginEscape;
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__89;
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_toParserDescr_processAtom___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -294,7 +296,7 @@ lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__2;
 lean_object* l_String_capitalize(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Term_toParserDescr_resolveParserName___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_toParserDescr_process___closed__13;
 static lean_object* l_Lean_Elab_Term_toParserDescr_processNonReserved___closed__7;
@@ -453,6 +455,7 @@ lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__9(l
 lean_object* lean_name_append_after(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__69;
 static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Elab_Syntax_0__Lean_Elab_Term_mkParserSeq___spec__1___closed__11;
+uint8_t l_String_isEmpty(lean_object*);
 static lean_object* l_Lean_Elab_Term_toParserDescr_processNonReserved___closed__14;
 static lean_object* l_Lean_Elab_Term_toParserDescr_processUnary___closed__3;
 lean_object* l_Lean_Syntax_getNumArgs(lean_object*);
@@ -561,6 +564,7 @@ static lean_object* l_Lean_Elab_Term_toParserDescr_processParserCategory___close
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_expandOptPrecedence(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_toParserDescr_process___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_toParserDescr_isValidAtom___boxed(lean_object*);
+uint8_t l_Lean_isIdFirst(uint32_t);
 static lean_object* l_Lean_Elab_Command_elabSyntax___lambda__4___closed__2;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__28;
@@ -595,7 +599,6 @@ static lean_object* l_Lean_Elab_Term_toParserDescr_processNullaryOrCat___closed_
 static lean_object* l_Lean_Elab_Term_toParserDescr_processUnary___closed__4;
 static lean_object* l_Lean_Elab_Command_elabSyntax___lambda__7___closed__2;
 static lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__37;
-static lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761____closed__1;
 static lean_object* l_Lean_Elab_Term_toParserDescr_process___closed__11;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_toParserDescr_processNullaryOrCat___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabSyntax___spec__8___boxed(lean_object*, lean_object*);
@@ -3316,57 +3319,117 @@ return x_11;
 LEAN_EXPORT uint8_t l_Lean_Elab_Term_toParserDescr_isValidAtom(lean_object* x_1) {
 _start:
 {
-lean_object* x_2; uint32_t x_3; uint32_t x_4; uint8_t x_5; 
-x_2 = lean_unsigned_to_nat(0u);
-x_3 = lean_string_utf8_get(x_1, x_2);
-x_4 = 39;
-x_5 = lean_uint32_dec_eq(x_3, x_4);
-if (x_5 == 0)
-{
-uint32_t x_6; uint8_t x_7; 
-x_6 = 34;
-x_7 = lean_uint32_dec_eq(x_3, x_6);
-if (x_7 == 0)
-{
-uint32_t x_8; uint8_t x_9; 
-x_8 = 96;
-x_9 = lean_uint32_dec_eq(x_3, x_8);
+lean_object* x_2; uint8_t x_9; 
+x_9 = l_String_isEmpty(x_1);
 if (x_9 == 0)
 {
-uint8_t x_10; 
-x_10 = l_Char_isDigit(x_3);
-if (x_10 == 0)
+lean_object* x_10; uint32_t x_11; uint32_t x_12; uint8_t x_13; 
+x_10 = lean_unsigned_to_nat(0u);
+x_11 = lean_string_utf8_get(x_1, x_10);
+x_12 = 39;
+x_13 = lean_uint32_dec_eq(x_11, x_12);
+if (x_13 == 0)
 {
-uint8_t x_11; 
-x_11 = 1;
-return x_11;
+uint32_t x_14; uint8_t x_15; 
+x_14 = 34;
+x_15 = lean_uint32_dec_eq(x_11, x_14);
+if (x_15 == 0)
+{
+uint32_t x_16; uint8_t x_17; 
+x_16 = 96;
+x_17 = lean_uint32_dec_eq(x_11, x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; 
+x_18 = lean_box(0);
+x_2 = x_18;
+goto block_8;
 }
 else
 {
-uint8_t x_12; 
-x_12 = 0;
-return x_12;
+lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_19 = lean_string_utf8_byte_size(x_1);
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_dec_eq(x_19, x_20);
+lean_dec(x_19);
+if (x_21 == 0)
+{
+uint32_t x_22; uint8_t x_23; 
+x_22 = lean_string_utf8_get(x_1, x_20);
+x_23 = l_Lean_isIdFirst(x_22);
+if (x_23 == 0)
+{
+uint32_t x_24; uint8_t x_25; 
+x_24 = l_Lean_idBeginEscape;
+x_25 = lean_uint32_dec_eq(x_22, x_24);
+if (x_25 == 0)
+{
+lean_object* x_26; 
+x_26 = lean_box(0);
+x_2 = x_26;
+goto block_8;
+}
+else
+{
+uint8_t x_27; 
+x_27 = 0;
+return x_27;
 }
 }
 else
 {
-uint8_t x_13; 
-x_13 = 0;
-return x_13;
+uint8_t x_28; 
+x_28 = 0;
+return x_28;
 }
 }
 else
 {
-uint8_t x_14; 
-x_14 = 0;
-return x_14;
+uint8_t x_29; 
+x_29 = 0;
+return x_29;
+}
 }
 }
 else
 {
-uint8_t x_15; 
-x_15 = 0;
-return x_15;
+uint8_t x_30; 
+x_30 = 0;
+return x_30;
+}
+}
+else
+{
+uint8_t x_31; 
+x_31 = 0;
+return x_31;
+}
+}
+else
+{
+uint8_t x_32; 
+x_32 = 0;
+return x_32;
+}
+block_8:
+{
+lean_object* x_3; uint32_t x_4; uint8_t x_5; 
+lean_dec(x_2);
+x_3 = lean_unsigned_to_nat(0u);
+x_4 = lean_string_utf8_get(x_1, x_3);
+x_5 = l_Char_isDigit(x_4);
+if (x_5 == 0)
+{
+uint8_t x_6; 
+x_6 = 1;
+return x_6;
+}
+else
+{
+uint8_t x_7; 
+x_7 = 0;
+return x_7;
+}
 }
 }
 }
@@ -18217,51 +18280,64 @@ return x_7;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
 x_8 = lean_unsigned_to_nat(1u);
 x_9 = l_Lean_Syntax_getArg(x_1, x_8);
 lean_dec(x_1);
-x_10 = l_Lean_Syntax_getArgs(x_9);
+x_10 = l_Lean_nullKind;
+lean_inc(x_9);
+x_11 = l_Lean_Syntax_isNodeOf(x_9, x_10, x_8);
+if (x_11 == 0)
+{
+lean_object* x_12; 
 lean_dec(x_9);
-x_11 = l_Lean_instInhabitedSyntax;
-x_12 = lean_unsigned_to_nat(0u);
-x_13 = lean_array_get(x_11, x_10, x_12);
-lean_dec(x_10);
-x_14 = l_Lean_Syntax_isQuot(x_13);
-if (x_14 == 0)
-{
-lean_object* x_15; uint8_t x_16; 
-lean_dec(x_13);
 lean_dec(x_3);
 lean_dec(x_2);
-x_15 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_inferMacroRulesAltKind___spec__2___rarg(x_4);
-x_16 = !lean_is_exclusive(x_15);
-if (x_16 == 0)
-{
-return x_15;
+x_12 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_inferMacroRulesAltKind___spec__1___rarg(x_4);
+return x_12;
 }
 else
 {
-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_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_13 = lean_unsigned_to_nat(0u);
+x_14 = l_Lean_Syntax_getArg(x_9, x_13);
+lean_dec(x_9);
+x_15 = l_Lean_Syntax_isQuot(x_14);
+if (x_15 == 0)
+{
+lean_object* x_16; uint8_t x_17; 
+lean_dec(x_14);
+lean_dec(x_3);
+lean_dec(x_2);
+x_16 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_inferMacroRulesAltKind___spec__2___rarg(x_4);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_16, 0);
+x_19 = lean_ctor_get(x_16, 1);
+lean_inc(x_19);
 lean_inc(x_18);
-lean_inc(x_17);
-lean_dec(x_15);
-x_19 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_19, 0, x_17);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
+lean_dec(x_16);
+x_20 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_20, 0, x_18);
+lean_ctor_set(x_20, 1, x_19);
+return x_20;
 }
 }
 else
 {
-lean_object* x_20; lean_object* x_21; 
-x_20 = lean_box(0);
-x_21 = l_Lean_Elab_Command_inferMacroRulesAltKind___lambda__1(x_13, x_20, x_2, x_3, x_4);
+lean_object* x_21; lean_object* x_22; 
+x_21 = lean_box(0);
+x_22 = l_Lean_Elab_Command_inferMacroRulesAltKind___lambda__1(x_14, x_21, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-return x_21;
+return x_22;
+}
 }
 }
 }
@@ -19109,7 +19185,7 @@ lean_dec(x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761____closed__1() {
+static lean_object* _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -19119,11 +19195,11 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761____closed__1;
+x_2 = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819____closed__1;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 return x_3;
 }
@@ -19792,9 +19868,9 @@ l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__5 = _init_l_
 lean_mark_persistent(l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__5);
 l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__6 = _init_l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__6();
 lean_mark_persistent(l_Lean_Elab_Command_expandNoKindMacroRulesAux___lambda__1___closed__6);
-l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761____closed__1 = _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761____closed__1();
-lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761____closed__1);
-res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6761_(lean_io_mk_world());
+l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819____closed__1 = _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819____closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819____closed__1);
+res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_6819_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Environment.c b/stage0/stdlib/Lean/Environment.c
index a5223b1605..54d23b9678 100644
--- a/stage0/stdlib/Lean/Environment.c
+++ b/stage0/stdlib/Lean/Environment.c
@@ -25,7 +25,6 @@ static lean_object* l_Lean_mkMapDeclarationExtension___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_insert(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Environment_0__Lean_setImportedEntries___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_isNamespaceName___boxed(lean_object*);
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_importModules___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -34,7 +33,6 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceImp___elambda__6___rarg(lea
 static lean_object* l_Lean_Environment_displayStats___closed__2;
 static lean_object* l_Lean_EnvironmentHeader_imports___default___closed__1;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtensionInterface___lambda__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_MapDeclarationExtension_contains___spec__3___rarg___boxed(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpectedType___rarg___closed__1;
 static lean_object* l_Lean_instInhabitedEnvironmentHeader___closed__2;
@@ -42,14 +40,13 @@ LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_mkMapDeclarationExten
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_setState___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SMap_numBuckets___at_Lean_Environment_displayStats___spec__5(lean_object*);
 static lean_object* l_Lean_mkMapDeclarationExtension___rarg___closed__2;
-LEAN_EXPORT lean_object* l_Lean_updateEnvAttributesRef;
 LEAN_EXPORT lean_object* l_panic___at_Lean_SimplePersistentEnvExtension_getEntries___spec__3___rarg(lean_object*, lean_object*);
 lean_object* l_Std_HashMap_insert_x27___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkMapDeclarationExtension___rarg___lambda__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_SimplePersistentEnvExtension_getState___spec__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 static lean_object* l_Lean_instInhabitedEnvExtensionInterface___closed__2;
-LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__1(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__4;
 LEAN_EXPORT uint8_t l_Lean_EnvironmentHeader_quotInit___default;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__5___boxed(lean_object*, lean_object*);
 lean_object* lean_nat_div(lean_object*, lean_object*);
@@ -58,7 +55,6 @@ lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Environment_0__Lean_setImportedEntries___spec__1___lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* lean_display_stats(lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_3428____closed__1;
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_registerPersistentEnvExtensionUnsafe___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
 static lean_object* l_Lean_mkEmptyEnvironment___lambda__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_withImportModules(lean_object*);
@@ -98,7 +94,6 @@ static lean_object* l_Lean_Environment_displayStats___closed__8;
 LEAN_EXPORT lean_object* l_Lean_SMap_numBuckets___at_Lean_Environment_displayStats___spec__5___boxed(lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__7___closed__3;
 LEAN_EXPORT uint8_t l_Array_qsort_sort___at_Lean_mkMapDeclarationExtension___spec__1___rarg___lambda__1(lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__4;
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_instInhabitedSimplePersistentEnvExtension(lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 static lean_object* l_Lean_mkTagDeclarationExtension___closed__1;
@@ -108,10 +103,12 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_throwU
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lean_MapDeclarationExtension_find_x3f___spec__6___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_PersistentEnvExtension_getState___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getState___at_Lean_MapDeclarationExtension_find_x3f___spec__1___rarg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____lambda__2(lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_panic___at_Lean_SimplePersistentEnvExtension_getState___spec__3___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* lean_environment_set_main_module(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg(lean_object*, lean_object*);
+lean_object* lean_update_env_attributes(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_isQuotInit___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkBaseNameFor(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(lean_object*, lean_object*, lean_object*);
@@ -124,6 +121,7 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_P
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_PersistentEnvExtension_getModuleEntries___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedEnvironment___closed__4;
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__2;
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_MapDeclarationExtension_contains___spec__2(lean_object*);
 extern lean_object* l_Lean_instHashableName;
@@ -170,6 +168,7 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_freeReg
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_MapDeclarationExtension_contains___spec__6___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_evalConst___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtension___rarg(lean_object*);
+lean_object* lean_get_num_attributes(lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_MapDeclarationExtension_contains___spec__8___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_setState___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -196,6 +195,7 @@ uint8_t l_Lean_NameMap_contains___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_PersistentEnvExtension_getModuleEntries___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__4___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_MapDeclarationExtension_find_x3f___spec__7___rarg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lean_MapDeclarationExtension_find_x3f___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_modifyState(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -205,7 +205,6 @@ LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_registerSimplePersiste
 LEAN_EXPORT lean_object* l_Lean_namespacesExt___elambda__4___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_TagDeclarationExtension_instInhabitedTagDeclarationExtension;
 lean_object* lean_nat_add(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__5(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_mkModuleData___spec__8(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_contains___boxed(lean_object*, lean_object*);
@@ -250,6 +249,7 @@ static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceImp___elambda__3___rarg(lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__6;
 LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_insert___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__5___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
@@ -279,18 +279,16 @@ lean_object* lean_array_swap(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___at_Lean_mkMapDeclarationExtension___spec__6___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getState___at_Lean_Environment_registerNamespace___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__2___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_3428____lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_mkTagDeclarationExtension___spec__4(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_SimplePersistentEnvExtension_getState___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_updateEnvAttributes___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_SimplePersistentEnvExtension_getEntries___spec__2___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_mkMapDeclarationExtension___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_NameSSet_instInhabitedNameSSet;
 LEAN_EXPORT lean_object* l_panic___at_Lean_PersistentEnvExtension_getState___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_getEntriesFor___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Environment_0__Lean_setImportedEntries___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__3(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Lean_mkEmptyEnvironment___closed__1;
 LEAN_EXPORT lean_object* l_Lean_EnvironmentHeader_mainModule___default;
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__3(lean_object*, lean_object*);
@@ -298,8 +296,11 @@ LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_mkTagDeclarationExtension__
 static lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_MapDeclarationExtension_contains___spec__2___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_mkInitialExtensionStates(lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__3(lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_importModules_importMods___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__5(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_instInhabitedEnvironment___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(lean_object*, lean_object*);
@@ -319,7 +320,6 @@ lean_object* lean_name_append_index_after(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_MapDeclarationExtension_contains___spec__4(lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_mkMapDeclarationExtension___spec__8___rarg(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_List_toStringAux___at_Lean_Environment_displayStats___spec__2___boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__2;
 static lean_object* l_List_toStringAux___at_Lean_Environment_displayStats___spec__2___closed__1;
 LEAN_EXPORT uint8_t l_Array_binSearchAux___at_Lean_TagDeclarationExtension_isTagged___spec__6(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_mkModuleData___spec__3___closed__1;
@@ -336,7 +336,6 @@ static lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__1;
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_mkMapDeclarationExtension___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_insert___at_Lean_NameMap_insert___spec__1___rarg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__6;
 uint64_t l_Lean_Name_hash(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lean_MapDeclarationExtension_contains___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_evalConstCheck(lean_object*);
@@ -362,6 +361,7 @@ static lean_object* l_Lean_mkEmptyEnvironment___closed__2;
 LEAN_EXPORT lean_object* l_Lean_importModules_importMods___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getState___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_format_pretty(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__2;
 lean_object* l_Array_foldlMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_mkModuleData___spec__5___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_importModules_importMods___closed__1;
@@ -374,7 +374,6 @@ LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_modifyState___rarg(
 LEAN_EXPORT lean_object* l_panic___at_Lean_MapDeclarationExtension_contains___spec__7___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instMonadEnv___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_mkMapDeclarationExtension___spec__7(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_MapDeclarationExtension_find_x3f___spec__7(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_instInhabitedEnvExtension(lean_object*, lean_object*);
 size_t lean_usize_shift_left(size_t, size_t);
@@ -389,6 +388,7 @@ LEAN_EXPORT uint32_t lean_environment_trust_level(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_mkTagDeclarationExtension___spec__1(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__1;
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_TagDeclarationExtension_isTagged___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_evalConstCheck___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_persistentEnvExtensionsRef;
@@ -412,7 +412,6 @@ LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_instInhabitedMapDeclarat
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__3___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_namespacesExt___elambda__1___boxed(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__6(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkEmptyEnvironment___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_MapDeclarationExtension_contains___spec__3(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_SimplePersistentEnvExtension_getState___spec__3(lean_object*, lean_object*);
@@ -440,6 +439,7 @@ LEAN_EXPORT lean_object* l_Lean_CompactedRegion_free___boxed(lean_object*, lean_
 lean_object* l_Std_PersistentHashMap_insert___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtensionInterface;
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__1;
+LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__6(lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__7___lambda__1___closed__2;
 static lean_object* l_Lean_EnvExtensionInterfaceImp___closed__6;
 static lean_object* l_Lean_TagDeclarationExtension_instInhabitedTagDeclarationExtension___closed__1;
@@ -484,7 +484,6 @@ static lean_object* l_panic___at_Lean_MapDeclarationExtension_find_x3f___spec__4
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_mkTagDeclarationExtension___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___lambda__1(lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___lambda__2___closed__1;
-LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__4(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_qsort_sort___at_Lean_mkTagDeclarationExtension___spec__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_setState___rarg___lambda__1(lean_object*, lean_object*);
@@ -507,6 +506,7 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_M
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg___closed__1;
 lean_object* l_List_redLength___rarg(lean_object*);
 static lean_object* l_Lean_instToStringImport___closed__1;
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__3;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_SimplePersistentEnvExtension_getState___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_Environment_registerNamespace___spec__2(lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___closed__4;
@@ -530,7 +530,6 @@ LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___at_Lea
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_MapDeclarationExtension_contains___spec__2___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__4(lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_mkMapDeclarationExtension___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Id_instMonadId;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__2___closed__1;
@@ -540,6 +539,7 @@ LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_registerPersistentEnvE
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_MapDeclarationExtension_contains___spec__6(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_find_x3f(lean_object*);
 static lean_object* l_Lean_importModules_importMods___closed__3;
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__5;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries(lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_TagDeclarationExtension_isTagged___spec__4___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_modifyState___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -561,7 +561,6 @@ static lean_object* l_Lean_namespacesExt___closed__3;
 static lean_object* l_List_toString___at_Lean_Environment_displayStats___spec__1___closed__1;
 static lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Kernel_whnf___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__5;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__6___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__4___closed__1;
@@ -572,7 +571,6 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceImp___elambda__4(lean_objec
 lean_object* l_panic___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_instInhabitedEnvExtension___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_mkInitialExtStates___boxed__const__1;
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__3;
 static lean_object* l_Lean_instInhabitedEnvExtensionInterface___closed__3;
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_instInhabitedEnvironment___spec__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_importModules___lambda__1(lean_object*, lean_object*);
@@ -594,12 +592,10 @@ LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_MapDeclarationExtension_
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_MapDeclarationExtension_find_x3f___spec__5(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getState___at_Lean_TagDeclarationExtension_isTagged___spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtensionDescr_statsFn___default(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_MapDeclarationExtension_find_x3f___spec__5___rarg___boxed(lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_3428_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_1990_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtensionState___rarg(lean_object*);
 static lean_object* l_Lean_instInhabitedEnvExtensionInterface___closed__5;
@@ -611,11 +607,13 @@ extern lean_object* l_Lean_instInhabitedName;
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_getModuleIdxFor_x3f(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Environment_getModuleIdxFor_x3f___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__7___closed__2;
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getState___at_Lean_MapDeclarationExtension_contains___spec__1___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SMap_stageSizes___at_Lean_Environment_displayStats___spec__4___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_getNumBuiltiAttributes___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceImp___elambda__4___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_MapDeclarationExtension_find_x3f___spec__8(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkTagDeclarationExtension(lean_object*, lean_object*);
@@ -623,6 +621,7 @@ LEAN_EXPORT uint8_t l_Lean_Import_runtimeOnly___default;
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___closed__7;
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_allImportedModuleNames(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_MapDeclarationExtension_find_x3f___spec__4(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_addAux(lean_object*, lean_object*);
@@ -655,7 +654,6 @@ lean_object* lean_io_initializing(lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__2;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__1___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_mkInitialExtStates(lean_object*);
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instToStringImport(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -685,7 +683,6 @@ lean_object* lean_compile_decl(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ImportState_moduleData___default;
 LEAN_EXPORT lean_object* l_Array_qpartition_loop___at_Lean_mkMapDeclarationExtension___spec__5(lean_object*);
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__2(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceImp___closed__3;
 LEAN_EXPORT lean_object* l_Lean_importModules___lambda__2(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__4(lean_object*);
@@ -699,7 +696,9 @@ LEAN_EXPORT uint8_t l_Std_HashMapImp_contains___at_Lean_Environment_contains___s
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__3(size_t, lean_object*, size_t, size_t, lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceImp___closed__1;
 LEAN_EXPORT lean_object* l_Lean_SMap_insert___at_Lean_Environment_addAux___spec__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__2(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_getModuleIdx_x3f(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__4(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 LEAN_EXPORT lean_object* l_Lean_registerEnvExtension___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -733,6 +732,7 @@ LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___at_Lean_MapDec
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
 lean_object* lean_nat_to_int(lean_object*);
 static lean_object* l_Lean_mkTagDeclarationExtension___closed__3;
+LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceImp___elambda__7___rarg___boxed(lean_object*);
 static lean_object* l_Lean_importModules___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Kernel_isDefEq___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -9426,31 +9426,20 @@ lean_dec(x_2);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_3428____lambda__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_updateEnvAttributes___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
+x_3 = lean_update_env_attributes(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_3428____closed__1() {
+LEAN_EXPORT lean_object* l_Lean_getNumBuiltiAttributes___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_3428____lambda__1), 2, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_3428_(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_3428____closed__1;
-x_3 = l_IO_mkRef___rarg(x_2, x_1);
-return x_3;
+lean_object* x_2; 
+x_2 = lean_get_num_attributes(x_1);
+return x_2;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
@@ -9491,7 +9480,7 @@ return x_7;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
 lean_free_object(x_7);
 x_13 = l_Nat_foldAux___at_Lean_mkModuleData___spec__4___closed__1;
 x_14 = lean_array_get(x_13, x_9, x_3);
@@ -9508,569 +9497,932 @@ lean_inc(x_19);
 lean_dec(x_17);
 x_20 = lean_array_get_size(x_18);
 lean_dec(x_18);
-x_21 = lean_ctor_get(x_14, 2);
-lean_inc(x_21);
-lean_dec(x_14);
-x_22 = !lean_is_exclusive(x_16);
-if (x_22 == 0)
+x_21 = lean_get_num_attributes(x_19);
+if (lean_obj_tag(x_21) == 0)
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_23 = lean_ctor_get(x_16, 0);
-x_24 = lean_ctor_get(x_16, 1);
-lean_dec(x_24);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_22 = lean_ctor_get(x_21, 0);
+lean_inc(x_22);
+x_23 = lean_ctor_get(x_21, 1);
+lean_inc(x_23);
+lean_dec(x_21);
+x_24 = lean_ctor_get(x_14, 2);
+lean_inc(x_24);
+lean_dec(x_14);
+x_25 = !lean_is_exclusive(x_16);
+if (x_25 == 0)
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_26 = lean_ctor_get(x_16, 0);
+x_27 = lean_ctor_get(x_16, 1);
+lean_dec(x_27);
 lean_inc(x_2);
 lean_inc(x_4);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_4);
-lean_ctor_set(x_25, 1, x_2);
-lean_inc(x_23);
-x_26 = lean_apply_3(x_21, x_23, x_25, x_19);
-if (lean_obj_tag(x_26) == 0)
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_4);
+lean_ctor_set(x_28, 1, x_2);
+lean_inc(x_26);
+x_29 = lean_apply_3(x_24, x_26, x_28, x_23);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_27 = lean_ctor_get(x_26, 0);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_26, 1);
-lean_inc(x_28);
-lean_dec(x_26);
-lean_ctor_set(x_16, 1, x_27);
-x_29 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg(x_15, x_4, x_16);
-x_30 = l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(x_29, x_28);
-if (lean_obj_tag(x_30) == 0)
-{
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; 
-x_31 = lean_ctor_get(x_30, 0);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_29, 1);
 lean_inc(x_31);
-x_32 = lean_ctor_get(x_30, 1);
-lean_inc(x_32);
-lean_dec(x_30);
-x_33 = lean_st_ref_get(x_6, x_32);
+lean_dec(x_29);
+lean_ctor_set(x_16, 1, x_30);
+x_32 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg(x_15, x_4, x_16);
+x_33 = l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(x_32, x_31);
+if (lean_obj_tag(x_33) == 0)
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 x_34 = lean_ctor_get(x_33, 0);
 lean_inc(x_34);
 x_35 = lean_ctor_get(x_33, 1);
 lean_inc(x_35);
 lean_dec(x_33);
-x_36 = lean_array_get_size(x_34);
-lean_dec(x_34);
-x_37 = lean_nat_dec_lt(x_20, x_36);
+x_36 = lean_st_ref_get(x_6, x_35);
+x_37 = lean_ctor_get(x_36, 0);
+lean_inc(x_37);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
 lean_dec(x_36);
-if (x_37 == 0)
+x_39 = lean_get_num_attributes(x_38);
+if (lean_obj_tag(x_39) == 0)
 {
-lean_object* x_38; lean_object* x_39; 
+lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; 
+x_40 = lean_ctor_get(x_39, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_39, 1);
+lean_inc(x_41);
+lean_dec(x_39);
+x_42 = lean_array_get_size(x_37);
+lean_dec(x_37);
+x_43 = lean_nat_dec_lt(x_20, x_42);
+lean_dec(x_42);
+if (x_43 == 0)
+{
+uint8_t x_44; 
+x_44 = lean_nat_dec_lt(x_22, x_40);
+lean_dec(x_40);
+lean_dec(x_22);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; 
 lean_dec(x_20);
-x_38 = lean_box(0);
-x_39 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_31, x_38, x_35);
-return x_39;
+x_45 = lean_box(0);
+x_46 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_34, x_45, x_41);
+return x_46;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_40 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_31, x_1, x_20, x_35);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
-lean_inc(x_42);
-lean_dec(x_40);
-x_43 = l_Lean_updateEnvAttributesRef;
-x_44 = lean_st_ref_get(x_43, x_42);
-x_45 = lean_ctor_get(x_44, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_44, 1);
-lean_inc(x_46);
-lean_dec(x_44);
-x_47 = lean_apply_2(x_45, x_41, x_46);
-if (lean_obj_tag(x_47) == 0)
-{
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_47 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_34, x_1, x_20, x_41);
 x_48 = lean_ctor_get(x_47, 0);
 lean_inc(x_48);
 x_49 = lean_ctor_get(x_47, 1);
 lean_inc(x_49);
 lean_dec(x_47);
-x_50 = lean_box(0);
-x_51 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_48, x_50, x_49);
-return x_51;
+x_50 = lean_update_env_attributes(x_48, x_49);
+if (lean_obj_tag(x_50) == 0)
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_51 = lean_ctor_get(x_50, 0);
+lean_inc(x_51);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+lean_dec(x_50);
+x_53 = lean_box(0);
+x_54 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_51, x_53, x_52);
+return x_54;
 }
 else
 {
-uint8_t x_52; 
+uint8_t x_55; 
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_52 = !lean_is_exclusive(x_47);
-if (x_52 == 0)
+x_55 = !lean_is_exclusive(x_50);
+if (x_55 == 0)
 {
-return x_47;
+return x_50;
 }
 else
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_53 = lean_ctor_get(x_47, 0);
-x_54 = lean_ctor_get(x_47, 1);
-lean_inc(x_54);
-lean_inc(x_53);
-lean_dec(x_47);
-x_55 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_55, 0, x_53);
-lean_ctor_set(x_55, 1, x_54);
-return x_55;
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_50, 0);
+x_57 = lean_ctor_get(x_50, 1);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_dec(x_50);
+x_58 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_58, 0, x_56);
+lean_ctor_set(x_58, 1, x_57);
+return x_58;
 }
 }
 }
 }
 else
 {
-uint8_t x_56; 
+lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+lean_dec(x_40);
+lean_dec(x_22);
+x_59 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_34, x_1, x_20, x_41);
+x_60 = lean_ctor_get(x_59, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_59, 1);
+lean_inc(x_61);
+lean_dec(x_59);
+x_62 = lean_update_env_attributes(x_60, x_61);
+if (lean_obj_tag(x_62) == 0)
+{
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_63 = lean_ctor_get(x_62, 0);
+lean_inc(x_63);
+x_64 = lean_ctor_get(x_62, 1);
+lean_inc(x_64);
+lean_dec(x_62);
+x_65 = lean_box(0);
+x_66 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_63, x_65, x_64);
+return x_66;
+}
+else
+{
+uint8_t x_67; 
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_67 = !lean_is_exclusive(x_62);
+if (x_67 == 0)
+{
+return x_62;
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_62, 0);
+x_69 = lean_ctor_get(x_62, 1);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_dec(x_62);
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+return x_70;
+}
+}
+}
+}
+else
+{
+uint8_t x_71; 
+lean_dec(x_37);
+lean_dec(x_34);
+lean_dec(x_22);
 lean_dec(x_20);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_56 = !lean_is_exclusive(x_30);
-if (x_56 == 0)
+x_71 = !lean_is_exclusive(x_39);
+if (x_71 == 0)
 {
-return x_30;
+return x_39;
 }
 else
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_ctor_get(x_30, 0);
-x_58 = lean_ctor_get(x_30, 1);
-lean_inc(x_58);
-lean_inc(x_57);
-lean_dec(x_30);
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_57);
-lean_ctor_set(x_59, 1, x_58);
-return x_59;
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_72 = lean_ctor_get(x_39, 0);
+x_73 = lean_ctor_get(x_39, 1);
+lean_inc(x_73);
+lean_inc(x_72);
+lean_dec(x_39);
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_72);
+lean_ctor_set(x_74, 1, x_73);
+return x_74;
 }
 }
 }
 else
 {
-uint8_t x_60; 
+uint8_t x_75; 
+lean_dec(x_22);
+lean_dec(x_20);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_75 = !lean_is_exclusive(x_33);
+if (x_75 == 0)
+{
+return x_33;
+}
+else
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_76 = lean_ctor_get(x_33, 0);
+x_77 = lean_ctor_get(x_33, 1);
+lean_inc(x_77);
+lean_inc(x_76);
+lean_dec(x_33);
+x_78 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_78, 0, x_76);
+lean_ctor_set(x_78, 1, x_77);
+return x_78;
+}
+}
+}
+else
+{
+uint8_t x_79; 
 lean_free_object(x_16);
-lean_dec(x_23);
+lean_dec(x_26);
+lean_dec(x_22);
 lean_dec(x_20);
 lean_dec(x_15);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_60 = !lean_is_exclusive(x_26);
-if (x_60 == 0)
+x_79 = !lean_is_exclusive(x_29);
+if (x_79 == 0)
 {
-return x_26;
+return x_29;
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_ctor_get(x_26, 0);
-x_62 = lean_ctor_get(x_26, 1);
-lean_inc(x_62);
-lean_inc(x_61);
-lean_dec(x_26);
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_61);
-lean_ctor_set(x_63, 1, x_62);
-return x_63;
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_29, 0);
+x_81 = lean_ctor_get(x_29, 1);
+lean_inc(x_81);
+lean_inc(x_80);
+lean_dec(x_29);
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+return x_82;
 }
 }
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_16, 0);
-lean_inc(x_64);
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_16, 0);
+lean_inc(x_83);
 lean_dec(x_16);
 lean_inc(x_2);
 lean_inc(x_4);
-x_65 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_65, 0, x_4);
-lean_ctor_set(x_65, 1, x_2);
-lean_inc(x_64);
-x_66 = lean_apply_3(x_21, x_64, x_65, x_19);
-if (lean_obj_tag(x_66) == 0)
-{
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
-x_67 = lean_ctor_get(x_66, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get(x_66, 1);
-lean_inc(x_68);
-lean_dec(x_66);
-x_69 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_69, 0, x_64);
-lean_ctor_set(x_69, 1, x_67);
-x_70 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg(x_15, x_4, x_69);
-x_71 = l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(x_70, x_68);
-if (lean_obj_tag(x_71) == 0)
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; 
-x_72 = lean_ctor_get(x_71, 0);
-lean_inc(x_72);
-x_73 = lean_ctor_get(x_71, 1);
-lean_inc(x_73);
-lean_dec(x_71);
-x_74 = lean_st_ref_get(x_6, x_73);
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-lean_dec(x_74);
-x_77 = lean_array_get_size(x_75);
-lean_dec(x_75);
-x_78 = lean_nat_dec_lt(x_20, x_77);
-lean_dec(x_77);
-if (x_78 == 0)
-{
-lean_object* x_79; lean_object* x_80; 
-lean_dec(x_20);
-x_79 = lean_box(0);
-x_80 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_72, x_79, x_76);
-return x_80;
-}
-else
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_81 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_72, x_1, x_20, x_76);
-x_82 = lean_ctor_get(x_81, 0);
-lean_inc(x_82);
-x_83 = lean_ctor_get(x_81, 1);
+x_84 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_84, 0, x_4);
+lean_ctor_set(x_84, 1, x_2);
 lean_inc(x_83);
-lean_dec(x_81);
-x_84 = l_Lean_updateEnvAttributesRef;
-x_85 = lean_st_ref_get(x_84, x_83);
+x_85 = lean_apply_3(x_24, x_83, x_84, x_23);
+if (lean_obj_tag(x_85) == 0)
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; 
 x_86 = lean_ctor_get(x_85, 0);
 lean_inc(x_86);
 x_87 = lean_ctor_get(x_85, 1);
 lean_inc(x_87);
 lean_dec(x_85);
-x_88 = lean_apply_2(x_86, x_82, x_87);
-if (lean_obj_tag(x_88) == 0)
+x_88 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_88, 0, x_83);
+lean_ctor_set(x_88, 1, x_86);
+x_89 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg(x_15, x_4, x_88);
+x_90 = l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(x_89, x_87);
+if (lean_obj_tag(x_90) == 0)
 {
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_89 = lean_ctor_get(x_88, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_88, 1);
-lean_inc(x_90);
-lean_dec(x_88);
-x_91 = lean_box(0);
-x_92 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_89, x_91, x_90);
-return x_92;
+lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_91 = lean_ctor_get(x_90, 0);
+lean_inc(x_91);
+x_92 = lean_ctor_get(x_90, 1);
+lean_inc(x_92);
+lean_dec(x_90);
+x_93 = lean_st_ref_get(x_6, x_92);
+x_94 = lean_ctor_get(x_93, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_93, 1);
+lean_inc(x_95);
+lean_dec(x_93);
+x_96 = lean_get_num_attributes(x_95);
+if (lean_obj_tag(x_96) == 0)
+{
+lean_object* x_97; lean_object* x_98; lean_object* x_99; uint8_t x_100; 
+x_97 = lean_ctor_get(x_96, 0);
+lean_inc(x_97);
+x_98 = lean_ctor_get(x_96, 1);
+lean_inc(x_98);
+lean_dec(x_96);
+x_99 = lean_array_get_size(x_94);
+lean_dec(x_94);
+x_100 = lean_nat_dec_lt(x_20, x_99);
+lean_dec(x_99);
+if (x_100 == 0)
+{
+uint8_t x_101; 
+x_101 = lean_nat_dec_lt(x_22, x_97);
+lean_dec(x_97);
+lean_dec(x_22);
+if (x_101 == 0)
+{
+lean_object* x_102; lean_object* x_103; 
+lean_dec(x_20);
+x_102 = lean_box(0);
+x_103 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_91, x_102, x_98);
+return x_103;
 }
 else
 {
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_104 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_91, x_1, x_20, x_98);
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+x_106 = lean_ctor_get(x_104, 1);
+lean_inc(x_106);
+lean_dec(x_104);
+x_107 = lean_update_env_attributes(x_105, x_106);
+if (lean_obj_tag(x_107) == 0)
+{
+lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+x_108 = lean_ctor_get(x_107, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_107, 1);
+lean_inc(x_109);
+lean_dec(x_107);
+x_110 = lean_box(0);
+x_111 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_108, x_110, x_109);
+return x_111;
+}
+else
+{
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_93 = lean_ctor_get(x_88, 0);
-lean_inc(x_93);
-x_94 = lean_ctor_get(x_88, 1);
-lean_inc(x_94);
-if (lean_is_exclusive(x_88)) {
- lean_ctor_release(x_88, 0);
- lean_ctor_release(x_88, 1);
- x_95 = x_88;
+x_112 = lean_ctor_get(x_107, 0);
+lean_inc(x_112);
+x_113 = lean_ctor_get(x_107, 1);
+lean_inc(x_113);
+if (lean_is_exclusive(x_107)) {
+ lean_ctor_release(x_107, 0);
+ lean_ctor_release(x_107, 1);
+ x_114 = x_107;
 } else {
- lean_dec_ref(x_88);
- x_95 = lean_box(0);
+ lean_dec_ref(x_107);
+ x_114 = lean_box(0);
 }
-if (lean_is_scalar(x_95)) {
- x_96 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_114)) {
+ x_115 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_96 = x_95;
+ x_115 = x_114;
 }
-lean_ctor_set(x_96, 0, x_93);
-lean_ctor_set(x_96, 1, x_94);
-return x_96;
+lean_ctor_set(x_115, 0, x_112);
+lean_ctor_set(x_115, 1, x_113);
+return x_115;
 }
 }
 }
 else
 {
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
+lean_dec(x_97);
+lean_dec(x_22);
+x_116 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_91, x_1, x_20, x_98);
+x_117 = lean_ctor_get(x_116, 0);
+lean_inc(x_117);
+x_118 = lean_ctor_get(x_116, 1);
+lean_inc(x_118);
+lean_dec(x_116);
+x_119 = lean_update_env_attributes(x_117, x_118);
+if (lean_obj_tag(x_119) == 0)
+{
+lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
+x_120 = lean_ctor_get(x_119, 0);
+lean_inc(x_120);
+x_121 = lean_ctor_get(x_119, 1);
+lean_inc(x_121);
+lean_dec(x_119);
+x_122 = lean_box(0);
+x_123 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_120, x_122, x_121);
+return x_123;
+}
+else
+{
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_124 = lean_ctor_get(x_119, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_119, 1);
+lean_inc(x_125);
+if (lean_is_exclusive(x_119)) {
+ lean_ctor_release(x_119, 0);
+ lean_ctor_release(x_119, 1);
+ x_126 = x_119;
+} else {
+ lean_dec_ref(x_119);
+ x_126 = lean_box(0);
+}
+if (lean_is_scalar(x_126)) {
+ x_127 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_127 = x_126;
+}
+lean_ctor_set(x_127, 0, x_124);
+lean_ctor_set(x_127, 1, x_125);
+return x_127;
+}
+}
+}
+else
+{
+lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; 
+lean_dec(x_94);
+lean_dec(x_91);
+lean_dec(x_22);
 lean_dec(x_20);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_97 = lean_ctor_get(x_71, 0);
-lean_inc(x_97);
-x_98 = lean_ctor_get(x_71, 1);
-lean_inc(x_98);
-if (lean_is_exclusive(x_71)) {
- lean_ctor_release(x_71, 0);
- lean_ctor_release(x_71, 1);
- x_99 = x_71;
+x_128 = lean_ctor_get(x_96, 0);
+lean_inc(x_128);
+x_129 = lean_ctor_get(x_96, 1);
+lean_inc(x_129);
+if (lean_is_exclusive(x_96)) {
+ lean_ctor_release(x_96, 0);
+ lean_ctor_release(x_96, 1);
+ x_130 = x_96;
 } else {
- lean_dec_ref(x_71);
- x_99 = lean_box(0);
+ lean_dec_ref(x_96);
+ x_130 = lean_box(0);
 }
-if (lean_is_scalar(x_99)) {
- x_100 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_130)) {
+ x_131 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_100 = x_99;
+ x_131 = x_130;
 }
-lean_ctor_set(x_100, 0, x_97);
-lean_ctor_set(x_100, 1, x_98);
-return x_100;
+lean_ctor_set(x_131, 0, x_128);
+lean_ctor_set(x_131, 1, x_129);
+return x_131;
 }
 }
 else
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-lean_dec(x_64);
+lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+lean_dec(x_22);
+lean_dec(x_20);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_132 = lean_ctor_get(x_90, 0);
+lean_inc(x_132);
+x_133 = lean_ctor_get(x_90, 1);
+lean_inc(x_133);
+if (lean_is_exclusive(x_90)) {
+ lean_ctor_release(x_90, 0);
+ lean_ctor_release(x_90, 1);
+ x_134 = x_90;
+} else {
+ lean_dec_ref(x_90);
+ x_134 = lean_box(0);
+}
+if (lean_is_scalar(x_134)) {
+ x_135 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_135 = x_134;
+}
+lean_ctor_set(x_135, 0, x_132);
+lean_ctor_set(x_135, 1, x_133);
+return x_135;
+}
+}
+else
+{
+lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
+lean_dec(x_83);
+lean_dec(x_22);
 lean_dec(x_20);
 lean_dec(x_15);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_101 = lean_ctor_get(x_66, 0);
-lean_inc(x_101);
-x_102 = lean_ctor_get(x_66, 1);
-lean_inc(x_102);
-if (lean_is_exclusive(x_66)) {
- lean_ctor_release(x_66, 0);
- lean_ctor_release(x_66, 1);
- x_103 = x_66;
+x_136 = lean_ctor_get(x_85, 0);
+lean_inc(x_136);
+x_137 = lean_ctor_get(x_85, 1);
+lean_inc(x_137);
+if (lean_is_exclusive(x_85)) {
+ lean_ctor_release(x_85, 0);
+ lean_ctor_release(x_85, 1);
+ x_138 = x_85;
 } else {
- lean_dec_ref(x_66);
- x_103 = lean_box(0);
+ lean_dec_ref(x_85);
+ x_138 = lean_box(0);
 }
-if (lean_is_scalar(x_103)) {
- x_104 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_138)) {
+ x_139 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_104 = x_103;
-}
-lean_ctor_set(x_104, 0, x_101);
-lean_ctor_set(x_104, 1, x_102);
-return x_104;
+ x_139 = x_138;
 }
+lean_ctor_set(x_139, 0, x_136);
+lean_ctor_set(x_139, 1, x_137);
+return x_139;
 }
 }
 }
 else
 {
-lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; 
-x_105 = lean_ctor_get(x_7, 0);
-x_106 = lean_ctor_get(x_7, 1);
-lean_inc(x_106);
-lean_inc(x_105);
-lean_dec(x_7);
-x_107 = lean_array_get_size(x_105);
-x_108 = lean_nat_dec_lt(x_3, x_107);
-lean_dec(x_107);
-if (x_108 == 0)
-{
-lean_object* x_109; 
-lean_dec(x_105);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_109 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_109, 0, x_4);
-lean_ctor_set(x_109, 1, x_106);
-return x_109;
-}
-else
-{
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_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; 
-x_110 = l_Nat_foldAux___at_Lean_mkModuleData___spec__4___closed__1;
-x_111 = lean_array_get(x_110, x_105, x_3);
-lean_dec(x_105);
-x_112 = lean_ctor_get(x_111, 0);
-lean_inc(x_112);
-lean_inc(x_112);
-x_113 = l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_mkModuleData___spec__2(x_112, x_4);
-x_114 = lean_st_ref_get(x_6, x_106);
-x_115 = lean_ctor_get(x_114, 0);
-lean_inc(x_115);
-x_116 = lean_ctor_get(x_114, 1);
-lean_inc(x_116);
-lean_dec(x_114);
-x_117 = lean_array_get_size(x_115);
-lean_dec(x_115);
-x_118 = lean_ctor_get(x_111, 2);
-lean_inc(x_118);
-lean_dec(x_111);
-x_119 = lean_ctor_get(x_113, 0);
-lean_inc(x_119);
-if (lean_is_exclusive(x_113)) {
- lean_ctor_release(x_113, 0);
- lean_ctor_release(x_113, 1);
- x_120 = x_113;
-} else {
- lean_dec_ref(x_113);
- x_120 = lean_box(0);
-}
-lean_inc(x_2);
-lean_inc(x_4);
-x_121 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_121, 0, x_4);
-lean_ctor_set(x_121, 1, x_2);
-lean_inc(x_119);
-x_122 = lean_apply_3(x_118, x_119, x_121, x_116);
-if (lean_obj_tag(x_122) == 0)
-{
-lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
-x_123 = lean_ctor_get(x_122, 0);
-lean_inc(x_123);
-x_124 = lean_ctor_get(x_122, 1);
-lean_inc(x_124);
-lean_dec(x_122);
-if (lean_is_scalar(x_120)) {
- x_125 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_125 = x_120;
-}
-lean_ctor_set(x_125, 0, x_119);
-lean_ctor_set(x_125, 1, x_123);
-x_126 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg(x_112, x_4, x_125);
-x_127 = l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(x_126, x_124);
-if (lean_obj_tag(x_127) == 0)
-{
-lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; uint8_t x_134; 
-x_128 = lean_ctor_get(x_127, 0);
-lean_inc(x_128);
-x_129 = lean_ctor_get(x_127, 1);
-lean_inc(x_129);
-lean_dec(x_127);
-x_130 = lean_st_ref_get(x_6, x_129);
-x_131 = lean_ctor_get(x_130, 0);
-lean_inc(x_131);
-x_132 = lean_ctor_get(x_130, 1);
-lean_inc(x_132);
-lean_dec(x_130);
-x_133 = lean_array_get_size(x_131);
-lean_dec(x_131);
-x_134 = lean_nat_dec_lt(x_117, x_133);
-lean_dec(x_133);
-if (x_134 == 0)
-{
-lean_object* x_135; lean_object* x_136; 
-lean_dec(x_117);
-x_135 = lean_box(0);
-x_136 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_128, x_135, x_132);
-return x_136;
-}
-else
-{
-lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_137 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_128, x_1, x_117, x_132);
-x_138 = lean_ctor_get(x_137, 0);
-lean_inc(x_138);
-x_139 = lean_ctor_get(x_137, 1);
-lean_inc(x_139);
-lean_dec(x_137);
-x_140 = l_Lean_updateEnvAttributesRef;
-x_141 = lean_st_ref_get(x_140, x_139);
-x_142 = lean_ctor_get(x_141, 0);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_141, 1);
-lean_inc(x_143);
-lean_dec(x_141);
-x_144 = lean_apply_2(x_142, x_138, x_143);
-if (lean_obj_tag(x_144) == 0)
-{
-lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
-x_145 = lean_ctor_get(x_144, 0);
-lean_inc(x_145);
-x_146 = lean_ctor_get(x_144, 1);
-lean_inc(x_146);
-lean_dec(x_144);
-x_147 = lean_box(0);
-x_148 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_145, x_147, x_146);
-return x_148;
-}
-else
-{
-lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_149 = lean_ctor_get(x_144, 0);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_144, 1);
-lean_inc(x_150);
-if (lean_is_exclusive(x_144)) {
- lean_ctor_release(x_144, 0);
- lean_ctor_release(x_144, 1);
- x_151 = x_144;
-} else {
- lean_dec_ref(x_144);
- x_151 = lean_box(0);
-}
-if (lean_is_scalar(x_151)) {
- x_152 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_152 = x_151;
-}
-lean_ctor_set(x_152, 0, x_149);
-lean_ctor_set(x_152, 1, x_150);
-return x_152;
-}
-}
-}
-else
-{
-lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 
-lean_dec(x_117);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_153 = lean_ctor_get(x_127, 0);
-lean_inc(x_153);
-x_154 = lean_ctor_get(x_127, 1);
-lean_inc(x_154);
-if (lean_is_exclusive(x_127)) {
- lean_ctor_release(x_127, 0);
- lean_ctor_release(x_127, 1);
- x_155 = x_127;
-} else {
- lean_dec_ref(x_127);
- x_155 = lean_box(0);
-}
-if (lean_is_scalar(x_155)) {
- x_156 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_156 = x_155;
-}
-lean_ctor_set(x_156, 0, x_153);
-lean_ctor_set(x_156, 1, x_154);
-return x_156;
-}
-}
-else
-{
-lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
-lean_dec(x_120);
-lean_dec(x_119);
-lean_dec(x_117);
-lean_dec(x_112);
+uint8_t x_140; 
+lean_dec(x_20);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_157 = lean_ctor_get(x_122, 0);
-lean_inc(x_157);
-x_158 = lean_ctor_get(x_122, 1);
+x_140 = !lean_is_exclusive(x_21);
+if (x_140 == 0)
+{
+return x_21;
+}
+else
+{
+lean_object* x_141; lean_object* x_142; lean_object* x_143; 
+x_141 = lean_ctor_get(x_21, 0);
+x_142 = lean_ctor_get(x_21, 1);
+lean_inc(x_142);
+lean_inc(x_141);
+lean_dec(x_21);
+x_143 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_143, 0, x_141);
+lean_ctor_set(x_143, 1, x_142);
+return x_143;
+}
+}
+}
+}
+else
+{
+lean_object* x_144; lean_object* x_145; lean_object* x_146; uint8_t x_147; 
+x_144 = lean_ctor_get(x_7, 0);
+x_145 = lean_ctor_get(x_7, 1);
+lean_inc(x_145);
+lean_inc(x_144);
+lean_dec(x_7);
+x_146 = lean_array_get_size(x_144);
+x_147 = lean_nat_dec_lt(x_3, x_146);
+lean_dec(x_146);
+if (x_147 == 0)
+{
+lean_object* x_148; 
+lean_dec(x_144);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_148 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_148, 0, x_4);
+lean_ctor_set(x_148, 1, x_145);
+return x_148;
+}
+else
+{
+lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; 
+x_149 = l_Nat_foldAux___at_Lean_mkModuleData___spec__4___closed__1;
+x_150 = lean_array_get(x_149, x_144, x_3);
+lean_dec(x_144);
+x_151 = lean_ctor_get(x_150, 0);
+lean_inc(x_151);
+lean_inc(x_151);
+x_152 = l_Lean_EnvExtensionInterfaceUnsafe_getState___at_Lean_mkModuleData___spec__2(x_151, x_4);
+x_153 = lean_st_ref_get(x_6, x_145);
+x_154 = lean_ctor_get(x_153, 0);
+lean_inc(x_154);
+x_155 = lean_ctor_get(x_153, 1);
+lean_inc(x_155);
+lean_dec(x_153);
+x_156 = lean_array_get_size(x_154);
+lean_dec(x_154);
+x_157 = lean_get_num_attributes(x_155);
+if (lean_obj_tag(x_157) == 0)
+{
+lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_158 = lean_ctor_get(x_157, 0);
 lean_inc(x_158);
-if (lean_is_exclusive(x_122)) {
- lean_ctor_release(x_122, 0);
- lean_ctor_release(x_122, 1);
- x_159 = x_122;
+x_159 = lean_ctor_get(x_157, 1);
+lean_inc(x_159);
+lean_dec(x_157);
+x_160 = lean_ctor_get(x_150, 2);
+lean_inc(x_160);
+lean_dec(x_150);
+x_161 = lean_ctor_get(x_152, 0);
+lean_inc(x_161);
+if (lean_is_exclusive(x_152)) {
+ lean_ctor_release(x_152, 0);
+ lean_ctor_release(x_152, 1);
+ x_162 = x_152;
 } else {
- lean_dec_ref(x_122);
- x_159 = lean_box(0);
+ lean_dec_ref(x_152);
+ x_162 = lean_box(0);
 }
-if (lean_is_scalar(x_159)) {
- x_160 = lean_alloc_ctor(1, 2, 0);
+lean_inc(x_2);
+lean_inc(x_4);
+x_163 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_163, 0, x_4);
+lean_ctor_set(x_163, 1, x_2);
+lean_inc(x_161);
+x_164 = lean_apply_3(x_160, x_161, x_163, x_159);
+if (lean_obj_tag(x_164) == 0)
+{
+lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+x_165 = lean_ctor_get(x_164, 0);
+lean_inc(x_165);
+x_166 = lean_ctor_get(x_164, 1);
+lean_inc(x_166);
+lean_dec(x_164);
+if (lean_is_scalar(x_162)) {
+ x_167 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_160 = x_159;
+ x_167 = x_162;
 }
-lean_ctor_set(x_160, 0, x_157);
-lean_ctor_set(x_160, 1, x_158);
-return x_160;
+lean_ctor_set(x_167, 0, x_161);
+lean_ctor_set(x_167, 1, x_165);
+x_168 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg(x_151, x_4, x_167);
+x_169 = l_Lean_EnvExtensionInterfaceUnsafe_ensureExtensionsArraySize(x_168, x_166);
+if (lean_obj_tag(x_169) == 0)
+{
+lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+x_170 = lean_ctor_get(x_169, 0);
+lean_inc(x_170);
+x_171 = lean_ctor_get(x_169, 1);
+lean_inc(x_171);
+lean_dec(x_169);
+x_172 = lean_st_ref_get(x_6, x_171);
+x_173 = lean_ctor_get(x_172, 0);
+lean_inc(x_173);
+x_174 = lean_ctor_get(x_172, 1);
+lean_inc(x_174);
+lean_dec(x_172);
+x_175 = lean_get_num_attributes(x_174);
+if (lean_obj_tag(x_175) == 0)
+{
+lean_object* x_176; lean_object* x_177; lean_object* x_178; uint8_t x_179; 
+x_176 = lean_ctor_get(x_175, 0);
+lean_inc(x_176);
+x_177 = lean_ctor_get(x_175, 1);
+lean_inc(x_177);
+lean_dec(x_175);
+x_178 = lean_array_get_size(x_173);
+lean_dec(x_173);
+x_179 = lean_nat_dec_lt(x_156, x_178);
+lean_dec(x_178);
+if (x_179 == 0)
+{
+uint8_t x_180; 
+x_180 = lean_nat_dec_lt(x_158, x_176);
+lean_dec(x_176);
+lean_dec(x_158);
+if (x_180 == 0)
+{
+lean_object* x_181; lean_object* x_182; 
+lean_dec(x_156);
+x_181 = lean_box(0);
+x_182 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_170, x_181, x_177);
+return x_182;
+}
+else
+{
+lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+x_183 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_170, x_1, x_156, x_177);
+x_184 = lean_ctor_get(x_183, 0);
+lean_inc(x_184);
+x_185 = lean_ctor_get(x_183, 1);
+lean_inc(x_185);
+lean_dec(x_183);
+x_186 = lean_update_env_attributes(x_184, x_185);
+if (lean_obj_tag(x_186) == 0)
+{
+lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_187 = lean_ctor_get(x_186, 0);
+lean_inc(x_187);
+x_188 = lean_ctor_get(x_186, 1);
+lean_inc(x_188);
+lean_dec(x_186);
+x_189 = lean_box(0);
+x_190 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_187, x_189, x_188);
+return x_190;
+}
+else
+{
+lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_191 = lean_ctor_get(x_186, 0);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_186, 1);
+lean_inc(x_192);
+if (lean_is_exclusive(x_186)) {
+ lean_ctor_release(x_186, 0);
+ lean_ctor_release(x_186, 1);
+ x_193 = x_186;
+} else {
+ lean_dec_ref(x_186);
+ x_193 = lean_box(0);
+}
+if (lean_is_scalar(x_193)) {
+ x_194 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_194 = x_193;
+}
+lean_ctor_set(x_194, 0, x_191);
+lean_ctor_set(x_194, 1, x_192);
+return x_194;
+}
+}
+}
+else
+{
+lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+lean_dec(x_176);
+lean_dec(x_158);
+x_195 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_170, x_1, x_156, x_177);
+x_196 = lean_ctor_get(x_195, 0);
+lean_inc(x_196);
+x_197 = lean_ctor_get(x_195, 1);
+lean_inc(x_197);
+lean_dec(x_195);
+x_198 = lean_update_env_attributes(x_196, x_197);
+if (lean_obj_tag(x_198) == 0)
+{
+lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+x_199 = lean_ctor_get(x_198, 0);
+lean_inc(x_199);
+x_200 = lean_ctor_get(x_198, 1);
+lean_inc(x_200);
+lean_dec(x_198);
+x_201 = lean_box(0);
+x_202 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lambda__1(x_3, x_1, x_2, x_199, x_201, x_200);
+return x_202;
+}
+else
+{
+lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_203 = lean_ctor_get(x_198, 0);
+lean_inc(x_203);
+x_204 = lean_ctor_get(x_198, 1);
+lean_inc(x_204);
+if (lean_is_exclusive(x_198)) {
+ lean_ctor_release(x_198, 0);
+ lean_ctor_release(x_198, 1);
+ x_205 = x_198;
+} else {
+ lean_dec_ref(x_198);
+ x_205 = lean_box(0);
+}
+if (lean_is_scalar(x_205)) {
+ x_206 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_206 = x_205;
+}
+lean_ctor_set(x_206, 0, x_203);
+lean_ctor_set(x_206, 1, x_204);
+return x_206;
+}
+}
+}
+else
+{
+lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; 
+lean_dec(x_173);
+lean_dec(x_170);
+lean_dec(x_158);
+lean_dec(x_156);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_207 = lean_ctor_get(x_175, 0);
+lean_inc(x_207);
+x_208 = lean_ctor_get(x_175, 1);
+lean_inc(x_208);
+if (lean_is_exclusive(x_175)) {
+ lean_ctor_release(x_175, 0);
+ lean_ctor_release(x_175, 1);
+ x_209 = x_175;
+} else {
+ lean_dec_ref(x_175);
+ x_209 = lean_box(0);
+}
+if (lean_is_scalar(x_209)) {
+ x_210 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_210 = x_209;
+}
+lean_ctor_set(x_210, 0, x_207);
+lean_ctor_set(x_210, 1, x_208);
+return x_210;
+}
+}
+else
+{
+lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; 
+lean_dec(x_158);
+lean_dec(x_156);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_211 = lean_ctor_get(x_169, 0);
+lean_inc(x_211);
+x_212 = lean_ctor_get(x_169, 1);
+lean_inc(x_212);
+if (lean_is_exclusive(x_169)) {
+ lean_ctor_release(x_169, 0);
+ lean_ctor_release(x_169, 1);
+ x_213 = x_169;
+} else {
+ lean_dec_ref(x_169);
+ x_213 = lean_box(0);
+}
+if (lean_is_scalar(x_213)) {
+ x_214 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_214 = x_213;
+}
+lean_ctor_set(x_214, 0, x_211);
+lean_ctor_set(x_214, 1, x_212);
+return x_214;
+}
+}
+else
+{
+lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; 
+lean_dec(x_162);
+lean_dec(x_161);
+lean_dec(x_158);
+lean_dec(x_156);
+lean_dec(x_151);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_215 = lean_ctor_get(x_164, 0);
+lean_inc(x_215);
+x_216 = lean_ctor_get(x_164, 1);
+lean_inc(x_216);
+if (lean_is_exclusive(x_164)) {
+ lean_ctor_release(x_164, 0);
+ lean_ctor_release(x_164, 1);
+ x_217 = x_164;
+} else {
+ lean_dec_ref(x_164);
+ x_217 = lean_box(0);
+}
+if (lean_is_scalar(x_217)) {
+ x_218 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_218 = x_217;
+}
+lean_ctor_set(x_218, 0, x_215);
+lean_ctor_set(x_218, 1, x_216);
+return x_218;
+}
+}
+else
+{
+lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
+lean_dec(x_156);
+lean_dec(x_152);
+lean_dec(x_151);
+lean_dec(x_150);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_219 = lean_ctor_get(x_157, 0);
+lean_inc(x_219);
+x_220 = lean_ctor_get(x_157, 1);
+lean_inc(x_220);
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ x_221 = x_157;
+} else {
+ lean_dec_ref(x_157);
+ x_221 = lean_box(0);
+}
+if (lean_is_scalar(x_221)) {
+ x_222 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_222 = x_221;
+}
+lean_ctor_set(x_222, 0, x_219);
+lean_ctor_set(x_222, 1, x_220);
+return x_222;
 }
 }
 }
@@ -11668,7 +12020,7 @@ x_7 = l_Lean_withImportModules___rarg(x_1, x_2, x_6, x_4, x_5);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -11691,7 +12043,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -11729,7 +12081,7 @@ size_t x_15; size_t x_16; lean_object* x_17;
 x_15 = 0;
 x_16 = lean_usize_of_nat(x_7);
 lean_dec(x_7);
-x_17 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__2(x_6, x_15, x_16, x_4);
+x_17 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__2(x_6, x_15, x_16, x_4);
 lean_dec(x_6);
 x_2 = x_11;
 x_4 = x_17;
@@ -11743,7 +12095,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -11772,14 +12124,14 @@ size_t x_7; size_t x_8; lean_object* x_9;
 x_7 = 0;
 x_8 = lean_usize_of_nat(x_3);
 lean_dec(x_3);
-x_9 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__3(x_2, x_7, x_8, x_1);
+x_9 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__3(x_2, x_7, x_8, x_1);
 lean_dec(x_2);
 return x_9;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__4(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__4(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; 
@@ -11817,7 +12169,7 @@ return x_8;
 }
 }
 }
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
+LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -11855,7 +12207,7 @@ return x_14;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__6(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__6(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -11900,7 +12252,7 @@ size_t x_16; size_t x_17; uint8_t x_18;
 x_16 = 0;
 x_17 = lean_usize_of_nat(x_8);
 lean_dec(x_8);
-x_18 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7(x_1, x_6, x_16, x_17);
+x_18 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7(x_1, x_6, x_16, x_17);
 lean_dec(x_6);
 if (x_18 == 0)
 {
@@ -11971,7 +12323,7 @@ size_t x_39; size_t x_40; uint8_t x_41;
 x_39 = 0;
 x_40 = lean_usize_of_nat(x_31);
 lean_dec(x_31);
-x_41 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7(x_1, x_29, x_39, x_40);
+x_41 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7(x_1, x_29, x_39, x_40);
 lean_dec(x_29);
 if (x_41 == 0)
 {
@@ -12005,7 +12357,7 @@ return x_52;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__5(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__5(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
@@ -12038,11 +12390,11 @@ lean_ctor_set(x_14, 2, x_10);
 lean_ctor_set(x_14, 3, x_11);
 lean_ctor_set(x_14, 4, x_12);
 lean_ctor_set(x_14, 5, x_13);
-x_15 = l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__6(x_14, x_2);
+x_15 = l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__6(x_14, x_2);
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____lambda__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____lambda__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
@@ -12051,17 +12403,17 @@ x_4 = l_Lean_SMap_insert___at_Lean_NameSSet_insert___spec__1(x_1, x_2, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616____lambda__2(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614____lambda__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_2 = l_Lean_SMap_empty___at_Lean_NameSSet_empty___spec__1;
-x_3 = l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__1(x_2, x_1);
-x_4 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__4(x_3);
+x_3 = l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__1(x_2, x_1);
+x_4 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__4(x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__1() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -12069,17 +12421,17 @@ x_1 = lean_mk_string("namespaces");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__2() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__1;
+x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__3() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -12088,30 +12440,30 @@ lean_closure_set(x_1, 0, lean_box(0));
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__4() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__4() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_4616____lambda__1), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_4614____lambda__1), 2, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__5() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__5() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_4616____lambda__2), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_4614____lambda__2), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__6() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__2;
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__4;
-x_3 = l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__5;
-x_4 = l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__3;
+x_1 = l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__2;
+x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__4;
+x_3 = l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__5;
+x_4 = l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__3;
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -12120,16 +12472,16 @@ lean_ctor_set(x_5, 3, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4616_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4614_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__6;
-x_3 = l_Lean_registerSimplePersistentEnvExtension___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__5(x_2, x_1);
+x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__6;
+x_3 = l_Lean_registerSimplePersistentEnvExtension___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__5(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -12137,12 +12489,12 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__2(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__2(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -12150,12 +12502,12 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__3(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__3(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; uint8_t x_7; lean_object* x_8; 
@@ -12163,7 +12515,7 @@ x_5 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_6 = lean_unbox_usize(x_4);
 lean_dec(x_4);
-x_7 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4616____spec__7(x_1, x_2, x_5, x_6);
+x_7 = l_Array_anyMUnsafe_any___at_Lean_initFn____x40_Lean_Environment___hyg_4614____spec__7(x_1, x_2, x_5, x_6);
 lean_dec(x_2);
 lean_dec(x_1);
 x_8 = lean_box(x_7);
@@ -14434,13 +14786,6 @@ l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__6___closed__1 =
 lean_mark_persistent(l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__6___closed__1);
 l___private_Lean_Environment_0__Lean_getEntriesFor___closed__1 = _init_l___private_Lean_Environment_0__Lean_getEntriesFor___closed__1();
 lean_mark_persistent(l___private_Lean_Environment_0__Lean_getEntriesFor___closed__1);
-l_Lean_initFn____x40_Lean_Environment___hyg_3428____closed__1 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_3428____closed__1();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_3428____closed__1);
-res = l_Lean_initFn____x40_Lean_Environment___hyg_3428_(lean_io_mk_world());
-if (lean_io_result_is_error(res)) return res;
-l_Lean_updateEnvAttributesRef = lean_io_result_get_value(res);
-lean_mark_persistent(l_Lean_updateEnvAttributesRef);
-lean_dec_ref(res);
 l_Lean_ImportState_moduleNameSet___default = _init_l_Lean_ImportState_moduleNameSet___default();
 lean_mark_persistent(l_Lean_ImportState_moduleNameSet___default);
 l_Lean_ImportState_moduleNames___default = _init_l_Lean_ImportState_moduleNames___default();
@@ -14463,18 +14808,18 @@ l_Lean_importModules___closed__1 = _init_l_Lean_importModules___closed__1();
 lean_mark_persistent(l_Lean_importModules___closed__1);
 l_Lean_importModules___closed__2 = _init_l_Lean_importModules___closed__2();
 lean_mark_persistent(l_Lean_importModules___closed__2);
-l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__1 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__1();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__1);
-l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__2 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__2();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__2);
-l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__3 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__3();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__3);
-l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__4 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__4();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__4);
-l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__5 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__5();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__5);
-l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__6 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__6();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4616____closed__6);
+l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__1 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__1();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__1);
+l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__2 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__2();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__2);
+l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__3 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__3();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__3);
+l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__4 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__4();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__4);
+l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__5 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__5();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__5);
+l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__6 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__6();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4614____closed__6);
 l_Lean_namespacesExt___closed__1 = _init_l_Lean_namespacesExt___closed__1();
 lean_mark_persistent(l_Lean_namespacesExt___closed__1);
 l_Lean_namespacesExt___closed__2 = _init_l_Lean_namespacesExt___closed__2();
@@ -14485,7 +14830,7 @@ l_Lean_namespacesExt___closed__4 = _init_l_Lean_namespacesExt___closed__4();
 lean_mark_persistent(l_Lean_namespacesExt___closed__4);
 l_Lean_namespacesExt___closed__5 = _init_l_Lean_namespacesExt___closed__5();
 lean_mark_persistent(l_Lean_namespacesExt___closed__5);
-res = l_Lean_initFn____x40_Lean_Environment___hyg_4616_(lean_io_mk_world());
+res = l_Lean_initFn____x40_Lean_Environment___hyg_4614_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_namespacesExt = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_namespacesExt);
diff --git a/stage0/stdlib/Lean/Expr.c b/stage0/stdlib/Lean/Expr.c
index f0c71f2d71..32b4c14048 100644
--- a/stage0/stdlib/Lean/Expr.c
+++ b/stage0/stdlib/Lean/Expr.c
@@ -65,6 +65,7 @@ static lean_object* l_Lean_mkDecIsFalse___closed__1;
 static lean_object* l_Lean_mkAnd___closed__2;
 uint64_t lean_uint8_to_uint64(uint8_t);
 static lean_object* l___private_Lean_Expr_0__Lean_reprBinderInfo____x40_Lean_Expr___hyg_376____closed__11;
+LEAN_EXPORT lean_object* l_Lean_inaccessible_x3f___boxed(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 static lean_object* l_Lean_mkEM___closed__1;
@@ -74,6 +75,7 @@ static lean_object* l_Lean_mkSimpleThunkType___closed__3;
 LEAN_EXPORT uint8_t l_Lean_Expr_isProp(lean_object*);
 uint64_t lean_uint64_of_nat(lean_object*);
 static lean_object* l_Lean_Expr_instHashableExpr___closed__1;
+static lean_object* l_Lean_mkInaccessible___closed__1;
 LEAN_EXPORT uint64_t l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1198_(lean_object*);
 lean_object* lean_expr_update_mdata(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_bindingDomain_x21(lean_object*);
@@ -323,6 +325,7 @@ LEAN_EXPORT uint64_t l_Lean_Expr_data(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Expr_0__Lean_Expr_withAppRevAux(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Expr_0__Lean_Expr_getParamSubstArray___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_inaccessible_x3f(lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Expr_isHeadBetaTarget(lean_object*);
 static lean_object* l___private_Lean_Expr_0__Lean_reprBinderInfo____x40_Lean_Expr___hyg_376____closed__4;
 LEAN_EXPORT uint8_t l_Lean_Expr_isBinding(lean_object*);
@@ -363,6 +366,7 @@ LEAN_EXPORT lean_object* l_panic___at_Lean_Expr_constLevels_x21___spec__1(lean_o
 LEAN_EXPORT lean_object* l_Lean_Expr_getArg_x21___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Expr_bindingDomain_x21___closed__1;
 lean_object* l_panic___at_String_toNat_x21___spec__1(lean_object*);
+static lean_object* l_Lean_mkInaccessible___closed__2;
 LEAN_EXPORT lean_object* l_Lean_isLHSGoal_x3f___boxed(lean_object*);
 static lean_object* l_Lean_Expr_getRevArg_x21___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Expr_instantiateLevelParamsCore_visit___at_Lean_Expr_instantiateLevelParams___spec__1___boxed(lean_object*, lean_object*, lean_object*);
@@ -745,6 +749,7 @@ lean_object* l_panic___at_Lean_Level_mvarId_x21___spec__1(lean_object*);
 static lean_object* l_Lean_Expr_updateSort_x21___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Expr_isConst___boxed(lean_object*);
 static lean_object* l___private_Lean_Expr_0__Lean_reprBinderInfo____x40_Lean_Expr___hyg_376____closed__16;
+LEAN_EXPORT lean_object* l_Lean_mkInaccessible(lean_object*);
 static lean_object* l_Lean_Expr_mdataExpr_x21___closed__1;
 uint64_t lean_string_hash(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_isNatLit___boxed(lean_object*);
@@ -14011,6 +14016,51 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+static lean_object* _init_l_Lean_mkInaccessible___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("_inaccessible");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_mkInaccessible___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_mkInaccessible___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_mkInaccessible(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_mkInaccessible___closed__2;
+x_3 = l_Lean_mkAnnotation(x_2, x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_inaccessible_x3f(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_mkInaccessible___closed__2;
+x_3 = l_Lean_annotation_x3f(x_2, x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_inaccessible_x3f___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_inaccessible_x3f(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
 static lean_object* _init_l_Lean_mkLHSGoal___closed__1() {
 _start:
 {
@@ -14806,6 +14856,10 @@ l_Lean_mkLetFunAnnotation___closed__1 = _init_l_Lean_mkLetFunAnnotation___closed
 lean_mark_persistent(l_Lean_mkLetFunAnnotation___closed__1);
 l_Lean_mkLetFunAnnotation___closed__2 = _init_l_Lean_mkLetFunAnnotation___closed__2();
 lean_mark_persistent(l_Lean_mkLetFunAnnotation___closed__2);
+l_Lean_mkInaccessible___closed__1 = _init_l_Lean_mkInaccessible___closed__1();
+lean_mark_persistent(l_Lean_mkInaccessible___closed__1);
+l_Lean_mkInaccessible___closed__2 = _init_l_Lean_mkInaccessible___closed__2();
+lean_mark_persistent(l_Lean_mkInaccessible___closed__2);
 l_Lean_mkLHSGoal___closed__1 = _init_l_Lean_mkLHSGoal___closed__1();
 lean_mark_persistent(l_Lean_mkLHSGoal___closed__1);
 l_Lean_mkLHSGoal___closed__2 = _init_l_Lean_mkLHSGoal___closed__2();
diff --git a/stage0/stdlib/Lean/Meta/AbstractNestedProofs.c b/stage0/stdlib/Lean/Meta/AbstractNestedProofs.c
index 27600a76bc..8797d95f54 100644
--- a/stage0/stdlib/Lean/Meta/AbstractNestedProofs.c
+++ b/stage0/stdlib/Lean/Meta/AbstractNestedProofs.c
@@ -1283,11 +1283,10 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_Meta_AbstractNestedProofs_visit___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-uint8_t x_11; uint8_t x_12; lean_object* x_13; 
+uint8_t x_11; lean_object* x_12; 
 x_11 = 0;
-x_12 = 1;
-x_13 = l_Lean_Meta_mkLambdaFVars(x_1, x_2, x_11, x_12, x_6, x_7, x_8, x_9, x_10);
-return x_13;
+x_12 = l_Lean_Meta_mkLambdaFVars(x_1, x_2, x_11, x_11, x_6, x_7, x_8, x_9, x_10);
+return x_12;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Meta_AbstractNestedProofs_visit___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
diff --git a/stage0/stdlib/Lean/Meta/ExprDefEq.c b/stage0/stdlib/Lean/Meta/ExprDefEq.c
index 43485968a5..a7a24fb9ab 100644
--- a/stage0/stdlib/Lean/Meta/ExprDefEq.c
+++ b/stage0/stdlib/Lean/Meta/ExprDefEq.c
@@ -38,6 +38,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_mkLambdaFV
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentArray_anyMAux___at_Lean_Meta_CheckAssignment_checkMVar___spec__19___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Meta_CheckAssignment_checkApp___spec__2(lean_object*, size_t, size_t);
+LEAN_EXPORT lean_object* l_Lean_Meta_consumeInaccessibleAnnotations(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_unstuckMVar___at___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqOnFailure___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_CheckAssignment_initFn____x40_Lean_Meta_ExprDefEq___hyg_3341____closed__1;
 static lean_object* l_Lean_Meta_isDefEqStringLit___closed__3;
@@ -58,6 +59,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isExprDefE
 LEAN_EXPORT lean_object* l_Lean_Meta_CheckAssignment_checkAssignmentAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isSynthetic(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_CheckAssignment_checkMVar___spec__53___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_isMData(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_mkCacheKey(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_CheckAssignment_check___closed__12;
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Meta_CheckAssignment_checkMVar___spec__6(lean_object*, lean_object*, size_t, size_t);
@@ -191,6 +193,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_etaEq___bo
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Meta_CheckAssignment_checkMVar___spec__34(lean_object*, lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignmentFOApprox_loop___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment_process___closed__2;
+lean_object* l_Lean_Expr_mdataExpr_x21(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqArgsFirstPass(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_LocalContext_contains(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___closed__1;
@@ -331,6 +334,7 @@ LEAN_EXPORT lean_object* l_Lean_isProjectionFn___at___private_Lean_Meta_ExprDefE
 static size_t l_Std_PersistentHashMap_containsAux___at___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isCached___spec__2___closed__2;
 lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
 lean_object* l_Lean_Meta_throwIsDefEqStuck___rarg(lean_object*);
+lean_object* l_Lean_inaccessible_x3f(lean_object*);
 static lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_cacheResult___closed__1;
 lean_object* l_ReaderT_instMonadFunctorReaderT___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_CheckAssignment_checkMVar___closed__6;
@@ -495,6 +499,7 @@ static lean_object* l_Lean_Meta_CheckAssignment_checkApp___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_checkpointDefEq___at___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqEta___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqRight(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_CheckAssignment_checkMVar___spec__50(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqMData(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkFreshExprMVarAt(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_unstuckMVar___closed__8;
 lean_object* l_Lean_LocalDecl_type(lean_object*);
@@ -600,7 +605,7 @@ uint8_t l_Lean_Expr_isFVar(lean_object*);
 static lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_mkLambdaFVarsWithLetDeps___closed__5;
 static lean_object* l_Lean_Meta_checkpointDefEq___at___private_Lean_Meta_ExprDefEq_0__Lean_Meta_tryHeuristic___spec__1___closed__3;
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_ExprDefEq___hyg_13219_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_ExprDefEq___hyg_12996_(lean_object*);
 lean_object* lean_expr_update_lambda(lean_object*, uint8_t, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_CheckAssignment_throwCheckAssignmentFailure___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_checkAssignment___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -39308,6 +39313,27 @@ return x_37;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Meta_consumeInaccessibleAnnotations(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_inaccessible_x3f(x_1);
+if (lean_obj_tag(x_2) == 0)
+{
+return x_1;
+}
+else
+{
+lean_object* x_3; 
+lean_dec(x_1);
+x_3 = lean_ctor_get(x_2, 0);
+lean_inc(x_3);
+lean_dec(x_2);
+x_1 = x_3;
+goto _start;
+}
+}
+}
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment_process___spec__1(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
 _start:
 {
@@ -40763,44 +40789,45 @@ return x_25;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_8; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_418; lean_object* x_419; lean_object* x_420; uint8_t x_421; 
-x_21 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__6;
-x_418 = lean_st_ref_get(x_6, x_7);
-x_419 = lean_ctor_get(x_418, 0);
-lean_inc(x_419);
-x_420 = lean_ctor_get(x_419, 3);
+lean_object* x_8; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_419; lean_object* x_420; lean_object* x_421; uint8_t x_422; 
+x_21 = l_Lean_Meta_consumeInaccessibleAnnotations(x_2);
+x_22 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__6;
+x_419 = lean_st_ref_get(x_6, x_7);
+x_420 = lean_ctor_get(x_419, 0);
 lean_inc(x_420);
-lean_dec(x_419);
-x_421 = lean_ctor_get_uint8(x_420, sizeof(void*)*1);
+x_421 = lean_ctor_get(x_420, 3);
+lean_inc(x_421);
 lean_dec(x_420);
-if (x_421 == 0)
+x_422 = lean_ctor_get_uint8(x_421, sizeof(void*)*1);
+lean_dec(x_421);
+if (x_422 == 0)
 {
-lean_object* x_422; uint8_t x_423; 
-x_422 = lean_ctor_get(x_418, 1);
-lean_inc(x_422);
-lean_dec(x_418);
-x_423 = 0;
-x_22 = x_423;
-x_23 = x_422;
-goto block_417;
+lean_object* x_423; uint8_t x_424; 
+x_423 = lean_ctor_get(x_419, 1);
+lean_inc(x_423);
+lean_dec(x_419);
+x_424 = 0;
+x_23 = x_424;
+x_24 = x_423;
+goto block_418;
 }
 else
 {
-lean_object* x_424; lean_object* x_425; lean_object* x_426; lean_object* x_427; uint8_t x_428; 
-x_424 = lean_ctor_get(x_418, 1);
-lean_inc(x_424);
-lean_dec(x_418);
-x_425 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_21, x_3, x_4, x_5, x_6, x_424);
-x_426 = lean_ctor_get(x_425, 0);
-lean_inc(x_426);
-x_427 = lean_ctor_get(x_425, 1);
+lean_object* x_425; lean_object* x_426; lean_object* x_427; lean_object* x_428; uint8_t x_429; 
+x_425 = lean_ctor_get(x_419, 1);
+lean_inc(x_425);
+lean_dec(x_419);
+x_426 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_22, x_3, x_4, x_5, x_6, x_425);
+x_427 = lean_ctor_get(x_426, 0);
 lean_inc(x_427);
-lean_dec(x_425);
-x_428 = lean_unbox(x_426);
+x_428 = lean_ctor_get(x_426, 1);
+lean_inc(x_428);
 lean_dec(x_426);
-x_22 = x_428;
-x_23 = x_427;
-goto block_417;
+x_429 = lean_unbox(x_427);
+lean_dec(x_427);
+x_23 = x_429;
+x_24 = x_428;
+goto block_418;
 }
 block_20:
 {
@@ -40858,796 +40885,796 @@ return x_19;
 }
 }
 }
-block_417:
+block_418:
 {
-if (x_22 == 0)
+if (x_23 == 0)
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_24 = lean_st_ref_get(x_6, x_23);
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-x_26 = lean_ctor_get(x_25, 3);
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_25 = lean_st_ref_get(x_6, x_24);
+x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
-lean_dec(x_25);
-x_27 = lean_ctor_get(x_24, 1);
+x_27 = lean_ctor_get(x_26, 3);
 lean_inc(x_27);
-lean_dec(x_24);
-x_28 = lean_ctor_get_uint8(x_26, sizeof(void*)*1);
 lean_dec(x_26);
-x_29 = lean_st_ref_take(x_6, x_27);
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_30, 3);
+x_28 = lean_ctor_get(x_25, 1);
+lean_inc(x_28);
+lean_dec(x_25);
+x_29 = lean_ctor_get_uint8(x_27, sizeof(void*)*1);
+lean_dec(x_27);
+x_30 = lean_st_ref_take(x_6, x_28);
+x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
-x_32 = lean_ctor_get(x_29, 1);
+x_32 = lean_ctor_get(x_31, 3);
 lean_inc(x_32);
-lean_dec(x_29);
-x_33 = !lean_is_exclusive(x_30);
-if (x_33 == 0)
+x_33 = lean_ctor_get(x_30, 1);
+lean_inc(x_33);
+lean_dec(x_30);
+x_34 = !lean_is_exclusive(x_31);
+if (x_34 == 0)
 {
-lean_object* x_34; uint8_t x_35; 
-x_34 = lean_ctor_get(x_30, 3);
-lean_dec(x_34);
-x_35 = !lean_is_exclusive(x_31);
-if (x_35 == 0)
+lean_object* x_35; uint8_t x_36; 
+x_35 = lean_ctor_get(x_31, 3);
+lean_dec(x_35);
+x_36 = !lean_is_exclusive(x_32);
+if (x_36 == 0)
 {
-uint8_t x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_88; lean_object* x_89; uint8_t x_122; lean_object* x_123; lean_object* x_149; lean_object* x_150; lean_object* x_151; uint8_t x_152; 
-x_36 = 0;
-lean_ctor_set_uint8(x_31, sizeof(void*)*1, x_36);
-x_37 = lean_st_ref_set(x_6, x_30, x_32);
-x_38 = lean_ctor_get(x_37, 1);
-lean_inc(x_38);
-lean_dec(x_37);
-x_149 = lean_st_ref_get(x_6, x_38);
-x_150 = lean_ctor_get(x_149, 0);
-lean_inc(x_150);
-x_151 = lean_ctor_get(x_150, 3);
+uint8_t x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_89; lean_object* x_90; uint8_t x_123; lean_object* x_124; lean_object* x_150; lean_object* x_151; lean_object* x_152; uint8_t x_153; 
+x_37 = 0;
+lean_ctor_set_uint8(x_32, sizeof(void*)*1, x_37);
+x_38 = lean_st_ref_set(x_6, x_31, x_33);
+x_39 = lean_ctor_get(x_38, 1);
+lean_inc(x_39);
+lean_dec(x_38);
+x_150 = lean_st_ref_get(x_6, x_39);
+x_151 = lean_ctor_get(x_150, 0);
 lean_inc(x_151);
-lean_dec(x_150);
-x_152 = lean_ctor_get_uint8(x_151, sizeof(void*)*1);
+x_152 = lean_ctor_get(x_151, 3);
+lean_inc(x_152);
 lean_dec(x_151);
-if (x_152 == 0)
+x_153 = lean_ctor_get_uint8(x_152, sizeof(void*)*1);
+lean_dec(x_152);
+if (x_153 == 0)
 {
-lean_object* x_153; 
-x_153 = lean_ctor_get(x_149, 1);
-lean_inc(x_153);
-lean_dec(x_149);
-x_122 = x_36;
-x_123 = x_153;
-goto block_148;
+lean_object* x_154; 
+x_154 = lean_ctor_get(x_150, 1);
+lean_inc(x_154);
+lean_dec(x_150);
+x_123 = x_37;
+x_124 = x_154;
+goto block_149;
 }
 else
 {
-lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; uint8_t x_158; 
-x_154 = lean_ctor_get(x_149, 1);
-lean_inc(x_154);
-lean_dec(x_149);
-x_155 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_21, x_3, x_4, x_5, x_6, x_154);
-x_156 = lean_ctor_get(x_155, 0);
-lean_inc(x_156);
-x_157 = lean_ctor_get(x_155, 1);
+lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; uint8_t x_159; 
+x_155 = lean_ctor_get(x_150, 1);
+lean_inc(x_155);
+lean_dec(x_150);
+x_156 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_22, x_3, x_4, x_5, x_6, x_155);
+x_157 = lean_ctor_get(x_156, 0);
 lean_inc(x_157);
-lean_dec(x_155);
-x_158 = lean_unbox(x_156);
+x_158 = lean_ctor_get(x_156, 1);
+lean_inc(x_158);
 lean_dec(x_156);
-x_122 = x_158;
-x_123 = x_157;
-goto block_148;
+x_159 = lean_unbox(x_157);
+lean_dec(x_157);
+x_123 = x_159;
+x_124 = x_158;
+goto block_149;
 }
-block_87:
+block_88:
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
-x_41 = lean_st_ref_get(x_6, x_40);
-x_42 = lean_ctor_get(x_41, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_41, 1);
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; uint8_t x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_42 = lean_st_ref_get(x_6, x_41);
+x_43 = lean_ctor_get(x_42, 0);
 lean_inc(x_43);
-lean_dec(x_41);
-x_44 = lean_ctor_get(x_42, 3);
+x_44 = lean_ctor_get(x_42, 1);
 lean_inc(x_44);
 lean_dec(x_42);
-x_45 = lean_ctor_get_uint8(x_44, sizeof(void*)*1);
-lean_dec(x_44);
-x_46 = lean_st_ref_take(x_6, x_43);
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_47, 3);
+x_45 = lean_ctor_get(x_43, 3);
+lean_inc(x_45);
+lean_dec(x_43);
+x_46 = lean_ctor_get_uint8(x_45, sizeof(void*)*1);
+lean_dec(x_45);
+x_47 = lean_st_ref_take(x_6, x_44);
+x_48 = lean_ctor_get(x_47, 0);
 lean_inc(x_48);
-x_49 = lean_ctor_get(x_46, 1);
+x_49 = lean_ctor_get(x_48, 3);
 lean_inc(x_49);
-lean_dec(x_46);
-x_50 = !lean_is_exclusive(x_47);
-if (x_50 == 0)
+x_50 = lean_ctor_get(x_47, 1);
+lean_inc(x_50);
+lean_dec(x_47);
+x_51 = !lean_is_exclusive(x_48);
+if (x_51 == 0)
 {
-lean_object* x_51; uint8_t x_52; 
-x_51 = lean_ctor_get(x_47, 3);
-lean_dec(x_51);
-x_52 = !lean_is_exclusive(x_48);
-if (x_52 == 0)
+lean_object* x_52; uint8_t x_53; 
+x_52 = lean_ctor_get(x_48, 3);
+lean_dec(x_52);
+x_53 = !lean_is_exclusive(x_49);
+if (x_53 == 0)
 {
-lean_object* x_53; uint8_t x_54; 
-lean_ctor_set_uint8(x_48, sizeof(void*)*1, x_28);
-x_53 = lean_st_ref_set(x_6, x_47, x_49);
+lean_object* x_54; uint8_t x_55; 
+lean_ctor_set_uint8(x_49, sizeof(void*)*1, x_29);
+x_54 = lean_st_ref_set(x_6, x_48, x_50);
 lean_dec(x_6);
-x_54 = !lean_is_exclusive(x_53);
-if (x_54 == 0)
+x_55 = !lean_is_exclusive(x_54);
+if (x_55 == 0)
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_55 = lean_ctor_get(x_53, 0);
-lean_dec(x_55);
-x_56 = lean_box(x_39);
-x_57 = lean_box(x_45);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_56);
-lean_ctor_set(x_58, 1, x_57);
-lean_ctor_set(x_53, 0, x_58);
-x_8 = x_53;
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_56 = lean_ctor_get(x_54, 0);
+lean_dec(x_56);
+x_57 = lean_box(x_40);
+x_58 = lean_box(x_46);
+x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+lean_ctor_set(x_54, 0, x_59);
+x_8 = x_54;
 goto block_20;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_59 = lean_ctor_get(x_53, 1);
-lean_inc(x_59);
-lean_dec(x_53);
-x_60 = lean_box(x_39);
-x_61 = lean_box(x_45);
-x_62 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_62, 0, x_60);
-lean_ctor_set(x_62, 1, x_61);
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_60 = lean_ctor_get(x_54, 1);
+lean_inc(x_60);
+lean_dec(x_54);
+x_61 = lean_box(x_40);
+x_62 = lean_box(x_46);
 x_63 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_59);
-x_8 = x_63;
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+x_64 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_60);
+x_8 = x_64;
 goto block_20;
 }
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_64 = lean_ctor_get(x_48, 0);
-lean_inc(x_64);
-lean_dec(x_48);
-x_65 = lean_alloc_ctor(0, 1, 1);
-lean_ctor_set(x_65, 0, x_64);
-lean_ctor_set_uint8(x_65, sizeof(void*)*1, x_28);
-lean_ctor_set(x_47, 3, x_65);
-x_66 = lean_st_ref_set(x_6, x_47, x_49);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_65 = lean_ctor_get(x_49, 0);
+lean_inc(x_65);
+lean_dec(x_49);
+x_66 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_66, 0, x_65);
+lean_ctor_set_uint8(x_66, sizeof(void*)*1, x_29);
+lean_ctor_set(x_48, 3, x_66);
+x_67 = lean_st_ref_set(x_6, x_48, x_50);
 lean_dec(x_6);
-x_67 = lean_ctor_get(x_66, 1);
-lean_inc(x_67);
-if (lean_is_exclusive(x_66)) {
- lean_ctor_release(x_66, 0);
- lean_ctor_release(x_66, 1);
- x_68 = x_66;
+x_68 = lean_ctor_get(x_67, 1);
+lean_inc(x_68);
+if (lean_is_exclusive(x_67)) {
+ lean_ctor_release(x_67, 0);
+ lean_ctor_release(x_67, 1);
+ x_69 = x_67;
 } else {
- lean_dec_ref(x_66);
- x_68 = lean_box(0);
+ lean_dec_ref(x_67);
+ x_69 = lean_box(0);
 }
-x_69 = lean_box(x_39);
-x_70 = lean_box(x_45);
-x_71 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_71, 0, x_69);
-lean_ctor_set(x_71, 1, x_70);
-if (lean_is_scalar(x_68)) {
- x_72 = lean_alloc_ctor(0, 2, 0);
+x_70 = lean_box(x_40);
+x_71 = lean_box(x_46);
+x_72 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+if (lean_is_scalar(x_69)) {
+ x_73 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_72 = x_68;
+ x_73 = x_69;
 }
-lean_ctor_set(x_72, 0, x_71);
-lean_ctor_set(x_72, 1, x_67);
-x_8 = x_72;
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_68);
+x_8 = x_73;
 goto block_20;
 }
 }
 else
 {
-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; 
-x_73 = lean_ctor_get(x_47, 0);
-x_74 = lean_ctor_get(x_47, 1);
-x_75 = lean_ctor_get(x_47, 2);
+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; 
+x_74 = lean_ctor_get(x_48, 0);
+x_75 = lean_ctor_get(x_48, 1);
+x_76 = lean_ctor_get(x_48, 2);
+lean_inc(x_76);
 lean_inc(x_75);
 lean_inc(x_74);
-lean_inc(x_73);
-lean_dec(x_47);
-x_76 = lean_ctor_get(x_48, 0);
-lean_inc(x_76);
-if (lean_is_exclusive(x_48)) {
- lean_ctor_release(x_48, 0);
- x_77 = x_48;
+lean_dec(x_48);
+x_77 = lean_ctor_get(x_49, 0);
+lean_inc(x_77);
+if (lean_is_exclusive(x_49)) {
+ lean_ctor_release(x_49, 0);
+ x_78 = x_49;
 } else {
- lean_dec_ref(x_48);
- x_77 = lean_box(0);
+ lean_dec_ref(x_49);
+ x_78 = lean_box(0);
 }
-if (lean_is_scalar(x_77)) {
- x_78 = lean_alloc_ctor(0, 1, 1);
+if (lean_is_scalar(x_78)) {
+ x_79 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_78 = x_77;
+ x_79 = x_78;
 }
-lean_ctor_set(x_78, 0, x_76);
-lean_ctor_set_uint8(x_78, sizeof(void*)*1, x_28);
-x_79 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_79, 0, x_73);
-lean_ctor_set(x_79, 1, x_74);
-lean_ctor_set(x_79, 2, x_75);
-lean_ctor_set(x_79, 3, x_78);
-x_80 = lean_st_ref_set(x_6, x_79, x_49);
+lean_ctor_set(x_79, 0, x_77);
+lean_ctor_set_uint8(x_79, sizeof(void*)*1, x_29);
+x_80 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_80, 0, x_74);
+lean_ctor_set(x_80, 1, x_75);
+lean_ctor_set(x_80, 2, x_76);
+lean_ctor_set(x_80, 3, x_79);
+x_81 = lean_st_ref_set(x_6, x_80, x_50);
 lean_dec(x_6);
-x_81 = lean_ctor_get(x_80, 1);
-lean_inc(x_81);
-if (lean_is_exclusive(x_80)) {
- lean_ctor_release(x_80, 0);
- lean_ctor_release(x_80, 1);
- x_82 = x_80;
+x_82 = lean_ctor_get(x_81, 1);
+lean_inc(x_82);
+if (lean_is_exclusive(x_81)) {
+ lean_ctor_release(x_81, 0);
+ lean_ctor_release(x_81, 1);
+ x_83 = x_81;
 } else {
- lean_dec_ref(x_80);
- x_82 = lean_box(0);
+ lean_dec_ref(x_81);
+ x_83 = lean_box(0);
 }
-x_83 = lean_box(x_39);
-x_84 = lean_box(x_45);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_83);
-lean_ctor_set(x_85, 1, x_84);
-if (lean_is_scalar(x_82)) {
- x_86 = lean_alloc_ctor(0, 2, 0);
+x_84 = lean_box(x_40);
+x_85 = lean_box(x_46);
+x_86 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_86, 0, x_84);
+lean_ctor_set(x_86, 1, x_85);
+if (lean_is_scalar(x_83)) {
+ x_87 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_86 = x_82;
+ x_87 = x_83;
 }
-lean_ctor_set(x_86, 0, x_85);
-lean_ctor_set(x_86, 1, x_81);
-x_8 = x_86;
+lean_ctor_set(x_87, 0, x_86);
+lean_ctor_set(x_87, 1, x_82);
+x_8 = x_87;
 goto block_20;
 }
 }
-block_121:
+block_122:
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; uint8_t x_96; 
-x_90 = lean_st_ref_get(x_6, x_89);
-x_91 = lean_ctor_get(x_90, 1);
-lean_inc(x_91);
-lean_dec(x_90);
-x_92 = lean_st_ref_take(x_6, x_91);
-x_93 = lean_ctor_get(x_92, 0);
-lean_inc(x_93);
-x_94 = lean_ctor_get(x_93, 3);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; uint8_t x_97; 
+x_91 = lean_st_ref_get(x_6, x_90);
+x_92 = lean_ctor_get(x_91, 1);
+lean_inc(x_92);
+lean_dec(x_91);
+x_93 = lean_st_ref_take(x_6, x_92);
+x_94 = lean_ctor_get(x_93, 0);
 lean_inc(x_94);
-x_95 = lean_ctor_get(x_92, 1);
+x_95 = lean_ctor_get(x_94, 3);
 lean_inc(x_95);
-lean_dec(x_92);
-x_96 = !lean_is_exclusive(x_93);
-if (x_96 == 0)
+x_96 = lean_ctor_get(x_93, 1);
+lean_inc(x_96);
+lean_dec(x_93);
+x_97 = !lean_is_exclusive(x_94);
+if (x_97 == 0)
 {
-lean_object* x_97; uint8_t x_98; 
-x_97 = lean_ctor_get(x_93, 3);
-lean_dec(x_97);
-x_98 = !lean_is_exclusive(x_94);
-if (x_98 == 0)
+lean_object* x_98; uint8_t x_99; 
+x_98 = lean_ctor_get(x_94, 3);
+lean_dec(x_98);
+x_99 = !lean_is_exclusive(x_95);
+if (x_99 == 0)
 {
-lean_object* x_99; uint8_t x_100; 
-lean_ctor_set_uint8(x_94, sizeof(void*)*1, x_28);
-x_99 = lean_st_ref_set(x_6, x_93, x_95);
+lean_object* x_100; uint8_t x_101; 
+lean_ctor_set_uint8(x_95, sizeof(void*)*1, x_29);
+x_100 = lean_st_ref_set(x_6, x_94, x_96);
 lean_dec(x_6);
-x_100 = !lean_is_exclusive(x_99);
-if (x_100 == 0)
+x_101 = !lean_is_exclusive(x_100);
+if (x_101 == 0)
 {
-lean_object* x_101; 
-x_101 = lean_ctor_get(x_99, 0);
-lean_dec(x_101);
-lean_ctor_set_tag(x_99, 1);
-lean_ctor_set(x_99, 0, x_88);
-x_8 = x_99;
+lean_object* x_102; 
+x_102 = lean_ctor_get(x_100, 0);
+lean_dec(x_102);
+lean_ctor_set_tag(x_100, 1);
+lean_ctor_set(x_100, 0, x_89);
+x_8 = x_100;
 goto block_20;
 }
 else
 {
-lean_object* x_102; lean_object* x_103; 
-x_102 = lean_ctor_get(x_99, 1);
-lean_inc(x_102);
-lean_dec(x_99);
-x_103 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_103, 0, x_88);
-lean_ctor_set(x_103, 1, x_102);
-x_8 = x_103;
+lean_object* x_103; lean_object* x_104; 
+x_103 = lean_ctor_get(x_100, 1);
+lean_inc(x_103);
+lean_dec(x_100);
+x_104 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_104, 0, x_89);
+lean_ctor_set(x_104, 1, x_103);
+x_8 = x_104;
 goto block_20;
 }
 }
 else
 {
-lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_104 = lean_ctor_get(x_94, 0);
-lean_inc(x_104);
-lean_dec(x_94);
-x_105 = lean_alloc_ctor(0, 1, 1);
-lean_ctor_set(x_105, 0, x_104);
-lean_ctor_set_uint8(x_105, sizeof(void*)*1, x_28);
-lean_ctor_set(x_93, 3, x_105);
-x_106 = lean_st_ref_set(x_6, x_93, x_95);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_105 = lean_ctor_get(x_95, 0);
+lean_inc(x_105);
+lean_dec(x_95);
+x_106 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_106, 0, x_105);
+lean_ctor_set_uint8(x_106, sizeof(void*)*1, x_29);
+lean_ctor_set(x_94, 3, x_106);
+x_107 = lean_st_ref_set(x_6, x_94, x_96);
 lean_dec(x_6);
-x_107 = lean_ctor_get(x_106, 1);
-lean_inc(x_107);
-if (lean_is_exclusive(x_106)) {
- lean_ctor_release(x_106, 0);
- lean_ctor_release(x_106, 1);
- x_108 = x_106;
+x_108 = lean_ctor_get(x_107, 1);
+lean_inc(x_108);
+if (lean_is_exclusive(x_107)) {
+ lean_ctor_release(x_107, 0);
+ lean_ctor_release(x_107, 1);
+ x_109 = x_107;
 } else {
- lean_dec_ref(x_106);
- x_108 = lean_box(0);
+ lean_dec_ref(x_107);
+ x_109 = lean_box(0);
 }
-if (lean_is_scalar(x_108)) {
- x_109 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_109)) {
+ x_110 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_109 = x_108;
- lean_ctor_set_tag(x_109, 1);
+ x_110 = x_109;
+ lean_ctor_set_tag(x_110, 1);
 }
-lean_ctor_set(x_109, 0, x_88);
-lean_ctor_set(x_109, 1, x_107);
-x_8 = x_109;
+lean_ctor_set(x_110, 0, x_89);
+lean_ctor_set(x_110, 1, x_108);
+x_8 = x_110;
 goto block_20;
 }
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
-x_110 = lean_ctor_get(x_93, 0);
-x_111 = lean_ctor_get(x_93, 1);
-x_112 = lean_ctor_get(x_93, 2);
+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; 
+x_111 = lean_ctor_get(x_94, 0);
+x_112 = lean_ctor_get(x_94, 1);
+x_113 = lean_ctor_get(x_94, 2);
+lean_inc(x_113);
 lean_inc(x_112);
 lean_inc(x_111);
-lean_inc(x_110);
-lean_dec(x_93);
-x_113 = lean_ctor_get(x_94, 0);
-lean_inc(x_113);
-if (lean_is_exclusive(x_94)) {
- lean_ctor_release(x_94, 0);
- x_114 = x_94;
+lean_dec(x_94);
+x_114 = lean_ctor_get(x_95, 0);
+lean_inc(x_114);
+if (lean_is_exclusive(x_95)) {
+ lean_ctor_release(x_95, 0);
+ x_115 = x_95;
 } else {
- lean_dec_ref(x_94);
- x_114 = lean_box(0);
+ lean_dec_ref(x_95);
+ x_115 = lean_box(0);
 }
-if (lean_is_scalar(x_114)) {
- x_115 = lean_alloc_ctor(0, 1, 1);
+if (lean_is_scalar(x_115)) {
+ x_116 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_115 = x_114;
+ x_116 = x_115;
 }
-lean_ctor_set(x_115, 0, x_113);
-lean_ctor_set_uint8(x_115, sizeof(void*)*1, x_28);
-x_116 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_116, 0, x_110);
-lean_ctor_set(x_116, 1, x_111);
-lean_ctor_set(x_116, 2, x_112);
-lean_ctor_set(x_116, 3, x_115);
-x_117 = lean_st_ref_set(x_6, x_116, x_95);
+lean_ctor_set(x_116, 0, x_114);
+lean_ctor_set_uint8(x_116, sizeof(void*)*1, x_29);
+x_117 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_117, 0, x_111);
+lean_ctor_set(x_117, 1, x_112);
+lean_ctor_set(x_117, 2, x_113);
+lean_ctor_set(x_117, 3, x_116);
+x_118 = lean_st_ref_set(x_6, x_117, x_96);
 lean_dec(x_6);
-x_118 = lean_ctor_get(x_117, 1);
-lean_inc(x_118);
-if (lean_is_exclusive(x_117)) {
- lean_ctor_release(x_117, 0);
- lean_ctor_release(x_117, 1);
- x_119 = x_117;
+x_119 = lean_ctor_get(x_118, 1);
+lean_inc(x_119);
+if (lean_is_exclusive(x_118)) {
+ lean_ctor_release(x_118, 0);
+ lean_ctor_release(x_118, 1);
+ x_120 = x_118;
 } else {
- lean_dec_ref(x_117);
- x_119 = lean_box(0);
+ lean_dec_ref(x_118);
+ x_120 = lean_box(0);
 }
-if (lean_is_scalar(x_119)) {
- x_120 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_120)) {
+ x_121 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_120 = x_119;
- lean_ctor_set_tag(x_120, 1);
+ x_121 = x_120;
+ lean_ctor_set_tag(x_121, 1);
 }
-lean_ctor_set(x_120, 0, x_88);
-lean_ctor_set(x_120, 1, x_118);
-x_8 = x_120;
+lean_ctor_set(x_121, 0, x_89);
+lean_ctor_set(x_121, 1, x_119);
+x_8 = x_121;
 goto block_20;
 }
 }
-block_148:
+block_149:
 {
-if (x_122 == 0)
+if (x_123 == 0)
 {
-lean_object* x_124; lean_object* x_125; 
-x_124 = lean_box(0);
+lean_object* x_125; lean_object* x_126; 
+x_125 = lean_box(0);
 lean_inc(x_6);
-x_125 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_124, x_3, x_4, x_5, x_6, x_123);
-if (lean_obj_tag(x_125) == 0)
+x_126 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_125, x_3, x_4, x_5, x_6, x_124);
+if (lean_obj_tag(x_126) == 0)
 {
-lean_object* x_126; lean_object* x_127; uint8_t x_128; 
-x_126 = lean_ctor_get(x_125, 0);
-lean_inc(x_126);
-x_127 = lean_ctor_get(x_125, 1);
+lean_object* x_127; lean_object* x_128; uint8_t x_129; 
+x_127 = lean_ctor_get(x_126, 0);
 lean_inc(x_127);
-lean_dec(x_125);
-x_128 = lean_unbox(x_126);
+x_128 = lean_ctor_get(x_126, 1);
+lean_inc(x_128);
 lean_dec(x_126);
-x_39 = x_128;
-x_40 = x_127;
-goto block_87;
+x_129 = lean_unbox(x_127);
+lean_dec(x_127);
+x_40 = x_129;
+x_41 = x_128;
+goto block_88;
 }
 else
 {
-lean_object* x_129; lean_object* x_130; 
-x_129 = lean_ctor_get(x_125, 0);
-lean_inc(x_129);
-x_130 = lean_ctor_get(x_125, 1);
+lean_object* x_130; lean_object* x_131; 
+x_130 = lean_ctor_get(x_126, 0);
 lean_inc(x_130);
-lean_dec(x_125);
-x_88 = x_129;
+x_131 = lean_ctor_get(x_126, 1);
+lean_inc(x_131);
+lean_dec(x_126);
 x_89 = x_130;
-goto block_121;
+x_90 = x_131;
+goto block_122;
 }
 }
 else
 {
-lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+lean_object* x_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_inc(x_1);
-x_131 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_131, 0, x_1);
-x_132 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
-x_133 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_133, 0, x_132);
-lean_ctor_set(x_133, 1, x_131);
-x_134 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
-x_135 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_135, 0, x_133);
-lean_ctor_set(x_135, 1, x_134);
-lean_inc(x_2);
-x_136 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_136, 0, x_2);
-x_137 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_137, 0, x_135);
-lean_ctor_set(x_137, 1, x_136);
+x_132 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_132, 0, x_1);
+x_133 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
+x_134 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_134, 0, x_133);
+lean_ctor_set(x_134, 1, x_132);
+x_135 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
+x_136 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_136, 0, x_134);
+lean_ctor_set(x_136, 1, x_135);
+lean_inc(x_21);
+x_137 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_137, 0, x_21);
 x_138 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_138, 0, x_137);
-lean_ctor_set(x_138, 1, x_132);
-x_139 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_21, x_138, x_3, x_4, x_5, x_6, x_123);
-x_140 = lean_ctor_get(x_139, 0);
-lean_inc(x_140);
-x_141 = lean_ctor_get(x_139, 1);
+lean_ctor_set(x_138, 0, x_136);
+lean_ctor_set(x_138, 1, x_137);
+x_139 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_139, 0, x_138);
+lean_ctor_set(x_139, 1, x_133);
+x_140 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_22, x_139, x_3, x_4, x_5, x_6, x_124);
+x_141 = lean_ctor_get(x_140, 0);
 lean_inc(x_141);
-lean_dec(x_139);
-lean_inc(x_6);
-x_142 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_140, x_3, x_4, x_5, x_6, x_141);
+x_142 = lean_ctor_get(x_140, 1);
+lean_inc(x_142);
 lean_dec(x_140);
-if (lean_obj_tag(x_142) == 0)
+lean_inc(x_6);
+x_143 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_141, x_3, x_4, x_5, x_6, x_142);
+lean_dec(x_141);
+if (lean_obj_tag(x_143) == 0)
 {
-lean_object* x_143; lean_object* x_144; uint8_t x_145; 
-x_143 = lean_ctor_get(x_142, 0);
-lean_inc(x_143);
-x_144 = lean_ctor_get(x_142, 1);
+lean_object* x_144; lean_object* x_145; uint8_t x_146; 
+x_144 = lean_ctor_get(x_143, 0);
 lean_inc(x_144);
-lean_dec(x_142);
-x_145 = lean_unbox(x_143);
+x_145 = lean_ctor_get(x_143, 1);
+lean_inc(x_145);
 lean_dec(x_143);
-x_39 = x_145;
-x_40 = x_144;
-goto block_87;
+x_146 = lean_unbox(x_144);
+lean_dec(x_144);
+x_40 = x_146;
+x_41 = x_145;
+goto block_88;
 }
 else
 {
-lean_object* x_146; lean_object* x_147; 
-x_146 = lean_ctor_get(x_142, 0);
-lean_inc(x_146);
-x_147 = lean_ctor_get(x_142, 1);
+lean_object* x_147; lean_object* x_148; 
+x_147 = lean_ctor_get(x_143, 0);
 lean_inc(x_147);
-lean_dec(x_142);
-x_88 = x_146;
+x_148 = lean_ctor_get(x_143, 1);
+lean_inc(x_148);
+lean_dec(x_143);
 x_89 = x_147;
-goto block_121;
+x_90 = x_148;
+goto block_122;
 }
 }
 }
 }
 else
 {
-lean_object* x_159; uint8_t x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; uint8_t x_164; lean_object* x_165; lean_object* x_191; lean_object* x_192; uint8_t x_212; lean_object* x_213; lean_object* x_239; lean_object* x_240; lean_object* x_241; uint8_t x_242; 
-x_159 = lean_ctor_get(x_31, 0);
-lean_inc(x_159);
-lean_dec(x_31);
-x_160 = 0;
-x_161 = lean_alloc_ctor(0, 1, 1);
-lean_ctor_set(x_161, 0, x_159);
-lean_ctor_set_uint8(x_161, sizeof(void*)*1, x_160);
-lean_ctor_set(x_30, 3, x_161);
-x_162 = lean_st_ref_set(x_6, x_30, x_32);
-x_163 = lean_ctor_get(x_162, 1);
-lean_inc(x_163);
-lean_dec(x_162);
-x_239 = lean_st_ref_get(x_6, x_163);
-x_240 = lean_ctor_get(x_239, 0);
-lean_inc(x_240);
-x_241 = lean_ctor_get(x_240, 3);
+lean_object* x_160; uint8_t x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; uint8_t x_165; lean_object* x_166; lean_object* x_192; lean_object* x_193; uint8_t x_213; lean_object* x_214; lean_object* x_240; lean_object* x_241; lean_object* x_242; uint8_t x_243; 
+x_160 = lean_ctor_get(x_32, 0);
+lean_inc(x_160);
+lean_dec(x_32);
+x_161 = 0;
+x_162 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_162, 0, x_160);
+lean_ctor_set_uint8(x_162, sizeof(void*)*1, x_161);
+lean_ctor_set(x_31, 3, x_162);
+x_163 = lean_st_ref_set(x_6, x_31, x_33);
+x_164 = lean_ctor_get(x_163, 1);
+lean_inc(x_164);
+lean_dec(x_163);
+x_240 = lean_st_ref_get(x_6, x_164);
+x_241 = lean_ctor_get(x_240, 0);
 lean_inc(x_241);
-lean_dec(x_240);
-x_242 = lean_ctor_get_uint8(x_241, sizeof(void*)*1);
+x_242 = lean_ctor_get(x_241, 3);
+lean_inc(x_242);
 lean_dec(x_241);
-if (x_242 == 0)
+x_243 = lean_ctor_get_uint8(x_242, sizeof(void*)*1);
+lean_dec(x_242);
+if (x_243 == 0)
 {
-lean_object* x_243; 
-x_243 = lean_ctor_get(x_239, 1);
-lean_inc(x_243);
-lean_dec(x_239);
-x_212 = x_160;
-x_213 = x_243;
-goto block_238;
+lean_object* x_244; 
+x_244 = lean_ctor_get(x_240, 1);
+lean_inc(x_244);
+lean_dec(x_240);
+x_213 = x_161;
+x_214 = x_244;
+goto block_239;
 }
 else
 {
-lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; uint8_t x_248; 
-x_244 = lean_ctor_get(x_239, 1);
-lean_inc(x_244);
-lean_dec(x_239);
-x_245 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_21, x_3, x_4, x_5, x_6, x_244);
-x_246 = lean_ctor_get(x_245, 0);
-lean_inc(x_246);
-x_247 = lean_ctor_get(x_245, 1);
+lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; uint8_t x_249; 
+x_245 = lean_ctor_get(x_240, 1);
+lean_inc(x_245);
+lean_dec(x_240);
+x_246 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_22, x_3, x_4, x_5, x_6, x_245);
+x_247 = lean_ctor_get(x_246, 0);
 lean_inc(x_247);
-lean_dec(x_245);
-x_248 = lean_unbox(x_246);
+x_248 = lean_ctor_get(x_246, 1);
+lean_inc(x_248);
 lean_dec(x_246);
-x_212 = x_248;
-x_213 = x_247;
-goto block_238;
+x_249 = lean_unbox(x_247);
+lean_dec(x_247);
+x_213 = x_249;
+x_214 = x_248;
+goto block_239;
 }
-block_190:
+block_191:
 {
-lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; uint8_t 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; 
-x_166 = lean_st_ref_get(x_6, x_165);
-x_167 = lean_ctor_get(x_166, 0);
-lean_inc(x_167);
-x_168 = lean_ctor_get(x_166, 1);
+lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; uint8_t x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_167 = lean_st_ref_get(x_6, x_166);
+x_168 = lean_ctor_get(x_167, 0);
 lean_inc(x_168);
-lean_dec(x_166);
-x_169 = lean_ctor_get(x_167, 3);
+x_169 = lean_ctor_get(x_167, 1);
 lean_inc(x_169);
 lean_dec(x_167);
-x_170 = lean_ctor_get_uint8(x_169, sizeof(void*)*1);
-lean_dec(x_169);
-x_171 = lean_st_ref_take(x_6, x_168);
-x_172 = lean_ctor_get(x_171, 0);
-lean_inc(x_172);
-x_173 = lean_ctor_get(x_172, 3);
+x_170 = lean_ctor_get(x_168, 3);
+lean_inc(x_170);
+lean_dec(x_168);
+x_171 = lean_ctor_get_uint8(x_170, sizeof(void*)*1);
+lean_dec(x_170);
+x_172 = lean_st_ref_take(x_6, x_169);
+x_173 = lean_ctor_get(x_172, 0);
 lean_inc(x_173);
-x_174 = lean_ctor_get(x_171, 1);
+x_174 = lean_ctor_get(x_173, 3);
 lean_inc(x_174);
-lean_dec(x_171);
-x_175 = lean_ctor_get(x_172, 0);
+x_175 = lean_ctor_get(x_172, 1);
 lean_inc(x_175);
-x_176 = lean_ctor_get(x_172, 1);
+lean_dec(x_172);
+x_176 = lean_ctor_get(x_173, 0);
 lean_inc(x_176);
-x_177 = lean_ctor_get(x_172, 2);
+x_177 = lean_ctor_get(x_173, 1);
 lean_inc(x_177);
-if (lean_is_exclusive(x_172)) {
- lean_ctor_release(x_172, 0);
- lean_ctor_release(x_172, 1);
- lean_ctor_release(x_172, 2);
- lean_ctor_release(x_172, 3);
- x_178 = x_172;
-} else {
- lean_dec_ref(x_172);
- x_178 = lean_box(0);
-}
-x_179 = lean_ctor_get(x_173, 0);
-lean_inc(x_179);
+x_178 = lean_ctor_get(x_173, 2);
+lean_inc(x_178);
 if (lean_is_exclusive(x_173)) {
  lean_ctor_release(x_173, 0);
- x_180 = x_173;
+ lean_ctor_release(x_173, 1);
+ lean_ctor_release(x_173, 2);
+ lean_ctor_release(x_173, 3);
+ x_179 = x_173;
 } else {
  lean_dec_ref(x_173);
- x_180 = lean_box(0);
+ x_179 = lean_box(0);
 }
-if (lean_is_scalar(x_180)) {
- x_181 = lean_alloc_ctor(0, 1, 1);
+x_180 = lean_ctor_get(x_174, 0);
+lean_inc(x_180);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ x_181 = x_174;
 } else {
- x_181 = x_180;
+ lean_dec_ref(x_174);
+ x_181 = lean_box(0);
 }
-lean_ctor_set(x_181, 0, x_179);
-lean_ctor_set_uint8(x_181, sizeof(void*)*1, x_28);
-if (lean_is_scalar(x_178)) {
- x_182 = lean_alloc_ctor(0, 4, 0);
+if (lean_is_scalar(x_181)) {
+ x_182 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_182 = x_178;
+ x_182 = x_181;
 }
-lean_ctor_set(x_182, 0, x_175);
-lean_ctor_set(x_182, 1, x_176);
-lean_ctor_set(x_182, 2, x_177);
-lean_ctor_set(x_182, 3, x_181);
-x_183 = lean_st_ref_set(x_6, x_182, x_174);
+lean_ctor_set(x_182, 0, x_180);
+lean_ctor_set_uint8(x_182, sizeof(void*)*1, x_29);
+if (lean_is_scalar(x_179)) {
+ x_183 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_183 = x_179;
+}
+lean_ctor_set(x_183, 0, x_176);
+lean_ctor_set(x_183, 1, x_177);
+lean_ctor_set(x_183, 2, x_178);
+lean_ctor_set(x_183, 3, x_182);
+x_184 = lean_st_ref_set(x_6, x_183, x_175);
 lean_dec(x_6);
-x_184 = lean_ctor_get(x_183, 1);
-lean_inc(x_184);
-if (lean_is_exclusive(x_183)) {
- lean_ctor_release(x_183, 0);
- lean_ctor_release(x_183, 1);
- x_185 = x_183;
+x_185 = lean_ctor_get(x_184, 1);
+lean_inc(x_185);
+if (lean_is_exclusive(x_184)) {
+ lean_ctor_release(x_184, 0);
+ lean_ctor_release(x_184, 1);
+ x_186 = x_184;
 } else {
- lean_dec_ref(x_183);
- x_185 = lean_box(0);
+ lean_dec_ref(x_184);
+ x_186 = lean_box(0);
 }
-x_186 = lean_box(x_164);
-x_187 = lean_box(x_170);
-x_188 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_188, 0, x_186);
-lean_ctor_set(x_188, 1, x_187);
-if (lean_is_scalar(x_185)) {
- x_189 = lean_alloc_ctor(0, 2, 0);
+x_187 = lean_box(x_165);
+x_188 = lean_box(x_171);
+x_189 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_189, 0, x_187);
+lean_ctor_set(x_189, 1, x_188);
+if (lean_is_scalar(x_186)) {
+ x_190 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_189 = x_185;
+ x_190 = x_186;
 }
-lean_ctor_set(x_189, 0, x_188);
-lean_ctor_set(x_189, 1, x_184);
-x_8 = x_189;
+lean_ctor_set(x_190, 0, x_189);
+lean_ctor_set(x_190, 1, x_185);
+x_8 = x_190;
 goto block_20;
 }
-block_211:
+block_212:
 {
-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; 
-x_193 = lean_st_ref_get(x_6, x_192);
-x_194 = lean_ctor_get(x_193, 1);
-lean_inc(x_194);
-lean_dec(x_193);
-x_195 = lean_st_ref_take(x_6, x_194);
-x_196 = lean_ctor_get(x_195, 0);
-lean_inc(x_196);
-x_197 = lean_ctor_get(x_196, 3);
+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; 
+x_194 = lean_st_ref_get(x_6, x_193);
+x_195 = lean_ctor_get(x_194, 1);
+lean_inc(x_195);
+lean_dec(x_194);
+x_196 = lean_st_ref_take(x_6, x_195);
+x_197 = lean_ctor_get(x_196, 0);
 lean_inc(x_197);
-x_198 = lean_ctor_get(x_195, 1);
+x_198 = lean_ctor_get(x_197, 3);
 lean_inc(x_198);
-lean_dec(x_195);
-x_199 = lean_ctor_get(x_196, 0);
+x_199 = lean_ctor_get(x_196, 1);
 lean_inc(x_199);
-x_200 = lean_ctor_get(x_196, 1);
+lean_dec(x_196);
+x_200 = lean_ctor_get(x_197, 0);
 lean_inc(x_200);
-x_201 = lean_ctor_get(x_196, 2);
+x_201 = lean_ctor_get(x_197, 1);
 lean_inc(x_201);
-if (lean_is_exclusive(x_196)) {
- lean_ctor_release(x_196, 0);
- lean_ctor_release(x_196, 1);
- lean_ctor_release(x_196, 2);
- lean_ctor_release(x_196, 3);
- x_202 = x_196;
-} else {
- lean_dec_ref(x_196);
- x_202 = lean_box(0);
-}
-x_203 = lean_ctor_get(x_197, 0);
-lean_inc(x_203);
+x_202 = lean_ctor_get(x_197, 2);
+lean_inc(x_202);
 if (lean_is_exclusive(x_197)) {
  lean_ctor_release(x_197, 0);
- x_204 = x_197;
+ lean_ctor_release(x_197, 1);
+ lean_ctor_release(x_197, 2);
+ lean_ctor_release(x_197, 3);
+ x_203 = x_197;
 } else {
  lean_dec_ref(x_197);
- x_204 = lean_box(0);
+ x_203 = lean_box(0);
 }
-if (lean_is_scalar(x_204)) {
- x_205 = lean_alloc_ctor(0, 1, 1);
+x_204 = lean_ctor_get(x_198, 0);
+lean_inc(x_204);
+if (lean_is_exclusive(x_198)) {
+ lean_ctor_release(x_198, 0);
+ x_205 = x_198;
 } else {
- x_205 = x_204;
+ lean_dec_ref(x_198);
+ x_205 = lean_box(0);
 }
-lean_ctor_set(x_205, 0, x_203);
-lean_ctor_set_uint8(x_205, sizeof(void*)*1, x_28);
-if (lean_is_scalar(x_202)) {
- x_206 = lean_alloc_ctor(0, 4, 0);
+if (lean_is_scalar(x_205)) {
+ x_206 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_206 = x_202;
+ x_206 = x_205;
 }
-lean_ctor_set(x_206, 0, x_199);
-lean_ctor_set(x_206, 1, x_200);
-lean_ctor_set(x_206, 2, x_201);
-lean_ctor_set(x_206, 3, x_205);
-x_207 = lean_st_ref_set(x_6, x_206, x_198);
+lean_ctor_set(x_206, 0, x_204);
+lean_ctor_set_uint8(x_206, sizeof(void*)*1, x_29);
+if (lean_is_scalar(x_203)) {
+ x_207 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_207 = x_203;
+}
+lean_ctor_set(x_207, 0, x_200);
+lean_ctor_set(x_207, 1, x_201);
+lean_ctor_set(x_207, 2, x_202);
+lean_ctor_set(x_207, 3, x_206);
+x_208 = lean_st_ref_set(x_6, x_207, x_199);
 lean_dec(x_6);
-x_208 = lean_ctor_get(x_207, 1);
-lean_inc(x_208);
-if (lean_is_exclusive(x_207)) {
- lean_ctor_release(x_207, 0);
- lean_ctor_release(x_207, 1);
- x_209 = x_207;
+x_209 = lean_ctor_get(x_208, 1);
+lean_inc(x_209);
+if (lean_is_exclusive(x_208)) {
+ lean_ctor_release(x_208, 0);
+ lean_ctor_release(x_208, 1);
+ x_210 = x_208;
 } else {
- lean_dec_ref(x_207);
- x_209 = lean_box(0);
+ lean_dec_ref(x_208);
+ x_210 = lean_box(0);
 }
-if (lean_is_scalar(x_209)) {
- x_210 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_210)) {
+ x_211 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_210 = x_209;
- lean_ctor_set_tag(x_210, 1);
+ x_211 = x_210;
+ lean_ctor_set_tag(x_211, 1);
 }
-lean_ctor_set(x_210, 0, x_191);
-lean_ctor_set(x_210, 1, x_208);
-x_8 = x_210;
+lean_ctor_set(x_211, 0, x_192);
+lean_ctor_set(x_211, 1, x_209);
+x_8 = x_211;
 goto block_20;
 }
-block_238:
+block_239:
 {
-if (x_212 == 0)
+if (x_213 == 0)
 {
-lean_object* x_214; lean_object* x_215; 
-x_214 = lean_box(0);
+lean_object* x_215; lean_object* x_216; 
+x_215 = lean_box(0);
 lean_inc(x_6);
-x_215 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_214, x_3, x_4, x_5, x_6, x_213);
-if (lean_obj_tag(x_215) == 0)
+x_216 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_215, x_3, x_4, x_5, x_6, x_214);
+if (lean_obj_tag(x_216) == 0)
 {
-lean_object* x_216; lean_object* x_217; uint8_t x_218; 
-x_216 = lean_ctor_get(x_215, 0);
-lean_inc(x_216);
-x_217 = lean_ctor_get(x_215, 1);
+lean_object* x_217; lean_object* x_218; uint8_t x_219; 
+x_217 = lean_ctor_get(x_216, 0);
 lean_inc(x_217);
-lean_dec(x_215);
-x_218 = lean_unbox(x_216);
+x_218 = lean_ctor_get(x_216, 1);
+lean_inc(x_218);
 lean_dec(x_216);
-x_164 = x_218;
-x_165 = x_217;
-goto block_190;
+x_219 = lean_unbox(x_217);
+lean_dec(x_217);
+x_165 = x_219;
+x_166 = x_218;
+goto block_191;
 }
 else
 {
-lean_object* x_219; lean_object* x_220; 
-x_219 = lean_ctor_get(x_215, 0);
-lean_inc(x_219);
-x_220 = lean_ctor_get(x_215, 1);
+lean_object* x_220; lean_object* x_221; 
+x_220 = lean_ctor_get(x_216, 0);
 lean_inc(x_220);
-lean_dec(x_215);
-x_191 = x_219;
+x_221 = lean_ctor_get(x_216, 1);
+lean_inc(x_221);
+lean_dec(x_216);
 x_192 = x_220;
-goto block_211;
+x_193 = x_221;
+goto block_212;
 }
 }
 else
 {
-lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; 
+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_inc(x_1);
-x_221 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_221, 0, x_1);
-x_222 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
-x_223 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_223, 0, x_222);
-lean_ctor_set(x_223, 1, x_221);
-x_224 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
-x_225 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_225, 0, x_223);
-lean_ctor_set(x_225, 1, x_224);
-lean_inc(x_2);
-x_226 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_226, 0, x_2);
-x_227 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_227, 0, x_225);
-lean_ctor_set(x_227, 1, x_226);
+x_222 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_222, 0, x_1);
+x_223 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
+x_224 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_224, 0, x_223);
+lean_ctor_set(x_224, 1, x_222);
+x_225 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
+x_226 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_226, 0, x_224);
+lean_ctor_set(x_226, 1, x_225);
+lean_inc(x_21);
+x_227 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_227, 0, x_21);
 x_228 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_228, 0, x_227);
-lean_ctor_set(x_228, 1, x_222);
-x_229 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_21, x_228, x_3, x_4, x_5, x_6, x_213);
-x_230 = lean_ctor_get(x_229, 0);
-lean_inc(x_230);
-x_231 = lean_ctor_get(x_229, 1);
+lean_ctor_set(x_228, 0, x_226);
+lean_ctor_set(x_228, 1, x_227);
+x_229 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_229, 0, x_228);
+lean_ctor_set(x_229, 1, x_223);
+x_230 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_22, x_229, x_3, x_4, x_5, x_6, x_214);
+x_231 = lean_ctor_get(x_230, 0);
 lean_inc(x_231);
-lean_dec(x_229);
-lean_inc(x_6);
-x_232 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_230, x_3, x_4, x_5, x_6, x_231);
+x_232 = lean_ctor_get(x_230, 1);
+lean_inc(x_232);
 lean_dec(x_230);
-if (lean_obj_tag(x_232) == 0)
+lean_inc(x_6);
+x_233 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_231, x_3, x_4, x_5, x_6, x_232);
+lean_dec(x_231);
+if (lean_obj_tag(x_233) == 0)
 {
-lean_object* x_233; lean_object* x_234; uint8_t x_235; 
-x_233 = lean_ctor_get(x_232, 0);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_232, 1);
+lean_object* x_234; lean_object* x_235; uint8_t x_236; 
+x_234 = lean_ctor_get(x_233, 0);
 lean_inc(x_234);
-lean_dec(x_232);
-x_235 = lean_unbox(x_233);
+x_235 = lean_ctor_get(x_233, 1);
+lean_inc(x_235);
 lean_dec(x_233);
-x_164 = x_235;
-x_165 = x_234;
-goto block_190;
+x_236 = lean_unbox(x_234);
+lean_dec(x_234);
+x_165 = x_236;
+x_166 = x_235;
+goto block_191;
 }
 else
 {
-lean_object* x_236; lean_object* x_237; 
-x_236 = lean_ctor_get(x_232, 0);
-lean_inc(x_236);
-x_237 = lean_ctor_get(x_232, 1);
+lean_object* x_237; lean_object* x_238; 
+x_237 = lean_ctor_get(x_233, 0);
 lean_inc(x_237);
-lean_dec(x_232);
-x_191 = x_236;
+x_238 = lean_ctor_get(x_233, 1);
+lean_inc(x_238);
+lean_dec(x_233);
 x_192 = x_237;
-goto block_211;
+x_193 = x_238;
+goto block_212;
 }
 }
 }
@@ -41655,337 +41682,337 @@ goto block_211;
 }
 else
 {
-lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; uint8_t x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; uint8_t x_259; lean_object* x_260; lean_object* x_286; lean_object* x_287; uint8_t x_307; lean_object* x_308; lean_object* x_334; lean_object* x_335; lean_object* x_336; uint8_t x_337; 
-x_249 = lean_ctor_get(x_30, 0);
-x_250 = lean_ctor_get(x_30, 1);
-x_251 = lean_ctor_get(x_30, 2);
+lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; uint8_t x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; uint8_t x_260; lean_object* x_261; lean_object* x_287; lean_object* x_288; uint8_t x_308; lean_object* x_309; lean_object* x_335; lean_object* x_336; lean_object* x_337; uint8_t x_338; 
+x_250 = lean_ctor_get(x_31, 0);
+x_251 = lean_ctor_get(x_31, 1);
+x_252 = lean_ctor_get(x_31, 2);
+lean_inc(x_252);
 lean_inc(x_251);
 lean_inc(x_250);
-lean_inc(x_249);
-lean_dec(x_30);
-x_252 = lean_ctor_get(x_31, 0);
-lean_inc(x_252);
-if (lean_is_exclusive(x_31)) {
- lean_ctor_release(x_31, 0);
- x_253 = x_31;
+lean_dec(x_31);
+x_253 = lean_ctor_get(x_32, 0);
+lean_inc(x_253);
+if (lean_is_exclusive(x_32)) {
+ lean_ctor_release(x_32, 0);
+ x_254 = x_32;
 } else {
- lean_dec_ref(x_31);
- x_253 = lean_box(0);
+ lean_dec_ref(x_32);
+ x_254 = lean_box(0);
 }
-x_254 = 0;
-if (lean_is_scalar(x_253)) {
- x_255 = lean_alloc_ctor(0, 1, 1);
+x_255 = 0;
+if (lean_is_scalar(x_254)) {
+ x_256 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_255 = x_253;
+ x_256 = x_254;
 }
-lean_ctor_set(x_255, 0, x_252);
-lean_ctor_set_uint8(x_255, sizeof(void*)*1, x_254);
-x_256 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_256, 0, x_249);
-lean_ctor_set(x_256, 1, x_250);
-lean_ctor_set(x_256, 2, x_251);
-lean_ctor_set(x_256, 3, x_255);
-x_257 = lean_st_ref_set(x_6, x_256, x_32);
-x_258 = lean_ctor_get(x_257, 1);
-lean_inc(x_258);
-lean_dec(x_257);
-x_334 = lean_st_ref_get(x_6, x_258);
-x_335 = lean_ctor_get(x_334, 0);
-lean_inc(x_335);
-x_336 = lean_ctor_get(x_335, 3);
+lean_ctor_set(x_256, 0, x_253);
+lean_ctor_set_uint8(x_256, sizeof(void*)*1, x_255);
+x_257 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_257, 0, x_250);
+lean_ctor_set(x_257, 1, x_251);
+lean_ctor_set(x_257, 2, x_252);
+lean_ctor_set(x_257, 3, x_256);
+x_258 = lean_st_ref_set(x_6, x_257, x_33);
+x_259 = lean_ctor_get(x_258, 1);
+lean_inc(x_259);
+lean_dec(x_258);
+x_335 = lean_st_ref_get(x_6, x_259);
+x_336 = lean_ctor_get(x_335, 0);
 lean_inc(x_336);
-lean_dec(x_335);
-x_337 = lean_ctor_get_uint8(x_336, sizeof(void*)*1);
+x_337 = lean_ctor_get(x_336, 3);
+lean_inc(x_337);
 lean_dec(x_336);
-if (x_337 == 0)
+x_338 = lean_ctor_get_uint8(x_337, sizeof(void*)*1);
+lean_dec(x_337);
+if (x_338 == 0)
 {
-lean_object* x_338; 
-x_338 = lean_ctor_get(x_334, 1);
-lean_inc(x_338);
-lean_dec(x_334);
-x_307 = x_254;
-x_308 = x_338;
-goto block_333;
+lean_object* x_339; 
+x_339 = lean_ctor_get(x_335, 1);
+lean_inc(x_339);
+lean_dec(x_335);
+x_308 = x_255;
+x_309 = x_339;
+goto block_334;
 }
 else
 {
-lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; uint8_t x_343; 
-x_339 = lean_ctor_get(x_334, 1);
-lean_inc(x_339);
-lean_dec(x_334);
-x_340 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_21, x_3, x_4, x_5, x_6, x_339);
-x_341 = lean_ctor_get(x_340, 0);
-lean_inc(x_341);
-x_342 = lean_ctor_get(x_340, 1);
+lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; uint8_t x_344; 
+x_340 = lean_ctor_get(x_335, 1);
+lean_inc(x_340);
+lean_dec(x_335);
+x_341 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_22, x_3, x_4, x_5, x_6, x_340);
+x_342 = lean_ctor_get(x_341, 0);
 lean_inc(x_342);
-lean_dec(x_340);
-x_343 = lean_unbox(x_341);
+x_343 = lean_ctor_get(x_341, 1);
+lean_inc(x_343);
 lean_dec(x_341);
-x_307 = x_343;
-x_308 = x_342;
-goto block_333;
+x_344 = lean_unbox(x_342);
+lean_dec(x_342);
+x_308 = x_344;
+x_309 = x_343;
+goto block_334;
 }
-block_285:
+block_286:
 {
-lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; uint8_t 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; 
-x_261 = lean_st_ref_get(x_6, x_260);
-x_262 = lean_ctor_get(x_261, 0);
-lean_inc(x_262);
-x_263 = lean_ctor_get(x_261, 1);
+lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; uint8_t x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_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; 
+x_262 = lean_st_ref_get(x_6, x_261);
+x_263 = lean_ctor_get(x_262, 0);
 lean_inc(x_263);
-lean_dec(x_261);
-x_264 = lean_ctor_get(x_262, 3);
+x_264 = lean_ctor_get(x_262, 1);
 lean_inc(x_264);
 lean_dec(x_262);
-x_265 = lean_ctor_get_uint8(x_264, sizeof(void*)*1);
-lean_dec(x_264);
-x_266 = lean_st_ref_take(x_6, x_263);
-x_267 = lean_ctor_get(x_266, 0);
-lean_inc(x_267);
-x_268 = lean_ctor_get(x_267, 3);
+x_265 = lean_ctor_get(x_263, 3);
+lean_inc(x_265);
+lean_dec(x_263);
+x_266 = lean_ctor_get_uint8(x_265, sizeof(void*)*1);
+lean_dec(x_265);
+x_267 = lean_st_ref_take(x_6, x_264);
+x_268 = lean_ctor_get(x_267, 0);
 lean_inc(x_268);
-x_269 = lean_ctor_get(x_266, 1);
+x_269 = lean_ctor_get(x_268, 3);
 lean_inc(x_269);
-lean_dec(x_266);
-x_270 = lean_ctor_get(x_267, 0);
+x_270 = lean_ctor_get(x_267, 1);
 lean_inc(x_270);
-x_271 = lean_ctor_get(x_267, 1);
+lean_dec(x_267);
+x_271 = lean_ctor_get(x_268, 0);
 lean_inc(x_271);
-x_272 = lean_ctor_get(x_267, 2);
+x_272 = lean_ctor_get(x_268, 1);
 lean_inc(x_272);
-if (lean_is_exclusive(x_267)) {
- lean_ctor_release(x_267, 0);
- lean_ctor_release(x_267, 1);
- lean_ctor_release(x_267, 2);
- lean_ctor_release(x_267, 3);
- x_273 = x_267;
-} else {
- lean_dec_ref(x_267);
- x_273 = lean_box(0);
-}
-x_274 = lean_ctor_get(x_268, 0);
-lean_inc(x_274);
+x_273 = lean_ctor_get(x_268, 2);
+lean_inc(x_273);
 if (lean_is_exclusive(x_268)) {
  lean_ctor_release(x_268, 0);
- x_275 = x_268;
+ lean_ctor_release(x_268, 1);
+ lean_ctor_release(x_268, 2);
+ lean_ctor_release(x_268, 3);
+ x_274 = x_268;
 } else {
  lean_dec_ref(x_268);
- x_275 = lean_box(0);
+ x_274 = lean_box(0);
 }
-if (lean_is_scalar(x_275)) {
- x_276 = lean_alloc_ctor(0, 1, 1);
+x_275 = lean_ctor_get(x_269, 0);
+lean_inc(x_275);
+if (lean_is_exclusive(x_269)) {
+ lean_ctor_release(x_269, 0);
+ x_276 = x_269;
 } else {
- x_276 = x_275;
+ lean_dec_ref(x_269);
+ x_276 = lean_box(0);
 }
-lean_ctor_set(x_276, 0, x_274);
-lean_ctor_set_uint8(x_276, sizeof(void*)*1, x_28);
-if (lean_is_scalar(x_273)) {
- x_277 = lean_alloc_ctor(0, 4, 0);
+if (lean_is_scalar(x_276)) {
+ x_277 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_277 = x_273;
+ x_277 = x_276;
 }
-lean_ctor_set(x_277, 0, x_270);
-lean_ctor_set(x_277, 1, x_271);
-lean_ctor_set(x_277, 2, x_272);
-lean_ctor_set(x_277, 3, x_276);
-x_278 = lean_st_ref_set(x_6, x_277, x_269);
+lean_ctor_set(x_277, 0, x_275);
+lean_ctor_set_uint8(x_277, sizeof(void*)*1, x_29);
+if (lean_is_scalar(x_274)) {
+ x_278 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_278 = x_274;
+}
+lean_ctor_set(x_278, 0, x_271);
+lean_ctor_set(x_278, 1, x_272);
+lean_ctor_set(x_278, 2, x_273);
+lean_ctor_set(x_278, 3, x_277);
+x_279 = lean_st_ref_set(x_6, x_278, x_270);
 lean_dec(x_6);
-x_279 = lean_ctor_get(x_278, 1);
-lean_inc(x_279);
-if (lean_is_exclusive(x_278)) {
- lean_ctor_release(x_278, 0);
- lean_ctor_release(x_278, 1);
- x_280 = x_278;
+x_280 = lean_ctor_get(x_279, 1);
+lean_inc(x_280);
+if (lean_is_exclusive(x_279)) {
+ lean_ctor_release(x_279, 0);
+ lean_ctor_release(x_279, 1);
+ x_281 = x_279;
 } else {
- lean_dec_ref(x_278);
- x_280 = lean_box(0);
+ lean_dec_ref(x_279);
+ x_281 = lean_box(0);
 }
-x_281 = lean_box(x_259);
-x_282 = lean_box(x_265);
-x_283 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_283, 0, x_281);
-lean_ctor_set(x_283, 1, x_282);
-if (lean_is_scalar(x_280)) {
- x_284 = lean_alloc_ctor(0, 2, 0);
+x_282 = lean_box(x_260);
+x_283 = lean_box(x_266);
+x_284 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_284, 0, x_282);
+lean_ctor_set(x_284, 1, x_283);
+if (lean_is_scalar(x_281)) {
+ x_285 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_284 = x_280;
+ x_285 = x_281;
 }
-lean_ctor_set(x_284, 0, x_283);
-lean_ctor_set(x_284, 1, x_279);
-x_8 = x_284;
+lean_ctor_set(x_285, 0, x_284);
+lean_ctor_set(x_285, 1, x_280);
+x_8 = x_285;
 goto block_20;
 }
-block_306:
+block_307:
 {
-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; 
-x_288 = lean_st_ref_get(x_6, x_287);
-x_289 = lean_ctor_get(x_288, 1);
-lean_inc(x_289);
-lean_dec(x_288);
-x_290 = lean_st_ref_take(x_6, x_289);
-x_291 = lean_ctor_get(x_290, 0);
-lean_inc(x_291);
-x_292 = lean_ctor_get(x_291, 3);
+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; 
+x_289 = lean_st_ref_get(x_6, x_288);
+x_290 = lean_ctor_get(x_289, 1);
+lean_inc(x_290);
+lean_dec(x_289);
+x_291 = lean_st_ref_take(x_6, x_290);
+x_292 = lean_ctor_get(x_291, 0);
 lean_inc(x_292);
-x_293 = lean_ctor_get(x_290, 1);
+x_293 = lean_ctor_get(x_292, 3);
 lean_inc(x_293);
-lean_dec(x_290);
-x_294 = lean_ctor_get(x_291, 0);
+x_294 = lean_ctor_get(x_291, 1);
 lean_inc(x_294);
-x_295 = lean_ctor_get(x_291, 1);
+lean_dec(x_291);
+x_295 = lean_ctor_get(x_292, 0);
 lean_inc(x_295);
-x_296 = lean_ctor_get(x_291, 2);
+x_296 = lean_ctor_get(x_292, 1);
 lean_inc(x_296);
-if (lean_is_exclusive(x_291)) {
- lean_ctor_release(x_291, 0);
- lean_ctor_release(x_291, 1);
- lean_ctor_release(x_291, 2);
- lean_ctor_release(x_291, 3);
- x_297 = x_291;
-} else {
- lean_dec_ref(x_291);
- x_297 = lean_box(0);
-}
-x_298 = lean_ctor_get(x_292, 0);
-lean_inc(x_298);
+x_297 = lean_ctor_get(x_292, 2);
+lean_inc(x_297);
 if (lean_is_exclusive(x_292)) {
  lean_ctor_release(x_292, 0);
- x_299 = x_292;
+ lean_ctor_release(x_292, 1);
+ lean_ctor_release(x_292, 2);
+ lean_ctor_release(x_292, 3);
+ x_298 = x_292;
 } else {
  lean_dec_ref(x_292);
- x_299 = lean_box(0);
+ x_298 = lean_box(0);
 }
-if (lean_is_scalar(x_299)) {
- x_300 = lean_alloc_ctor(0, 1, 1);
+x_299 = lean_ctor_get(x_293, 0);
+lean_inc(x_299);
+if (lean_is_exclusive(x_293)) {
+ lean_ctor_release(x_293, 0);
+ x_300 = x_293;
 } else {
- x_300 = x_299;
+ lean_dec_ref(x_293);
+ x_300 = lean_box(0);
 }
-lean_ctor_set(x_300, 0, x_298);
-lean_ctor_set_uint8(x_300, sizeof(void*)*1, x_28);
-if (lean_is_scalar(x_297)) {
- x_301 = lean_alloc_ctor(0, 4, 0);
+if (lean_is_scalar(x_300)) {
+ x_301 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_301 = x_297;
+ x_301 = x_300;
 }
-lean_ctor_set(x_301, 0, x_294);
-lean_ctor_set(x_301, 1, x_295);
-lean_ctor_set(x_301, 2, x_296);
-lean_ctor_set(x_301, 3, x_300);
-x_302 = lean_st_ref_set(x_6, x_301, x_293);
+lean_ctor_set(x_301, 0, x_299);
+lean_ctor_set_uint8(x_301, sizeof(void*)*1, x_29);
+if (lean_is_scalar(x_298)) {
+ x_302 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_302 = x_298;
+}
+lean_ctor_set(x_302, 0, x_295);
+lean_ctor_set(x_302, 1, x_296);
+lean_ctor_set(x_302, 2, x_297);
+lean_ctor_set(x_302, 3, x_301);
+x_303 = lean_st_ref_set(x_6, x_302, x_294);
 lean_dec(x_6);
-x_303 = lean_ctor_get(x_302, 1);
-lean_inc(x_303);
-if (lean_is_exclusive(x_302)) {
- lean_ctor_release(x_302, 0);
- lean_ctor_release(x_302, 1);
- x_304 = x_302;
+x_304 = lean_ctor_get(x_303, 1);
+lean_inc(x_304);
+if (lean_is_exclusive(x_303)) {
+ lean_ctor_release(x_303, 0);
+ lean_ctor_release(x_303, 1);
+ x_305 = x_303;
 } else {
- lean_dec_ref(x_302);
- x_304 = lean_box(0);
+ lean_dec_ref(x_303);
+ x_305 = lean_box(0);
 }
-if (lean_is_scalar(x_304)) {
- x_305 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_305)) {
+ x_306 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_305 = x_304;
- lean_ctor_set_tag(x_305, 1);
+ x_306 = x_305;
+ lean_ctor_set_tag(x_306, 1);
 }
-lean_ctor_set(x_305, 0, x_286);
-lean_ctor_set(x_305, 1, x_303);
-x_8 = x_305;
+lean_ctor_set(x_306, 0, x_287);
+lean_ctor_set(x_306, 1, x_304);
+x_8 = x_306;
 goto block_20;
 }
-block_333:
+block_334:
 {
-if (x_307 == 0)
+if (x_308 == 0)
 {
-lean_object* x_309; lean_object* x_310; 
-x_309 = lean_box(0);
+lean_object* x_310; lean_object* x_311; 
+x_310 = lean_box(0);
 lean_inc(x_6);
-x_310 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_309, x_3, x_4, x_5, x_6, x_308);
-if (lean_obj_tag(x_310) == 0)
+x_311 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_310, x_3, x_4, x_5, x_6, x_309);
+if (lean_obj_tag(x_311) == 0)
 {
-lean_object* x_311; lean_object* x_312; uint8_t x_313; 
-x_311 = lean_ctor_get(x_310, 0);
-lean_inc(x_311);
-x_312 = lean_ctor_get(x_310, 1);
+lean_object* x_312; lean_object* x_313; uint8_t x_314; 
+x_312 = lean_ctor_get(x_311, 0);
 lean_inc(x_312);
-lean_dec(x_310);
-x_313 = lean_unbox(x_311);
+x_313 = lean_ctor_get(x_311, 1);
+lean_inc(x_313);
 lean_dec(x_311);
-x_259 = x_313;
-x_260 = x_312;
-goto block_285;
+x_314 = lean_unbox(x_312);
+lean_dec(x_312);
+x_260 = x_314;
+x_261 = x_313;
+goto block_286;
 }
 else
 {
-lean_object* x_314; lean_object* x_315; 
-x_314 = lean_ctor_get(x_310, 0);
-lean_inc(x_314);
-x_315 = lean_ctor_get(x_310, 1);
+lean_object* x_315; lean_object* x_316; 
+x_315 = lean_ctor_get(x_311, 0);
 lean_inc(x_315);
-lean_dec(x_310);
-x_286 = x_314;
+x_316 = lean_ctor_get(x_311, 1);
+lean_inc(x_316);
+lean_dec(x_311);
 x_287 = x_315;
-goto block_306;
+x_288 = x_316;
+goto block_307;
 }
 }
 else
 {
-lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; 
+lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; 
 lean_inc(x_1);
-x_316 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_316, 0, x_1);
-x_317 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
-x_318 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_318, 0, x_317);
-lean_ctor_set(x_318, 1, x_316);
-x_319 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
-x_320 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_320, 0, x_318);
-lean_ctor_set(x_320, 1, x_319);
-lean_inc(x_2);
-x_321 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_321, 0, x_2);
-x_322 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_322, 0, x_320);
-lean_ctor_set(x_322, 1, x_321);
+x_317 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_317, 0, x_1);
+x_318 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
+x_319 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_319, 0, x_318);
+lean_ctor_set(x_319, 1, x_317);
+x_320 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
+x_321 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_321, 0, x_319);
+lean_ctor_set(x_321, 1, x_320);
+lean_inc(x_21);
+x_322 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_322, 0, x_21);
 x_323 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_323, 0, x_322);
-lean_ctor_set(x_323, 1, x_317);
-x_324 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_21, x_323, x_3, x_4, x_5, x_6, x_308);
-x_325 = lean_ctor_get(x_324, 0);
-lean_inc(x_325);
-x_326 = lean_ctor_get(x_324, 1);
+lean_ctor_set(x_323, 0, x_321);
+lean_ctor_set(x_323, 1, x_322);
+x_324 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_324, 0, x_323);
+lean_ctor_set(x_324, 1, x_318);
+x_325 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_22, x_324, x_3, x_4, x_5, x_6, x_309);
+x_326 = lean_ctor_get(x_325, 0);
 lean_inc(x_326);
-lean_dec(x_324);
-lean_inc(x_6);
-x_327 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_325, x_3, x_4, x_5, x_6, x_326);
+x_327 = lean_ctor_get(x_325, 1);
+lean_inc(x_327);
 lean_dec(x_325);
-if (lean_obj_tag(x_327) == 0)
+lean_inc(x_6);
+x_328 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_326, x_3, x_4, x_5, x_6, x_327);
+lean_dec(x_326);
+if (lean_obj_tag(x_328) == 0)
 {
-lean_object* x_328; lean_object* x_329; uint8_t x_330; 
-x_328 = lean_ctor_get(x_327, 0);
-lean_inc(x_328);
-x_329 = lean_ctor_get(x_327, 1);
+lean_object* x_329; lean_object* x_330; uint8_t x_331; 
+x_329 = lean_ctor_get(x_328, 0);
 lean_inc(x_329);
-lean_dec(x_327);
-x_330 = lean_unbox(x_328);
+x_330 = lean_ctor_get(x_328, 1);
+lean_inc(x_330);
 lean_dec(x_328);
-x_259 = x_330;
-x_260 = x_329;
-goto block_285;
+x_331 = lean_unbox(x_329);
+lean_dec(x_329);
+x_260 = x_331;
+x_261 = x_330;
+goto block_286;
 }
 else
 {
-lean_object* x_331; lean_object* x_332; 
-x_331 = lean_ctor_get(x_327, 0);
-lean_inc(x_331);
-x_332 = lean_ctor_get(x_327, 1);
+lean_object* x_332; lean_object* x_333; 
+x_332 = lean_ctor_get(x_328, 0);
 lean_inc(x_332);
-lean_dec(x_327);
-x_286 = x_331;
+x_333 = lean_ctor_get(x_328, 1);
+lean_inc(x_333);
+lean_dec(x_328);
 x_287 = x_332;
-goto block_306;
+x_288 = x_333;
+goto block_307;
 }
 }
 }
@@ -41993,303 +42020,303 @@ goto block_306;
 }
 else
 {
-lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; uint8_t x_351; 
-x_344 = lean_ctor_get(x_5, 3);
-lean_inc(x_344);
-x_345 = l___private_Lean_Util_Trace_0__Lean_getResetTraces___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__6___rarg(x_6, x_23);
-x_346 = lean_ctor_get(x_345, 0);
-lean_inc(x_346);
-x_347 = lean_ctor_get(x_345, 1);
+lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; uint8_t x_352; 
+x_345 = lean_ctor_get(x_5, 3);
+lean_inc(x_345);
+x_346 = l___private_Lean_Util_Trace_0__Lean_getResetTraces___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__6___rarg(x_6, x_24);
+x_347 = lean_ctor_get(x_346, 0);
 lean_inc(x_347);
-lean_dec(x_345);
-x_348 = lean_st_ref_get(x_6, x_347);
-x_349 = lean_ctor_get(x_348, 0);
-lean_inc(x_349);
-x_350 = lean_ctor_get(x_349, 3);
+x_348 = lean_ctor_get(x_346, 1);
+lean_inc(x_348);
+lean_dec(x_346);
+x_349 = lean_st_ref_get(x_6, x_348);
+x_350 = lean_ctor_get(x_349, 0);
 lean_inc(x_350);
-lean_dec(x_349);
-x_351 = lean_ctor_get_uint8(x_350, sizeof(void*)*1);
+x_351 = lean_ctor_get(x_350, 3);
+lean_inc(x_351);
 lean_dec(x_350);
-if (x_351 == 0)
+x_352 = lean_ctor_get_uint8(x_351, sizeof(void*)*1);
+lean_dec(x_351);
+if (x_352 == 0)
 {
-lean_object* x_352; lean_object* x_353; lean_object* x_354; 
-x_352 = lean_ctor_get(x_348, 1);
-lean_inc(x_352);
-lean_dec(x_348);
-x_353 = lean_box(0);
+lean_object* x_353; lean_object* x_354; lean_object* x_355; 
+x_353 = lean_ctor_get(x_349, 1);
+lean_inc(x_353);
+lean_dec(x_349);
+x_354 = lean_box(0);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_354 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_353, x_3, x_4, x_5, x_6, x_352);
-if (lean_obj_tag(x_354) == 0)
+x_355 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_354, x_3, x_4, x_5, x_6, x_353);
+if (lean_obj_tag(x_355) == 0)
 {
-lean_object* x_355; lean_object* x_356; lean_object* x_357; uint8_t x_358; 
-x_355 = lean_ctor_get(x_354, 0);
-lean_inc(x_355);
-x_356 = lean_ctor_get(x_354, 1);
+lean_object* x_356; lean_object* x_357; lean_object* x_358; uint8_t x_359; 
+x_356 = lean_ctor_get(x_355, 0);
 lean_inc(x_356);
-lean_dec(x_354);
-x_357 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_346, x_21, x_344, x_3, x_4, x_5, x_6, x_356);
+x_357 = lean_ctor_get(x_355, 1);
+lean_inc(x_357);
+lean_dec(x_355);
+x_358 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_347, x_22, x_345, x_3, x_4, x_5, x_6, x_357);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_358 = !lean_is_exclusive(x_357);
-if (x_358 == 0)
+x_359 = !lean_is_exclusive(x_358);
+if (x_359 == 0)
 {
-lean_object* x_359; 
-x_359 = lean_ctor_get(x_357, 0);
-lean_dec(x_359);
-lean_ctor_set(x_357, 0, x_355);
-return x_357;
+lean_object* x_360; 
+x_360 = lean_ctor_get(x_358, 0);
+lean_dec(x_360);
+lean_ctor_set(x_358, 0, x_356);
+return x_358;
 }
 else
 {
-lean_object* x_360; lean_object* x_361; 
-x_360 = lean_ctor_get(x_357, 1);
-lean_inc(x_360);
-lean_dec(x_357);
-x_361 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_361, 0, x_355);
-lean_ctor_set(x_361, 1, x_360);
-return x_361;
+lean_object* x_361; lean_object* x_362; 
+x_361 = lean_ctor_get(x_358, 1);
+lean_inc(x_361);
+lean_dec(x_358);
+x_362 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_362, 0, x_356);
+lean_ctor_set(x_362, 1, x_361);
+return x_362;
 }
 }
 else
 {
-lean_object* x_362; lean_object* x_363; lean_object* x_364; uint8_t x_365; 
-x_362 = lean_ctor_get(x_354, 0);
-lean_inc(x_362);
-x_363 = lean_ctor_get(x_354, 1);
+lean_object* x_363; lean_object* x_364; lean_object* x_365; uint8_t x_366; 
+x_363 = lean_ctor_get(x_355, 0);
 lean_inc(x_363);
-lean_dec(x_354);
-x_364 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_346, x_21, x_344, x_3, x_4, x_5, x_6, x_363);
+x_364 = lean_ctor_get(x_355, 1);
+lean_inc(x_364);
+lean_dec(x_355);
+x_365 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_347, x_22, x_345, x_3, x_4, x_5, x_6, x_364);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_365 = !lean_is_exclusive(x_364);
-if (x_365 == 0)
+x_366 = !lean_is_exclusive(x_365);
+if (x_366 == 0)
 {
-lean_object* x_366; 
-x_366 = lean_ctor_get(x_364, 0);
-lean_dec(x_366);
-lean_ctor_set_tag(x_364, 1);
-lean_ctor_set(x_364, 0, x_362);
-return x_364;
+lean_object* x_367; 
+x_367 = lean_ctor_get(x_365, 0);
+lean_dec(x_367);
+lean_ctor_set_tag(x_365, 1);
+lean_ctor_set(x_365, 0, x_363);
+return x_365;
 }
 else
 {
-lean_object* x_367; lean_object* x_368; 
-x_367 = lean_ctor_get(x_364, 1);
-lean_inc(x_367);
-lean_dec(x_364);
-x_368 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_368, 0, x_362);
-lean_ctor_set(x_368, 1, x_367);
-return x_368;
+lean_object* x_368; lean_object* x_369; 
+x_368 = lean_ctor_get(x_365, 1);
+lean_inc(x_368);
+lean_dec(x_365);
+x_369 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_369, 0, x_363);
+lean_ctor_set(x_369, 1, x_368);
+return x_369;
 }
 }
 }
 else
 {
-lean_object* x_369; lean_object* x_370; lean_object* x_371; uint8_t x_372; 
-x_369 = lean_ctor_get(x_348, 1);
-lean_inc(x_369);
-lean_dec(x_348);
-x_370 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_21, x_3, x_4, x_5, x_6, x_369);
-x_371 = lean_ctor_get(x_370, 0);
-lean_inc(x_371);
-x_372 = lean_unbox(x_371);
+lean_object* x_370; lean_object* x_371; lean_object* x_372; uint8_t x_373; 
+x_370 = lean_ctor_get(x_349, 1);
+lean_inc(x_370);
+lean_dec(x_349);
+x_371 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__2(x_22, x_3, x_4, x_5, x_6, x_370);
+x_372 = lean_ctor_get(x_371, 0);
+lean_inc(x_372);
+x_373 = lean_unbox(x_372);
+lean_dec(x_372);
+if (x_373 == 0)
+{
+lean_object* x_374; lean_object* x_375; lean_object* x_376; 
+x_374 = lean_ctor_get(x_371, 1);
+lean_inc(x_374);
 lean_dec(x_371);
-if (x_372 == 0)
-{
-lean_object* x_373; lean_object* x_374; lean_object* x_375; 
-x_373 = lean_ctor_get(x_370, 1);
-lean_inc(x_373);
-lean_dec(x_370);
-x_374 = lean_box(0);
+x_375 = lean_box(0);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_375 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_374, x_3, x_4, x_5, x_6, x_373);
-if (lean_obj_tag(x_375) == 0)
+x_376 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_375, x_3, x_4, x_5, x_6, x_374);
+if (lean_obj_tag(x_376) == 0)
 {
-lean_object* x_376; lean_object* x_377; lean_object* x_378; uint8_t x_379; 
-x_376 = lean_ctor_get(x_375, 0);
-lean_inc(x_376);
-x_377 = lean_ctor_get(x_375, 1);
+lean_object* x_377; lean_object* x_378; lean_object* x_379; uint8_t x_380; 
+x_377 = lean_ctor_get(x_376, 0);
 lean_inc(x_377);
-lean_dec(x_375);
-x_378 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_346, x_21, x_344, x_3, x_4, x_5, x_6, x_377);
+x_378 = lean_ctor_get(x_376, 1);
+lean_inc(x_378);
+lean_dec(x_376);
+x_379 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_347, x_22, x_345, x_3, x_4, x_5, x_6, x_378);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_379 = !lean_is_exclusive(x_378);
-if (x_379 == 0)
+x_380 = !lean_is_exclusive(x_379);
+if (x_380 == 0)
 {
-lean_object* x_380; 
-x_380 = lean_ctor_get(x_378, 0);
-lean_dec(x_380);
-lean_ctor_set(x_378, 0, x_376);
-return x_378;
+lean_object* x_381; 
+x_381 = lean_ctor_get(x_379, 0);
+lean_dec(x_381);
+lean_ctor_set(x_379, 0, x_377);
+return x_379;
 }
 else
 {
-lean_object* x_381; lean_object* x_382; 
-x_381 = lean_ctor_get(x_378, 1);
-lean_inc(x_381);
-lean_dec(x_378);
-x_382 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_382, 0, x_376);
-lean_ctor_set(x_382, 1, x_381);
-return x_382;
+lean_object* x_382; lean_object* x_383; 
+x_382 = lean_ctor_get(x_379, 1);
+lean_inc(x_382);
+lean_dec(x_379);
+x_383 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_383, 0, x_377);
+lean_ctor_set(x_383, 1, x_382);
+return x_383;
 }
 }
 else
 {
-lean_object* x_383; lean_object* x_384; lean_object* x_385; uint8_t x_386; 
-x_383 = lean_ctor_get(x_375, 0);
-lean_inc(x_383);
-x_384 = lean_ctor_get(x_375, 1);
+lean_object* x_384; lean_object* x_385; lean_object* x_386; uint8_t x_387; 
+x_384 = lean_ctor_get(x_376, 0);
 lean_inc(x_384);
-lean_dec(x_375);
-x_385 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_346, x_21, x_344, x_3, x_4, x_5, x_6, x_384);
+x_385 = lean_ctor_get(x_376, 1);
+lean_inc(x_385);
+lean_dec(x_376);
+x_386 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_347, x_22, x_345, x_3, x_4, x_5, x_6, x_385);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_386 = !lean_is_exclusive(x_385);
-if (x_386 == 0)
+x_387 = !lean_is_exclusive(x_386);
+if (x_387 == 0)
 {
-lean_object* x_387; 
-x_387 = lean_ctor_get(x_385, 0);
-lean_dec(x_387);
-lean_ctor_set_tag(x_385, 1);
-lean_ctor_set(x_385, 0, x_383);
-return x_385;
+lean_object* x_388; 
+x_388 = lean_ctor_get(x_386, 0);
+lean_dec(x_388);
+lean_ctor_set_tag(x_386, 1);
+lean_ctor_set(x_386, 0, x_384);
+return x_386;
 }
 else
 {
-lean_object* x_388; lean_object* x_389; 
-x_388 = lean_ctor_get(x_385, 1);
-lean_inc(x_388);
-lean_dec(x_385);
-x_389 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_389, 0, x_383);
-lean_ctor_set(x_389, 1, x_388);
-return x_389;
+lean_object* x_389; lean_object* x_390; 
+x_389 = lean_ctor_get(x_386, 1);
+lean_inc(x_389);
+lean_dec(x_386);
+x_390 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_390, 0, x_384);
+lean_ctor_set(x_390, 1, x_389);
+return x_390;
 }
 }
 }
 else
 {
-lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; 
-x_390 = lean_ctor_get(x_370, 1);
-lean_inc(x_390);
-lean_dec(x_370);
+lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; lean_object* x_403; 
+x_391 = lean_ctor_get(x_371, 1);
+lean_inc(x_391);
+lean_dec(x_371);
 lean_inc(x_1);
-x_391 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_391, 0, x_1);
-x_392 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
-x_393 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_393, 0, x_392);
-lean_ctor_set(x_393, 1, x_391);
-x_394 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
-x_395 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_395, 0, x_393);
-lean_ctor_set(x_395, 1, x_394);
-lean_inc(x_2);
-x_396 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_396, 0, x_2);
-x_397 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_397, 0, x_395);
-lean_ctor_set(x_397, 1, x_396);
+x_392 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_392, 0, x_1);
+x_393 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__13;
+x_394 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_394, 0, x_393);
+lean_ctor_set(x_394, 1, x_392);
+x_395 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__17;
+x_396 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_396, 0, x_394);
+lean_ctor_set(x_396, 1, x_395);
+lean_inc(x_21);
+x_397 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_397, 0, x_21);
 x_398 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_398, 0, x_397);
-lean_ctor_set(x_398, 1, x_392);
-x_399 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_21, x_398, x_3, x_4, x_5, x_6, x_390);
-x_400 = lean_ctor_get(x_399, 0);
-lean_inc(x_400);
-x_401 = lean_ctor_get(x_399, 1);
+lean_ctor_set(x_398, 0, x_396);
+lean_ctor_set(x_398, 1, x_397);
+x_399 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_399, 0, x_398);
+lean_ctor_set(x_399, 1, x_393);
+x_400 = l_Lean_addTrace___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_postponeIsLevelDefEq___spec__1(x_22, x_399, x_3, x_4, x_5, x_6, x_391);
+x_401 = lean_ctor_get(x_400, 0);
 lean_inc(x_401);
-lean_dec(x_399);
+x_402 = lean_ctor_get(x_400, 1);
+lean_inc(x_402);
+lean_dec(x_400);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_402 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_2, x_400, x_3, x_4, x_5, x_6, x_401);
-lean_dec(x_400);
-if (lean_obj_tag(x_402) == 0)
+x_403 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment___lambda__1(x_1, x_21, x_401, x_3, x_4, x_5, x_6, x_402);
+lean_dec(x_401);
+if (lean_obj_tag(x_403) == 0)
 {
-lean_object* x_403; lean_object* x_404; lean_object* x_405; uint8_t x_406; 
-x_403 = lean_ctor_get(x_402, 0);
-lean_inc(x_403);
-x_404 = lean_ctor_get(x_402, 1);
+lean_object* x_404; lean_object* x_405; lean_object* x_406; uint8_t x_407; 
+x_404 = lean_ctor_get(x_403, 0);
 lean_inc(x_404);
-lean_dec(x_402);
-x_405 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_346, x_21, x_344, x_3, x_4, x_5, x_6, x_404);
+x_405 = lean_ctor_get(x_403, 1);
+lean_inc(x_405);
+lean_dec(x_403);
+x_406 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_347, x_22, x_345, x_3, x_4, x_5, x_6, x_405);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_406 = !lean_is_exclusive(x_405);
-if (x_406 == 0)
+x_407 = !lean_is_exclusive(x_406);
+if (x_407 == 0)
 {
-lean_object* x_407; 
-x_407 = lean_ctor_get(x_405, 0);
-lean_dec(x_407);
-lean_ctor_set(x_405, 0, x_403);
-return x_405;
+lean_object* x_408; 
+x_408 = lean_ctor_get(x_406, 0);
+lean_dec(x_408);
+lean_ctor_set(x_406, 0, x_404);
+return x_406;
 }
 else
 {
-lean_object* x_408; lean_object* x_409; 
-x_408 = lean_ctor_get(x_405, 1);
-lean_inc(x_408);
-lean_dec(x_405);
-x_409 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_409, 0, x_403);
-lean_ctor_set(x_409, 1, x_408);
-return x_409;
+lean_object* x_409; lean_object* x_410; 
+x_409 = lean_ctor_get(x_406, 1);
+lean_inc(x_409);
+lean_dec(x_406);
+x_410 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_410, 0, x_404);
+lean_ctor_set(x_410, 1, x_409);
+return x_410;
 }
 }
 else
 {
-lean_object* x_410; lean_object* x_411; lean_object* x_412; uint8_t x_413; 
-x_410 = lean_ctor_get(x_402, 0);
-lean_inc(x_410);
-x_411 = lean_ctor_get(x_402, 1);
+lean_object* x_411; lean_object* x_412; lean_object* x_413; uint8_t x_414; 
+x_411 = lean_ctor_get(x_403, 0);
 lean_inc(x_411);
-lean_dec(x_402);
-x_412 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_346, x_21, x_344, x_3, x_4, x_5, x_6, x_411);
+x_412 = lean_ctor_get(x_403, 1);
+lean_inc(x_412);
+lean_dec(x_403);
+x_413 = l___private_Lean_Util_Trace_0__Lean_addNode___at___private_Lean_Meta_LevelDefEq_0__Lean_Meta_processPostponedStep___spec__12(x_347, x_22, x_345, x_3, x_4, x_5, x_6, x_412);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_413 = !lean_is_exclusive(x_412);
-if (x_413 == 0)
+x_414 = !lean_is_exclusive(x_413);
+if (x_414 == 0)
 {
-lean_object* x_414; 
-x_414 = lean_ctor_get(x_412, 0);
-lean_dec(x_414);
-lean_ctor_set_tag(x_412, 1);
-lean_ctor_set(x_412, 0, x_410);
-return x_412;
+lean_object* x_415; 
+x_415 = lean_ctor_get(x_413, 0);
+lean_dec(x_415);
+lean_ctor_set_tag(x_413, 1);
+lean_ctor_set(x_413, 0, x_411);
+return x_413;
 }
 else
 {
-lean_object* x_415; lean_object* x_416; 
-x_415 = lean_ctor_get(x_412, 1);
-lean_inc(x_415);
-lean_dec(x_412);
-x_416 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_416, 0, x_410);
-lean_ctor_set(x_416, 1, x_415);
-return x_416;
+lean_object* x_416; lean_object* x_417; 
+x_416 = lean_ctor_get(x_413, 1);
+lean_inc(x_416);
+lean_dec(x_413);
+x_417 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_417, 0, x_411);
+lean_ctor_set(x_417, 1, x_416);
+return x_417;
 }
 }
 }
@@ -49339,8 +49366,7 @@ lean_dec(x_2);
 switch (lean_obj_tag(x_8)) {
 case 1:
 {
-switch (lean_obj_tag(x_9)) {
-case 1:
+if (lean_obj_tag(x_9) == 1)
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 x_10 = lean_ctor_get(x_8, 0);
@@ -49577,314 +49603,307 @@ return x_55;
 }
 }
 }
-case 10:
+else
 {
 lean_object* x_56; 
-x_56 = lean_ctor_get(x_9, 1);
-lean_inc(x_56);
-lean_dec(x_9);
-x_1 = x_8;
-x_2 = x_56;
-goto _start;
-}
-default: 
-{
-lean_object* x_58; 
-x_58 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
-return x_58;
-}
+x_56 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_56;
 }
 }
 case 3:
 {
-switch (lean_obj_tag(x_9)) {
-case 3:
+if (lean_obj_tag(x_9) == 3)
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_8, 0);
-lean_inc(x_59);
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_8, 0);
+lean_inc(x_57);
 lean_dec(x_8);
-x_60 = lean_ctor_get(x_9, 0);
-lean_inc(x_60);
+x_58 = lean_ctor_get(x_9, 0);
+lean_inc(x_58);
 lean_dec(x_9);
-x_61 = l_Lean_Meta_isLevelDefEqAux(x_59, x_60, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_61) == 0)
+x_59 = l_Lean_Meta_isLevelDefEqAux(x_57, x_58, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_59) == 0)
 {
-uint8_t x_62; 
-x_62 = !lean_is_exclusive(x_61);
-if (x_62 == 0)
+uint8_t x_60; 
+x_60 = !lean_is_exclusive(x_59);
+if (x_60 == 0)
 {
-lean_object* x_63; uint8_t x_64; uint8_t x_65; lean_object* x_66; 
-x_63 = lean_ctor_get(x_61, 0);
-x_64 = lean_unbox(x_63);
-lean_dec(x_63);
-x_65 = l_Bool_toLBool(x_64);
-x_66 = lean_box(x_65);
-lean_ctor_set(x_61, 0, x_66);
-return x_61;
-}
-else
-{
-lean_object* x_67; lean_object* x_68; uint8_t x_69; uint8_t x_70; lean_object* x_71; lean_object* x_72; 
-x_67 = lean_ctor_get(x_61, 0);
-x_68 = lean_ctor_get(x_61, 1);
-lean_inc(x_68);
-lean_inc(x_67);
+lean_object* x_61; uint8_t x_62; uint8_t x_63; lean_object* x_64; 
+x_61 = lean_ctor_get(x_59, 0);
+x_62 = lean_unbox(x_61);
 lean_dec(x_61);
-x_69 = lean_unbox(x_67);
-lean_dec(x_67);
-x_70 = l_Bool_toLBool(x_69);
-x_71 = lean_box(x_70);
-x_72 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_72, 0, x_71);
-lean_ctor_set(x_72, 1, x_68);
-return x_72;
+x_63 = l_Bool_toLBool(x_62);
+x_64 = lean_box(x_63);
+lean_ctor_set(x_59, 0, x_64);
+return x_59;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; uint8_t x_67; uint8_t x_68; lean_object* x_69; lean_object* x_70; 
+x_65 = lean_ctor_get(x_59, 0);
+x_66 = lean_ctor_get(x_59, 1);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_59);
+x_67 = lean_unbox(x_65);
+lean_dec(x_65);
+x_68 = l_Bool_toLBool(x_67);
+x_69 = lean_box(x_68);
+x_70 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_70, 0, x_69);
+lean_ctor_set(x_70, 1, x_66);
+return x_70;
 }
 }
 else
 {
-uint8_t x_73; 
-x_73 = !lean_is_exclusive(x_61);
-if (x_73 == 0)
+uint8_t x_71; 
+x_71 = !lean_is_exclusive(x_59);
+if (x_71 == 0)
 {
-return x_61;
+return x_59;
 }
 else
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_61, 0);
-x_75 = lean_ctor_get(x_61, 1);
-lean_inc(x_75);
-lean_inc(x_74);
-lean_dec(x_61);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_74);
-lean_ctor_set(x_76, 1, x_75);
-return x_76;
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_72 = lean_ctor_get(x_59, 0);
+x_73 = lean_ctor_get(x_59, 1);
+lean_inc(x_73);
+lean_inc(x_72);
+lean_dec(x_59);
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_72);
+lean_ctor_set(x_74, 1, x_73);
+return x_74;
 }
 }
 }
-case 10:
+else
 {
-lean_object* x_77; 
-x_77 = lean_ctor_get(x_9, 1);
+lean_object* x_75; 
+x_75 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_75;
+}
+}
+case 6:
+{
+if (lean_obj_tag(x_9) == 6)
+{
+uint8_t x_76; 
+x_76 = lean_expr_eqv(x_8, x_9);
+if (x_76 == 0)
+{
+lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_77 = lean_ctor_get(x_3, 1);
 lean_inc(x_77);
+x_78 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqArgsFirstPass___closed__1;
+x_79 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqBindingAux(x_77, x_78, x_8, x_9, x_78, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_9);
-x_1 = x_8;
-x_2 = x_77;
-goto _start;
-}
-default: 
-{
-lean_object* x_79; 
-x_79 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
-return x_79;
-}
-}
-}
-case 6:
-{
-switch (lean_obj_tag(x_9)) {
-case 6:
+if (lean_obj_tag(x_79) == 0)
 {
 uint8_t x_80; 
-x_80 = lean_expr_eqv(x_8, x_9);
+x_80 = !lean_is_exclusive(x_79);
 if (x_80 == 0)
 {
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_3, 1);
-lean_inc(x_81);
-x_82 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqArgsFirstPass___closed__1;
-x_83 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqBindingAux(x_81, x_82, x_8, x_9, x_82, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_9);
-if (lean_obj_tag(x_83) == 0)
-{
-uint8_t x_84; 
-x_84 = !lean_is_exclusive(x_83);
-if (x_84 == 0)
-{
-lean_object* x_85; uint8_t x_86; uint8_t x_87; lean_object* x_88; 
-x_85 = lean_ctor_get(x_83, 0);
-x_86 = lean_unbox(x_85);
-lean_dec(x_85);
-x_87 = l_Bool_toLBool(x_86);
-x_88 = lean_box(x_87);
-lean_ctor_set(x_83, 0, x_88);
-return x_83;
+lean_object* x_81; uint8_t x_82; uint8_t x_83; lean_object* x_84; 
+x_81 = lean_ctor_get(x_79, 0);
+x_82 = lean_unbox(x_81);
+lean_dec(x_81);
+x_83 = l_Bool_toLBool(x_82);
+x_84 = lean_box(x_83);
+lean_ctor_set(x_79, 0, x_84);
+return x_79;
 }
 else
 {
-lean_object* x_89; lean_object* x_90; uint8_t x_91; uint8_t x_92; lean_object* x_93; lean_object* x_94; 
-x_89 = lean_ctor_get(x_83, 0);
-x_90 = lean_ctor_get(x_83, 1);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_dec(x_83);
-x_91 = lean_unbox(x_89);
-lean_dec(x_89);
-x_92 = l_Bool_toLBool(x_91);
-x_93 = lean_box(x_92);
-x_94 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_94, 0, x_93);
-lean_ctor_set(x_94, 1, x_90);
+lean_object* x_85; lean_object* x_86; uint8_t x_87; uint8_t x_88; lean_object* x_89; lean_object* x_90; 
+x_85 = lean_ctor_get(x_79, 0);
+x_86 = lean_ctor_get(x_79, 1);
+lean_inc(x_86);
+lean_inc(x_85);
+lean_dec(x_79);
+x_87 = lean_unbox(x_85);
+lean_dec(x_85);
+x_88 = l_Bool_toLBool(x_87);
+x_89 = lean_box(x_88);
+x_90 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_90, 0, x_89);
+lean_ctor_set(x_90, 1, x_86);
+return x_90;
+}
+}
+else
+{
+uint8_t x_91; 
+x_91 = !lean_is_exclusive(x_79);
+if (x_91 == 0)
+{
+return x_79;
+}
+else
+{
+lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_92 = lean_ctor_get(x_79, 0);
+x_93 = lean_ctor_get(x_79, 1);
+lean_inc(x_93);
+lean_inc(x_92);
+lean_dec(x_79);
+x_94 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_94, 0, x_92);
+lean_ctor_set(x_94, 1, x_93);
 return x_94;
 }
 }
-else
-{
-uint8_t x_95; 
-x_95 = !lean_is_exclusive(x_83);
-if (x_95 == 0)
-{
-return x_83;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_83, 0);
-x_97 = lean_ctor_get(x_83, 1);
-lean_inc(x_97);
-lean_inc(x_96);
-lean_dec(x_83);
-x_98 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_98, 0, x_96);
-lean_ctor_set(x_98, 1, x_97);
+uint8_t x_95; lean_object* x_96; lean_object* x_97; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_95 = 1;
+x_96 = lean_box(x_95);
+x_97 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_97, 0, x_96);
+lean_ctor_set(x_97, 1, x_7);
+return x_97;
+}
+}
+else
+{
+lean_object* x_98; 
+x_98 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
 return x_98;
 }
 }
+case 7:
+{
+if (lean_obj_tag(x_9) == 7)
+{
+uint8_t x_99; 
+x_99 = lean_expr_eqv(x_8, x_9);
+if (x_99 == 0)
+{
+lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_100 = lean_ctor_get(x_3, 1);
+lean_inc(x_100);
+x_101 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqArgsFirstPass___closed__1;
+x_102 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqBindingAux(x_100, x_101, x_8, x_9, x_101, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_9);
+if (lean_obj_tag(x_102) == 0)
+{
+uint8_t x_103; 
+x_103 = !lean_is_exclusive(x_102);
+if (x_103 == 0)
+{
+lean_object* x_104; uint8_t x_105; uint8_t x_106; lean_object* x_107; 
+x_104 = lean_ctor_get(x_102, 0);
+x_105 = lean_unbox(x_104);
+lean_dec(x_104);
+x_106 = l_Bool_toLBool(x_105);
+x_107 = lean_box(x_106);
+lean_ctor_set(x_102, 0, x_107);
+return x_102;
 }
 else
 {
-uint8_t x_99; lean_object* x_100; lean_object* x_101; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-x_99 = 1;
-x_100 = lean_box(x_99);
-x_101 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_101, 0, x_100);
-lean_ctor_set(x_101, 1, x_7);
-return x_101;
+lean_object* x_108; lean_object* x_109; uint8_t x_110; uint8_t x_111; lean_object* x_112; lean_object* x_113; 
+x_108 = lean_ctor_get(x_102, 0);
+x_109 = lean_ctor_get(x_102, 1);
+lean_inc(x_109);
+lean_inc(x_108);
+lean_dec(x_102);
+x_110 = lean_unbox(x_108);
+lean_dec(x_108);
+x_111 = l_Bool_toLBool(x_110);
+x_112 = lean_box(x_111);
+x_113 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_113, 0, x_112);
+lean_ctor_set(x_113, 1, x_109);
+return x_113;
 }
 }
-case 10:
-{
-lean_object* x_102; 
-x_102 = lean_ctor_get(x_9, 1);
-lean_inc(x_102);
-lean_dec(x_9);
-x_1 = x_8;
-x_2 = x_102;
-goto _start;
-}
-default: 
-{
-lean_object* x_104; 
-x_104 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
-return x_104;
-}
-}
-}
-case 7:
-{
-switch (lean_obj_tag(x_9)) {
-case 7:
-{
-uint8_t x_105; 
-x_105 = lean_expr_eqv(x_8, x_9);
-if (x_105 == 0)
-{
-lean_object* x_106; lean_object* x_107; lean_object* x_108; 
-x_106 = lean_ctor_get(x_3, 1);
-lean_inc(x_106);
-x_107 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqArgsFirstPass___closed__1;
-x_108 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqBindingAux(x_106, x_107, x_8, x_9, x_107, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_9);
-if (lean_obj_tag(x_108) == 0)
-{
-uint8_t x_109; 
-x_109 = !lean_is_exclusive(x_108);
-if (x_109 == 0)
-{
-lean_object* x_110; uint8_t x_111; uint8_t x_112; lean_object* x_113; 
-x_110 = lean_ctor_get(x_108, 0);
-x_111 = lean_unbox(x_110);
-lean_dec(x_110);
-x_112 = l_Bool_toLBool(x_111);
-x_113 = lean_box(x_112);
-lean_ctor_set(x_108, 0, x_113);
-return x_108;
-}
 else
 {
-lean_object* x_114; lean_object* x_115; uint8_t x_116; uint8_t x_117; lean_object* x_118; lean_object* x_119; 
-x_114 = lean_ctor_get(x_108, 0);
-x_115 = lean_ctor_get(x_108, 1);
+uint8_t x_114; 
+x_114 = !lean_is_exclusive(x_102);
+if (x_114 == 0)
+{
+return x_102;
+}
+else
+{
+lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+x_115 = lean_ctor_get(x_102, 0);
+x_116 = lean_ctor_get(x_102, 1);
+lean_inc(x_116);
 lean_inc(x_115);
-lean_inc(x_114);
-lean_dec(x_108);
-x_116 = lean_unbox(x_114);
-lean_dec(x_114);
-x_117 = l_Bool_toLBool(x_116);
-x_118 = lean_box(x_117);
-x_119 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_119, 0, x_118);
-lean_ctor_set(x_119, 1, x_115);
-return x_119;
-}
-}
-else
-{
-uint8_t x_120; 
-x_120 = !lean_is_exclusive(x_108);
-if (x_120 == 0)
-{
-return x_108;
-}
-else
-{
-lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-x_121 = lean_ctor_get(x_108, 0);
-x_122 = lean_ctor_get(x_108, 1);
-lean_inc(x_122);
-lean_inc(x_121);
-lean_dec(x_108);
-x_123 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_123, 0, x_121);
-lean_ctor_set(x_123, 1, x_122);
-return x_123;
+lean_dec(x_102);
+x_117 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_117, 0, x_115);
+lean_ctor_set(x_117, 1, x_116);
+return x_117;
 }
 }
 }
 else
 {
-uint8_t x_124; lean_object* x_125; lean_object* x_126; 
+uint8_t x_118; lean_object* x_119; lean_object* x_120; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_124 = 1;
-x_125 = lean_box(x_124);
-x_126 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_126, 0, x_125);
-lean_ctor_set(x_126, 1, x_7);
-return x_126;
+x_118 = 1;
+x_119 = lean_box(x_118);
+x_120 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_120, 0, x_119);
+lean_ctor_set(x_120, 1, x_7);
+return x_120;
 }
 }
-case 10:
+else
 {
-lean_object* x_127; 
-x_127 = lean_ctor_get(x_9, 1);
-lean_inc(x_127);
+lean_object* x_121; 
+x_121 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_121;
+}
+}
+case 9:
+{
+if (lean_obj_tag(x_9) == 9)
+{
+lean_object* x_122; lean_object* x_123; uint8_t x_124; uint8_t x_125; lean_object* x_126; lean_object* x_127; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_122 = lean_ctor_get(x_8, 0);
+lean_inc(x_122);
+lean_dec(x_8);
+x_123 = lean_ctor_get(x_9, 0);
+lean_inc(x_123);
 lean_dec(x_9);
-x_1 = x_8;
-x_2 = x_127;
-goto _start;
+x_124 = l___private_Lean_Expr_0__Lean_beqLiteral____x40_Lean_Expr___hyg_32_(x_122, x_123);
+lean_dec(x_123);
+lean_dec(x_122);
+x_125 = l_Bool_toLBool(x_124);
+x_126 = lean_box(x_125);
+x_127 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_127, 0, x_126);
+lean_ctor_set(x_127, 1, x_7);
+return x_127;
+}
+else
+{
+lean_object* x_128; 
+x_128 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_128;
+}
 }
 default: 
 {
@@ -49894,81 +49913,6 @@ return x_129;
 }
 }
 }
-case 9:
-{
-switch (lean_obj_tag(x_9)) {
-case 9:
-{
-lean_object* x_130; lean_object* x_131; uint8_t x_132; uint8_t x_133; lean_object* x_134; lean_object* x_135; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-x_130 = lean_ctor_get(x_8, 0);
-lean_inc(x_130);
-lean_dec(x_8);
-x_131 = lean_ctor_get(x_9, 0);
-lean_inc(x_131);
-lean_dec(x_9);
-x_132 = l___private_Lean_Expr_0__Lean_beqLiteral____x40_Lean_Expr___hyg_32_(x_130, x_131);
-lean_dec(x_131);
-lean_dec(x_130);
-x_133 = l_Bool_toLBool(x_132);
-x_134 = lean_box(x_133);
-x_135 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_135, 0, x_134);
-lean_ctor_set(x_135, 1, x_7);
-return x_135;
-}
-case 10:
-{
-lean_object* x_136; 
-x_136 = lean_ctor_get(x_9, 1);
-lean_inc(x_136);
-lean_dec(x_9);
-x_1 = x_8;
-x_2 = x_136;
-goto _start;
-}
-default: 
-{
-lean_object* x_138; 
-x_138 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
-return x_138;
-}
-}
-}
-case 10:
-{
-lean_object* x_139; 
-x_139 = lean_ctor_get(x_8, 1);
-lean_inc(x_139);
-lean_dec(x_8);
-x_1 = x_139;
-x_2 = x_9;
-goto _start;
-}
-default: 
-{
-if (lean_obj_tag(x_9) == 10)
-{
-lean_object* x_141; 
-x_141 = lean_ctor_get(x_9, 1);
-lean_inc(x_141);
-lean_dec(x_9);
-x_1 = x_8;
-x_2 = x_141;
-goto _start;
-}
-else
-{
-lean_object* x_143; 
-x_143 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
-return x_143;
-}
-}
-}
-}
 }
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___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:
@@ -50000,80 +49944,81 @@ _start:
 lean_object* x_14; lean_object* x_52; 
 if (x_4 == 0)
 {
-lean_object* x_77; 
-x_77 = lean_box(0);
-x_52 = x_77;
-goto block_76;
+lean_object* x_75; 
+x_75 = lean_box(0);
+x_52 = x_75;
+goto block_74;
 }
 else
 {
 if (x_5 == 0)
 {
-lean_object* x_78; 
+lean_object* x_76; 
+lean_dec(x_7);
 lean_dec(x_1);
-x_78 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment_x27(x_2, x_3, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_78) == 0)
+x_76 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment_x27(x_2, x_3, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_76) == 0)
 {
-uint8_t x_79; 
-x_79 = !lean_is_exclusive(x_78);
-if (x_79 == 0)
+uint8_t x_77; 
+x_77 = !lean_is_exclusive(x_76);
+if (x_77 == 0)
 {
-lean_object* x_80; uint8_t x_81; uint8_t x_82; lean_object* x_83; 
-x_80 = lean_ctor_get(x_78, 0);
-x_81 = lean_unbox(x_80);
-lean_dec(x_80);
-x_82 = l_Bool_toLBool(x_81);
-x_83 = lean_box(x_82);
-lean_ctor_set(x_78, 0, x_83);
-return x_78;
-}
-else
-{
-lean_object* x_84; lean_object* x_85; uint8_t x_86; uint8_t x_87; lean_object* x_88; lean_object* x_89; 
-x_84 = lean_ctor_get(x_78, 0);
-x_85 = lean_ctor_get(x_78, 1);
-lean_inc(x_85);
-lean_inc(x_84);
+lean_object* x_78; uint8_t x_79; uint8_t x_80; lean_object* x_81; 
+x_78 = lean_ctor_get(x_76, 0);
+x_79 = lean_unbox(x_78);
 lean_dec(x_78);
-x_86 = lean_unbox(x_84);
-lean_dec(x_84);
-x_87 = l_Bool_toLBool(x_86);
-x_88 = lean_box(x_87);
-x_89 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_89, 0, x_88);
-lean_ctor_set(x_89, 1, x_85);
-return x_89;
+x_80 = l_Bool_toLBool(x_79);
+x_81 = lean_box(x_80);
+lean_ctor_set(x_76, 0, x_81);
+return x_76;
+}
+else
+{
+lean_object* x_82; lean_object* x_83; uint8_t x_84; uint8_t x_85; lean_object* x_86; lean_object* x_87; 
+x_82 = lean_ctor_get(x_76, 0);
+x_83 = lean_ctor_get(x_76, 1);
+lean_inc(x_83);
+lean_inc(x_82);
+lean_dec(x_76);
+x_84 = lean_unbox(x_82);
+lean_dec(x_82);
+x_85 = l_Bool_toLBool(x_84);
+x_86 = lean_box(x_85);
+x_87 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_87, 0, x_86);
+lean_ctor_set(x_87, 1, x_83);
+return x_87;
 }
 }
 else
 {
-uint8_t x_90; 
-x_90 = !lean_is_exclusive(x_78);
-if (x_90 == 0)
+uint8_t x_88; 
+x_88 = !lean_is_exclusive(x_76);
+if (x_88 == 0)
 {
-return x_78;
+return x_76;
 }
 else
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_91 = lean_ctor_get(x_78, 0);
-x_92 = lean_ctor_get(x_78, 1);
-lean_inc(x_92);
-lean_inc(x_91);
-lean_dec(x_78);
-x_93 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_93, 0, x_91);
-lean_ctor_set(x_93, 1, x_92);
-return x_93;
+lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_89 = lean_ctor_get(x_76, 0);
+x_90 = lean_ctor_get(x_76, 1);
+lean_inc(x_90);
+lean_inc(x_89);
+lean_dec(x_76);
+x_91 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_91, 0, x_89);
+lean_ctor_set(x_91, 1, x_90);
+return x_91;
 }
 }
 }
 else
 {
-lean_object* x_94; 
-x_94 = lean_box(0);
-x_52 = x_94;
-goto block_76;
+lean_object* x_92; 
+x_92 = lean_box(0);
+x_52 = x_92;
+goto block_74;
 }
 }
 block_51:
@@ -50191,7 +50136,7 @@ return x_38;
 }
 }
 }
-block_76:
+block_74:
 {
 lean_dec(x_52);
 if (x_4 == 0)
@@ -50202,107 +50147,101 @@ if (x_6 == 0)
 {
 uint8_t x_53; 
 x_53 = l_Lean_Expr_isMVar(x_7);
+lean_dec(x_7);
 if (x_53 == 0)
 {
-uint8_t x_54; lean_object* x_55; lean_object* x_56; 
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_3);
-lean_dec(x_2);
+lean_object* x_54; 
 lean_dec(x_1);
-x_54 = 2;
-x_55 = lean_box(x_54);
-x_56 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_13);
-return x_56;
+x_54 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqMData(x_2, x_3, x_9, x_10, x_11, x_12, x_13);
+return x_54;
+}
+else
+{
+lean_object* x_55; 
+x_55 = lean_box(0);
+x_14 = x_55;
+goto block_51;
+}
+}
+else
+{
+lean_object* x_56; 
+lean_dec(x_7);
+x_56 = lean_box(0);
+x_14 = x_56;
+goto block_51;
+}
 }
 else
 {
 lean_object* x_57; 
-x_57 = lean_box(0);
-x_14 = x_57;
-goto block_51;
-}
-}
-else
-{
-lean_object* x_58; 
-x_58 = lean_box(0);
-x_14 = x_58;
-goto block_51;
-}
-}
-else
-{
-lean_object* x_59; 
+lean_dec(x_7);
 lean_dec(x_1);
-x_59 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment_x27(x_3, x_2, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_59) == 0)
+x_57 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_processAssignment_x27(x_3, x_2, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_57) == 0)
 {
-uint8_t x_60; 
-x_60 = !lean_is_exclusive(x_59);
-if (x_60 == 0)
+uint8_t x_58; 
+x_58 = !lean_is_exclusive(x_57);
+if (x_58 == 0)
 {
-lean_object* x_61; uint8_t x_62; uint8_t x_63; lean_object* x_64; 
-x_61 = lean_ctor_get(x_59, 0);
-x_62 = lean_unbox(x_61);
-lean_dec(x_61);
-x_63 = l_Bool_toLBool(x_62);
-x_64 = lean_box(x_63);
-lean_ctor_set(x_59, 0, x_64);
-return x_59;
-}
-else
-{
-lean_object* x_65; lean_object* x_66; uint8_t x_67; uint8_t x_68; lean_object* x_69; lean_object* x_70; 
-x_65 = lean_ctor_get(x_59, 0);
-x_66 = lean_ctor_get(x_59, 1);
-lean_inc(x_66);
-lean_inc(x_65);
+lean_object* x_59; uint8_t x_60; uint8_t x_61; lean_object* x_62; 
+x_59 = lean_ctor_get(x_57, 0);
+x_60 = lean_unbox(x_59);
 lean_dec(x_59);
-x_67 = lean_unbox(x_65);
-lean_dec(x_65);
-x_68 = l_Bool_toLBool(x_67);
-x_69 = lean_box(x_68);
-x_70 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_66);
-return x_70;
+x_61 = l_Bool_toLBool(x_60);
+x_62 = lean_box(x_61);
+lean_ctor_set(x_57, 0, x_62);
+return x_57;
+}
+else
+{
+lean_object* x_63; lean_object* x_64; uint8_t x_65; uint8_t x_66; lean_object* x_67; lean_object* x_68; 
+x_63 = lean_ctor_get(x_57, 0);
+x_64 = lean_ctor_get(x_57, 1);
+lean_inc(x_64);
+lean_inc(x_63);
+lean_dec(x_57);
+x_65 = lean_unbox(x_63);
+lean_dec(x_63);
+x_66 = l_Bool_toLBool(x_65);
+x_67 = lean_box(x_66);
+x_68 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_64);
+return x_68;
 }
 }
 else
 {
-uint8_t x_71; 
-x_71 = !lean_is_exclusive(x_59);
-if (x_71 == 0)
+uint8_t x_69; 
+x_69 = !lean_is_exclusive(x_57);
+if (x_69 == 0)
 {
-return x_59;
+return x_57;
 }
 else
 {
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_59, 0);
-x_73 = lean_ctor_get(x_59, 1);
-lean_inc(x_73);
-lean_inc(x_72);
-lean_dec(x_59);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-return x_74;
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_57, 0);
+x_71 = lean_ctor_get(x_57, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_57);
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
 }
 }
 }
 }
 else
 {
-lean_object* x_75; 
+lean_object* x_73; 
+lean_dec(x_7);
 lean_dec(x_1);
-x_75 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickMVarMVar(x_2, x_3, x_9, x_10, x_11, x_12, x_13);
-return x_75;
+x_73 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickMVarMVar(x_2, x_3, x_9, x_10, x_11, x_12, x_13);
+return x_73;
 }
 }
 }
@@ -50368,35 +50307,25 @@ uint8_t x_197;
 x_197 = l_Lean_Expr_isMVar(x_12);
 if (x_197 == 0)
 {
-uint8_t x_198; lean_object* x_199; lean_object* x_200; 
+lean_object* x_198; 
 lean_dec(x_12);
 lean_dec(x_11);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_198 = 2;
-x_199 = lean_box(x_198);
-x_200 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_200, 0, x_199);
-lean_ctor_set(x_200, 1, x_7);
-return x_200;
+x_198 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqMData(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_198;
 }
 else
 {
-lean_object* x_201; 
-x_201 = lean_box(0);
-x_14 = x_201;
+lean_object* x_199; 
+x_199 = lean_box(0);
+x_14 = x_199;
 goto block_196;
 }
 }
 else
 {
-lean_object* x_202; 
-x_202 = lean_box(0);
-x_14 = x_202;
+lean_object* x_200; 
+x_200 = lean_box(0);
+x_14 = x_200;
 goto block_196;
 }
 block_196:
@@ -50696,7 +50625,6 @@ lean_dec(x_32);
 x_42 = lean_unbox(x_35);
 lean_dec(x_35);
 x_43 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___lambda__2(x_37, x_1, x_2, x_41, x_42, x_13, x_12, x_40, x_3, x_4, x_5, x_6, x_39);
-lean_dec(x_12);
 return x_43;
 }
 else
@@ -50756,7 +50684,6 @@ x_64 = lean_unbox(x_35);
 lean_dec(x_35);
 x_65 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___lambda__2(x_37, x_1, x_2, x_63, x_64, x_13, x_12, x_61, x_3, x_4, x_5, x_6, x_62);
 lean_dec(x_61);
-lean_dec(x_12);
 return x_65;
 }
 else
@@ -50781,7 +50708,6 @@ x_73 = lean_unbox(x_35);
 lean_dec(x_35);
 x_74 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___lambda__2(x_37, x_1, x_2, x_72, x_73, x_13, x_12, x_70, x_3, x_4, x_5, x_6, x_71);
 lean_dec(x_70);
-lean_dec(x_12);
 return x_74;
 }
 }
@@ -50825,7 +50751,6 @@ x_89 = lean_unbox(x_35);
 lean_dec(x_35);
 x_90 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___lambda__2(x_37, x_1, x_2, x_88, x_89, x_13, x_12, x_86, x_3, x_4, x_5, x_6, x_87);
 lean_dec(x_86);
-lean_dec(x_12);
 return x_90;
 }
 else
@@ -50849,7 +50774,6 @@ x_97 = lean_unbox(x_35);
 lean_dec(x_35);
 x_98 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___lambda__2(x_37, x_1, x_2, x_96, x_97, x_13, x_12, x_94, x_3, x_4, x_5, x_6, x_95);
 lean_dec(x_94);
-lean_dec(x_12);
 return x_98;
 }
 }
@@ -51142,53 +51066,97 @@ return x_195;
 }
 else
 {
-uint8_t x_203; lean_object* x_204; lean_object* x_205; 
+uint8_t x_201; lean_object* x_202; lean_object* x_203; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_203 = 1;
-x_204 = lean_box(x_203);
-x_205 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_205, 0, x_204);
-lean_ctor_set(x_205, 1, x_7);
-return x_205;
+x_201 = 1;
+x_202 = lean_box(x_201);
+x_203 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_203, 0, x_202);
+lean_ctor_set(x_203, 1, x_7);
+return x_203;
 }
 }
 else
 {
-uint8_t x_206; lean_object* x_207; lean_object* x_208; 
+uint8_t x_204; lean_object* x_205; lean_object* x_206; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_206 = 1;
-x_207 = lean_box(x_206);
-x_208 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_208, 0, x_207);
-lean_ctor_set(x_208, 1, x_7);
-return x_208;
+x_204 = 1;
+x_205 = lean_box(x_204);
+x_206 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_206, 0, x_205);
+lean_ctor_set(x_206, 1, x_7);
+return x_206;
 }
 }
 else
 {
-uint8_t x_209; lean_object* x_210; lean_object* x_211; 
+uint8_t x_207; lean_object* x_208; lean_object* x_209; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_209 = 1;
-x_210 = lean_box(x_209);
-x_211 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_211, 0, x_210);
-lean_ctor_set(x_211, 1, x_7);
-return x_211;
+x_207 = 1;
+x_208 = lean_box(x_207);
+x_209 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_209, 0, x_208);
+lean_ctor_set(x_209, 1, x_7);
+return x_209;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqMData(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; 
+x_8 = l_Lean_Expr_isMData(x_1);
+if (x_8 == 0)
+{
+uint8_t x_9; 
+x_9 = l_Lean_Expr_isMData(x_2);
+if (x_9 == 0)
+{
+uint8_t x_10; lean_object* x_11; lean_object* x_12; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_10 = 2;
+x_11 = lean_box(x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_7);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = l_Lean_Expr_mdataExpr_x21(x_2);
+lean_dec(x_2);
+x_14 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuick(x_1, x_13, x_3, x_4, x_5, x_6, x_7);
+return x_14;
+}
+}
+else
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = l_Lean_Expr_mdataExpr_x21(x_1);
+lean_dec(x_1);
+x_16 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuick(x_15, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_16;
 }
 }
 }
@@ -51217,7 +51185,6 @@ x_16 = lean_unbox(x_6);
 lean_dec(x_6);
 x_17 = l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_isDefEqQuickOther___lambda__2(x_1, x_2, x_3, x_14, x_15, x_16, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_8);
-lean_dec(x_7);
 return x_17;
 }
 }
@@ -63467,7 +63434,7 @@ lean_dec(x_3);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_ExprDefEq___hyg_13219_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_ExprDefEq___hyg_12996_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -63992,7 +63959,7 @@ l_Lean_Meta_isExprDefEqAuxImpl___closed__3 = _init_l_Lean_Meta_isExprDefEqAuxImp
 lean_mark_persistent(l_Lean_Meta_isExprDefEqAuxImpl___closed__3);
 l_Lean_Meta_isExprDefEqAuxImpl___closed__4 = _init_l_Lean_Meta_isExprDefEqAuxImpl___closed__4();
 lean_mark_persistent(l_Lean_Meta_isExprDefEqAuxImpl___closed__4);
-res = l_Lean_Meta_initFn____x40_Lean_Meta_ExprDefEq___hyg_13219_(lean_io_mk_world());
+res = l_Lean_Meta_initFn____x40_Lean_Meta_ExprDefEq___hyg_12996_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Meta/Match/Basic.c b/stage0/stdlib/Lean/Meta/Match/Basic.c
index 6f398cfef9..c4fb66e2e1 100644
--- a/stage0/stdlib/Lean/Meta/Match/Basic.c
+++ b/stage0/stdlib/Lean/Meta/Match/Basic.c
@@ -31,7 +31,6 @@ lean_object* l_Lean_mkSort(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Pattern_hasExprMVar___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_Example_applyFVarSubst___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_inaccessible_x3f(lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 uint64_t lean_uint64_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at_Lean_Meta_Match_toPattern___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -47,10 +46,8 @@ static lean_object* l_List_foldl___at_Lean_Meta_Match_Pattern_toMessageData___sp
 uint8_t l_Lean_Meta_isMatchValue(lean_object*);
 lean_object* lean_environment_find(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Problem_toMessageData___lambda__1___closed__4;
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_inaccessible_x3f___boxed(lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
-lean_object* l_Lean_annotation_x3f(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Example_toMessageData___closed__5;
 static lean_object* l_Lean_Meta_Match_Pattern_toMessageData___closed__12;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_instInhabitedAlt;
@@ -59,11 +56,9 @@ lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 static lean_object* l_Lean_Meta_Match_Problem_toMessageData___lambda__1___closed__8;
 lean_object* l_Lean_MessageData_ofList(lean_object*);
-static lean_object* l_Lean_Meta_Match_mkInaccessible___closed__1;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_Alt_replaceFVarId___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_instInhabitedPattern___closed__3;
 lean_object* l_Std_AssocList_find_x3f___at_Lean_Meta_FVarSubst_find_x3f___spec__1(lean_object*, lean_object*);
-static lean_object* l_Lean_Meta_Match_mkInaccessible___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Alt_applyFVarSubst___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_toPattern___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Problem_toMessageData___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -105,7 +100,6 @@ LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_toPattern___spec
 static lean_object* l_List_mapTRAux___at_Lean_Meta_Match_Alt_toMessageData___spec__1___closed__1;
 lean_object* l_Lean_Meta_FVarSubst_apply(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_instInhabitedProblem___closed__1;
-lean_object* l_Lean_mkAnnotation(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Pattern_toMessageData___closed__11;
 LEAN_EXPORT lean_object* l_List_mapM___at_Lean_Meta_Match_Pattern_toExpr_visit___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasExprMVar(lean_object*);
@@ -113,6 +107,7 @@ lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterAux___at_Lean_Meta_Match_Alt_replaceFVarId___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_foldl___at_Lean_Meta_Match_Example_toMessageData___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
+lean_object* l_Lean_inaccessible_x3f(lean_object*);
 static lean_object* l_Lean_Meta_Match_Alt_checkAndReplaceFVarId___lambda__3___closed__2;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_counterExamplesToMessageData___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Pattern_toMessageData___closed__9;
@@ -131,7 +126,6 @@ LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Meta_Match_Alt_checkAndRepl
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM___at_Lean_Meta_Match_Pattern_toExpr_visit___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Alt_checkAndReplaceFVarId___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkInaccessible(lean_object*);
 static lean_object* l_List_mapTRAux___at_Lean_Meta_Match_Alt_toMessageData___spec__1___closed__2;
 static lean_object* l_Lean_Meta_Match_toPattern___closed__4;
 uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
@@ -247,57 +241,13 @@ LEAN_EXPORT lean_object* l_List_foldr___at_Lean_Meta_Match_Pattern_hasExprMVar__
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Alt_applyFVarSubst(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Meta_Match_Alt_applyFVarSubst___spec__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_appendTR___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_mkInaccessible(lean_object*);
 lean_object* l_Lean_LocalDecl_applyFVarSubst(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Alt_toMessageData___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_Pattern_toExpr(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Match_Problem_toMessageData___lambda__1___closed__2;
 LEAN_EXPORT uint8_t l_List_foldr___at_Lean_Meta_Match_Pattern_hasExprMVar___spec__1(uint8_t, lean_object*);
 static lean_object* l_Lean_Meta_Match_Example_toMessageData___closed__2;
-static lean_object* _init_l_Lean_Meta_Match_mkInaccessible___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("_inaccessible");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Meta_Match_mkInaccessible___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Meta_Match_mkInaccessible___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_mkInaccessible(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Meta_Match_mkInaccessible___closed__2;
-x_3 = l_Lean_mkAnnotation(x_2, x_1);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_inaccessible_x3f(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Meta_Match_mkInaccessible___closed__2;
-x_3 = l_Lean_annotation_x3f(x_2, x_1);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_inaccessible_x3f___boxed(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = l_Lean_Meta_Match_inaccessible_x3f(x_1);
-lean_dec(x_1);
-return x_2;
-}
-}
 static uint64_t _init_l_Lean_Meta_Match_instInhabitedPattern___closed__1() {
 _start:
 {
@@ -1251,7 +1201,7 @@ lean_object* x_10; lean_object* x_11; lean_object* x_12;
 x_10 = lean_ctor_get(x_2, 0);
 lean_inc(x_10);
 lean_dec(x_2);
-x_11 = l_Lean_Meta_Match_mkInaccessible(x_10);
+x_11 = l_Lean_mkInaccessible(x_10);
 x_12 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_12, 0, x_11);
 lean_ctor_set(x_12, 1, x_7);
@@ -7406,7 +7356,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Match_toPattern(lean_object* x_1, lean_obje
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Lean_Meta_Match_inaccessible_x3f(x_1);
+x_7 = l_Lean_inaccessible_x3f(x_1);
 if (lean_obj_tag(x_7) == 0)
 {
 lean_object* x_8; 
@@ -7959,10 +7909,6 @@ lean_dec_ref(res);
 res = initialize_Lean_Meta_Match_CaseArraySizes(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Meta_Match_mkInaccessible___closed__1 = _init_l_Lean_Meta_Match_mkInaccessible___closed__1();
-lean_mark_persistent(l_Lean_Meta_Match_mkInaccessible___closed__1);
-l_Lean_Meta_Match_mkInaccessible___closed__2 = _init_l_Lean_Meta_Match_mkInaccessible___closed__2();
-lean_mark_persistent(l_Lean_Meta_Match_mkInaccessible___closed__2);
 l_Lean_Meta_Match_instInhabitedPattern___closed__1 = _init_l_Lean_Meta_Match_instInhabitedPattern___closed__1();
 l_Lean_Meta_Match_instInhabitedPattern___closed__2 = _init_l_Lean_Meta_Match_instInhabitedPattern___closed__2();
 lean_mark_persistent(l_Lean_Meta_Match_instInhabitedPattern___closed__2);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Cleanup.c b/stage0/stdlib/Lean/Meta/Tactic/Cleanup.c
index 62dad2b5a0..59230918f8 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Cleanup.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Cleanup.c
@@ -44,6 +44,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_cleanup(lean_object*, lean_object*, lean_ob
 LEAN_EXPORT lean_object* l_Std_RBNode_forIn_visit___at_Lean_Meta_cleanup_addUsedFVars___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_forIn_visit___at_Lean_Meta_cleanup_addUsedFVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Meta_cleanup___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_getMVarType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_cleanup___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_cleanup___spec__6(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
@@ -3320,7 +3321,7 @@ lean_inc(x_1);
 x_16 = l_Lean_Meta_cleanup_collectUsed(x_1, x_14, x_3, x_4, x_5, x_6, x_15);
 if (lean_obj_tag(x_16) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 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_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; uint8_t x_57; lean_object* x_58; 
+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_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; lean_object* x_65; 
 x_17 = lean_ctor_get(x_16, 0);
 lean_inc(x_17);
 x_18 = lean_ctor_get(x_16, 1);
@@ -3348,232 +3349,241 @@ lean_inc(x_27);
 x_28 = lean_ctor_get(x_26, 1);
 lean_inc(x_28);
 lean_dec(x_26);
-x_52 = l_Lean_Meta_getLocalInstances(x_3, x_4, x_5, x_6, x_28);
-x_53 = lean_ctor_get(x_52, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
-lean_inc(x_54);
-lean_dec(x_52);
-x_55 = lean_array_get_size(x_53);
-x_56 = lean_unsigned_to_nat(0u);
-x_57 = lean_nat_dec_lt(x_56, x_55);
+x_59 = l_Lean_Meta_getLocalInstances(x_3, x_4, x_5, x_6, x_28);
+x_60 = lean_ctor_get(x_59, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_59, 1);
+lean_inc(x_61);
+lean_dec(x_59);
+x_62 = lean_array_get_size(x_60);
+x_63 = lean_unsigned_to_nat(0u);
+x_64 = lean_nat_dec_lt(x_63, x_62);
+lean_inc(x_1);
+x_65 = l_Lean_Meta_getMVarType(x_1, x_3, x_4, x_5, x_6, x_61);
+if (x_64 == 0)
+{
+lean_dec(x_62);
+lean_dec(x_60);
+lean_dec(x_17);
+if (lean_obj_tag(x_65) == 0)
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_66 = lean_ctor_get(x_65, 0);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_65, 1);
+lean_inc(x_67);
+lean_dec(x_65);
+x_68 = l_Lean_Meta_cleanup___lambda__1___closed__2;
+x_29 = x_68;
+x_30 = x_66;
+x_31 = x_67;
+goto block_58;
+}
+else
+{
+uint8_t x_69; 
+lean_dec(x_27);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_69 = !lean_is_exclusive(x_65);
+if (x_69 == 0)
+{
+return x_65;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_65, 0);
+x_71 = lean_ctor_get(x_65, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_65);
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
+}
+}
+}
+else
+{
+uint8_t x_73; 
+x_73 = lean_nat_dec_le(x_62, x_62);
+if (x_73 == 0)
+{
+lean_dec(x_62);
+lean_dec(x_60);
+lean_dec(x_17);
+if (lean_obj_tag(x_65) == 0)
+{
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_65, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_65, 1);
+lean_inc(x_75);
+lean_dec(x_65);
+x_76 = l_Lean_Meta_cleanup___lambda__1___closed__2;
+x_29 = x_76;
+x_30 = x_74;
+x_31 = x_75;
+goto block_58;
+}
+else
+{
+uint8_t x_77; 
+lean_dec(x_27);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_77 = !lean_is_exclusive(x_65);
+if (x_77 == 0)
+{
+return x_65;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_78 = lean_ctor_get(x_65, 0);
+x_79 = lean_ctor_get(x_65, 1);
+lean_inc(x_79);
+lean_inc(x_78);
+lean_dec(x_65);
+x_80 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_80, 0, x_78);
+lean_ctor_set(x_80, 1, x_79);
+return x_80;
+}
+}
+}
+else
+{
+if (lean_obj_tag(x_65) == 0)
+{
+lean_object* x_81; lean_object* x_82; size_t x_83; size_t x_84; lean_object* x_85; lean_object* x_86; 
+x_81 = lean_ctor_get(x_65, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_65, 1);
+lean_inc(x_82);
+lean_dec(x_65);
+x_83 = 0;
+x_84 = lean_usize_of_nat(x_62);
+lean_dec(x_62);
+x_85 = l_Lean_Meta_cleanup___lambda__1___closed__2;
+x_86 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_cleanup___spec__6___at_Lean_Meta_cleanup___spec__7(x_17, x_60, x_83, x_84, x_85);
+lean_dec(x_60);
+lean_dec(x_17);
+x_29 = x_86;
+x_30 = x_81;
+x_31 = x_82;
+goto block_58;
+}
+else
+{
+uint8_t x_87; 
+lean_dec(x_62);
+lean_dec(x_60);
+lean_dec(x_27);
+lean_dec(x_17);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_87 = !lean_is_exclusive(x_65);
+if (x_87 == 0)
+{
+return x_65;
+}
+else
+{
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_65, 0);
+x_89 = lean_ctor_get(x_65, 1);
+lean_inc(x_89);
+lean_inc(x_88);
+lean_dec(x_65);
+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;
+}
+}
+}
+}
+block_58:
+{
+lean_object* x_32; 
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_1);
-x_58 = l_Lean_Meta_getMVarType_x27(x_1, x_3, x_4, x_5, x_6, x_54);
-if (x_57 == 0)
-{
-lean_dec(x_55);
-lean_dec(x_53);
-lean_dec(x_17);
-if (lean_obj_tag(x_58) == 0)
-{
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_58, 0);
-lean_inc(x_59);
-x_60 = lean_ctor_get(x_58, 1);
-lean_inc(x_60);
-lean_dec(x_58);
-x_61 = l_Lean_Meta_cleanup___lambda__1___closed__2;
-x_29 = x_61;
-x_30 = x_59;
-x_31 = x_60;
-goto block_51;
-}
-else
-{
-uint8_t x_62; 
-lean_dec(x_27);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_62 = !lean_is_exclusive(x_58);
-if (x_62 == 0)
-{
-return x_58;
-}
-else
-{
-lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_63 = lean_ctor_get(x_58, 0);
-x_64 = lean_ctor_get(x_58, 1);
-lean_inc(x_64);
-lean_inc(x_63);
-lean_dec(x_58);
-x_65 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_65, 0, x_63);
-lean_ctor_set(x_65, 1, x_64);
-return x_65;
-}
-}
-}
-else
-{
-uint8_t x_66; 
-x_66 = lean_nat_dec_le(x_55, x_55);
-if (x_66 == 0)
-{
-lean_dec(x_55);
-lean_dec(x_53);
-lean_dec(x_17);
-if (lean_obj_tag(x_58) == 0)
-{
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_67 = lean_ctor_get(x_58, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get(x_58, 1);
-lean_inc(x_68);
-lean_dec(x_58);
-x_69 = l_Lean_Meta_cleanup___lambda__1___closed__2;
-x_29 = x_69;
-x_30 = x_67;
-x_31 = x_68;
-goto block_51;
-}
-else
-{
-uint8_t x_70; 
-lean_dec(x_27);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_70 = !lean_is_exclusive(x_58);
-if (x_70 == 0)
-{
-return x_58;
-}
-else
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_71 = lean_ctor_get(x_58, 0);
-x_72 = lean_ctor_get(x_58, 1);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_dec(x_58);
-x_73 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-return x_73;
-}
-}
-}
-else
-{
-if (lean_obj_tag(x_58) == 0)
-{
-lean_object* x_74; lean_object* x_75; size_t x_76; size_t x_77; lean_object* x_78; lean_object* x_79; 
-x_74 = lean_ctor_get(x_58, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_58, 1);
-lean_inc(x_75);
-lean_dec(x_58);
-x_76 = 0;
-x_77 = lean_usize_of_nat(x_55);
-lean_dec(x_55);
-x_78 = l_Lean_Meta_cleanup___lambda__1___closed__2;
-x_79 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_cleanup___spec__6___at_Lean_Meta_cleanup___spec__7(x_17, x_53, x_76, x_77, x_78);
-lean_dec(x_53);
-lean_dec(x_17);
-x_29 = x_79;
-x_30 = x_74;
-x_31 = x_75;
-goto block_51;
-}
-else
-{
-uint8_t x_80; 
-lean_dec(x_55);
-lean_dec(x_53);
-lean_dec(x_27);
-lean_dec(x_17);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_80 = !lean_is_exclusive(x_58);
-if (x_80 == 0)
-{
-return x_58;
-}
-else
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_58, 0);
-x_82 = lean_ctor_get(x_58, 1);
-lean_inc(x_82);
-lean_inc(x_81);
-lean_dec(x_58);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_81);
-lean_ctor_set(x_83, 1, x_82);
-return x_83;
-}
-}
-}
-}
-block_51:
-{
-lean_object* x_32; 
-lean_inc(x_1);
-x_32 = l_Lean_Meta_getMVarTag(x_1, x_3, x_4, x_5, x_6, x_31);
+x_32 = l_Lean_Meta_instantiateMVars(x_30, x_3, x_4, x_5, x_6, x_31);
 if (lean_obj_tag(x_32) == 0)
 {
-lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
 x_33 = lean_ctor_get(x_32, 0);
 lean_inc(x_33);
 x_34 = lean_ctor_get(x_32, 1);
 lean_inc(x_34);
 lean_dec(x_32);
-x_35 = 2;
-x_36 = lean_unsigned_to_nat(0u);
-x_37 = l_Lean_Meta_mkFreshExprMVarAt(x_27, x_29, x_30, x_35, x_33, x_36, x_3, x_4, x_5, x_6, x_34);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-lean_inc(x_38);
-x_40 = l_Lean_Meta_assignExprMVar(x_1, x_38, x_3, x_4, x_5, x_6, x_39);
+lean_inc(x_1);
+x_35 = l_Lean_Meta_getMVarTag(x_1, x_3, x_4, x_5, x_6, x_34);
+if (lean_obj_tag(x_35) == 0)
+{
+lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+x_36 = lean_ctor_get(x_35, 0);
+lean_inc(x_36);
+x_37 = lean_ctor_get(x_35, 1);
+lean_inc(x_37);
+lean_dec(x_35);
+x_38 = 2;
+x_39 = lean_unsigned_to_nat(0u);
+x_40 = l_Lean_Meta_mkFreshExprMVarAt(x_27, x_29, x_33, x_38, x_36, x_39, x_3, x_4, x_5, x_6, x_37);
+x_41 = lean_ctor_get(x_40, 0);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
+lean_dec(x_40);
+lean_inc(x_41);
+x_43 = l_Lean_Meta_assignExprMVar(x_1, x_41, x_3, x_4, x_5, x_6, x_42);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_41 = !lean_is_exclusive(x_40);
-if (x_41 == 0)
+x_44 = !lean_is_exclusive(x_43);
+if (x_44 == 0)
 {
-lean_object* x_42; lean_object* x_43; 
-x_42 = lean_ctor_get(x_40, 0);
-lean_dec(x_42);
-x_43 = l_Lean_Expr_mvarId_x21(x_38);
-lean_dec(x_38);
-lean_ctor_set(x_40, 0, x_43);
-return x_40;
+lean_object* x_45; lean_object* x_46; 
+x_45 = lean_ctor_get(x_43, 0);
+lean_dec(x_45);
+x_46 = l_Lean_Expr_mvarId_x21(x_41);
+lean_dec(x_41);
+lean_ctor_set(x_43, 0, x_46);
+return x_43;
 }
 else
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_40, 1);
-lean_inc(x_44);
-lean_dec(x_40);
-x_45 = l_Lean_Expr_mvarId_x21(x_38);
-lean_dec(x_38);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_45);
-lean_ctor_set(x_46, 1, x_44);
-return x_46;
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_43, 1);
+lean_inc(x_47);
+lean_dec(x_43);
+x_48 = l_Lean_Expr_mvarId_x21(x_41);
+lean_dec(x_41);
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_47);
+return x_49;
 }
 }
 else
 {
-uint8_t x_47; 
-lean_dec(x_30);
+uint8_t x_50; 
+lean_dec(x_33);
 lean_dec(x_29);
 lean_dec(x_27);
 lean_dec(x_6);
@@ -3581,81 +3591,111 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_47 = !lean_is_exclusive(x_32);
-if (x_47 == 0)
+x_50 = !lean_is_exclusive(x_35);
+if (x_50 == 0)
+{
+return x_35;
+}
+else
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_35, 0);
+x_52 = lean_ctor_get(x_35, 1);
+lean_inc(x_52);
+lean_inc(x_51);
+lean_dec(x_35);
+x_53 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set(x_53, 1, x_52);
+return x_53;
+}
+}
+}
+else
+{
+uint8_t x_54; 
+lean_dec(x_29);
+lean_dec(x_27);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_54 = !lean_is_exclusive(x_32);
+if (x_54 == 0)
 {
 return x_32;
 }
 else
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_32, 0);
-x_49 = lean_ctor_get(x_32, 1);
-lean_inc(x_49);
-lean_inc(x_48);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_32, 0);
+x_56 = lean_ctor_get(x_32, 1);
+lean_inc(x_56);
+lean_inc(x_55);
 lean_dec(x_32);
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-return x_50;
+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
 {
-uint8_t x_84; 
+uint8_t x_91; 
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_84 = !lean_is_exclusive(x_16);
-if (x_84 == 0)
+x_91 = !lean_is_exclusive(x_16);
+if (x_91 == 0)
 {
 return x_16;
 }
 else
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_16, 0);
-x_86 = lean_ctor_get(x_16, 1);
-lean_inc(x_86);
-lean_inc(x_85);
+lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_92 = lean_ctor_get(x_16, 0);
+x_93 = lean_ctor_get(x_16, 1);
+lean_inc(x_93);
+lean_inc(x_92);
 lean_dec(x_16);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
+x_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_88; 
+uint8_t x_95; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_88 = !lean_is_exclusive(x_8);
-if (x_88 == 0)
+x_95 = !lean_is_exclusive(x_8);
+if (x_95 == 0)
 {
 return x_8;
 }
 else
 {
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_8, 0);
-x_90 = lean_ctor_get(x_8, 1);
-lean_inc(x_90);
-lean_inc(x_89);
+lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_96 = lean_ctor_get(x_8, 0);
+x_97 = lean_ctor_get(x_8, 1);
+lean_inc(x_97);
+lean_inc(x_96);
 lean_dec(x_8);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
+x_98 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_98, 0, x_96);
+lean_ctor_set(x_98, 1, x_97);
+return x_98;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/Rewrite.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/Rewrite.c
index da75f0005b..a9373c6d8c 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/Rewrite.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/Rewrite.c
@@ -132,6 +132,7 @@ LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Meta_Simp_tryLemmaWithExtraArg
 LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Meta_Simp_synthesizeArgs_synthesizeInstance___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore_go___lambda__3___closed__3;
+lean_object* l_Array_reverse___rarg(lean_object*);
 static lean_object* l_Lean_Meta_Simp_rewriteUsingDecide_x3f___closed__6;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore_go___lambda__3___closed__5;
@@ -5227,7 +5228,7 @@ return x_2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-lean_object* x_17; lean_object* x_18; 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_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_17 = lean_unsigned_to_nat(0u);
 x_18 = lean_unsigned_to_nat(1u);
 lean_inc(x_8);
@@ -5251,536 +5252,537 @@ lean_inc(x_25);
 x_26 = lean_ctor_get(x_23, 1);
 lean_inc(x_26);
 lean_dec(x_23);
+x_27 = l_Array_reverse___rarg(x_25);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_27 = l___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore_go(x_1, x_2, x_3, x_4, x_5, x_7, x_9, x_26, x_10, x_11, x_12, x_13, x_14, x_15, x_24);
-if (lean_obj_tag(x_27) == 0)
-{
-lean_object* x_28; 
-x_28 = lean_ctor_get(x_27, 0);
-lean_inc(x_28);
+x_28 = l___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore_go(x_1, x_2, x_3, x_4, x_5, x_7, x_9, x_26, x_10, x_11, x_12, x_13, x_14, x_15, x_24);
 if (lean_obj_tag(x_28) == 0)
 {
-uint8_t x_29; 
-lean_dec(x_25);
+lean_object* x_29; 
+x_29 = lean_ctor_get(x_28, 0);
+lean_inc(x_29);
+if (lean_obj_tag(x_29) == 0)
+{
+uint8_t x_30; 
+lean_dec(x_27);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-x_29 = !lean_is_exclusive(x_27);
-if (x_29 == 0)
+x_30 = !lean_is_exclusive(x_28);
+if (x_30 == 0)
 {
-lean_object* x_30; lean_object* x_31; 
-x_30 = lean_ctor_get(x_27, 0);
-lean_dec(x_30);
-x_31 = lean_box(0);
-lean_ctor_set(x_27, 0, x_31);
-return x_27;
+lean_object* x_31; lean_object* x_32; 
+x_31 = lean_ctor_get(x_28, 0);
+lean_dec(x_31);
+x_32 = lean_box(0);
+lean_ctor_set(x_28, 0, x_32);
+return x_28;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_27, 1);
-lean_inc(x_32);
-lean_dec(x_27);
-x_33 = lean_box(0);
-x_34 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_32);
-return x_34;
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_28, 1);
+lean_inc(x_33);
+lean_dec(x_28);
+x_34 = lean_box(0);
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_33);
+return x_35;
 }
 }
 else
 {
-uint8_t x_35; 
-x_35 = !lean_is_exclusive(x_28);
-if (x_35 == 0)
+uint8_t x_36; 
+x_36 = !lean_is_exclusive(x_29);
+if (x_36 == 0)
 {
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_ctor_get(x_28, 0);
-x_37 = lean_ctor_get(x_36, 1);
-lean_inc(x_37);
-if (lean_obj_tag(x_37) == 0)
+lean_object* x_37; lean_object* x_38; 
+x_37 = lean_ctor_get(x_29, 0);
+x_38 = lean_ctor_get(x_37, 1);
+lean_inc(x_38);
+if (lean_obj_tag(x_38) == 0)
 {
-uint8_t x_38; 
+uint8_t x_39; 
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-x_38 = !lean_is_exclusive(x_27);
-if (x_38 == 0)
+x_39 = !lean_is_exclusive(x_28);
+if (x_39 == 0)
 {
-lean_object* x_39; uint8_t x_40; 
-x_39 = lean_ctor_get(x_27, 0);
-lean_dec(x_39);
-x_40 = !lean_is_exclusive(x_36);
-if (x_40 == 0)
+lean_object* x_40; uint8_t x_41; 
+x_40 = lean_ctor_get(x_28, 0);
+lean_dec(x_40);
+x_41 = !lean_is_exclusive(x_37);
+if (x_41 == 0)
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_41 = lean_ctor_get(x_36, 0);
-x_42 = lean_ctor_get(x_36, 1);
-lean_dec(x_42);
-x_43 = l_Lean_mkAppN(x_41, x_25);
-x_44 = lean_box(0);
-lean_ctor_set(x_36, 1, x_44);
-lean_ctor_set(x_36, 0, x_43);
-return x_27;
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_42 = lean_ctor_get(x_37, 0);
+x_43 = lean_ctor_get(x_37, 1);
+lean_dec(x_43);
+x_44 = l_Lean_mkAppN(x_42, x_27);
+x_45 = lean_box(0);
+lean_ctor_set(x_37, 1, x_45);
+lean_ctor_set(x_37, 0, x_44);
+return x_28;
 }
 else
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_45 = lean_ctor_get(x_36, 0);
-lean_inc(x_45);
-lean_dec(x_36);
-x_46 = l_Lean_mkAppN(x_45, x_25);
-x_47 = lean_box(0);
-x_48 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-lean_ctor_set(x_28, 0, x_48);
-return x_27;
-}
-}
-else
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_49 = lean_ctor_get(x_27, 1);
-lean_inc(x_49);
-lean_dec(x_27);
-x_50 = lean_ctor_get(x_36, 0);
-lean_inc(x_50);
-if (lean_is_exclusive(x_36)) {
- lean_ctor_release(x_36, 0);
- lean_ctor_release(x_36, 1);
- x_51 = x_36;
-} else {
- lean_dec_ref(x_36);
- x_51 = lean_box(0);
-}
-x_52 = l_Lean_mkAppN(x_50, x_25);
-x_53 = lean_box(0);
-if (lean_is_scalar(x_51)) {
- x_54 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_54 = x_51;
-}
-lean_ctor_set(x_54, 0, x_52);
-lean_ctor_set(x_54, 1, x_53);
-lean_ctor_set(x_28, 0, x_54);
-x_55 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_55, 0, x_28);
-lean_ctor_set(x_55, 1, x_49);
-return x_55;
-}
-}
-else
-{
-lean_object* x_56; uint8_t x_57; 
-x_56 = lean_ctor_get(x_27, 1);
-lean_inc(x_56);
-lean_dec(x_27);
-x_57 = !lean_is_exclusive(x_36);
-if (x_57 == 0)
-{
-lean_object* x_58; lean_object* x_59; uint8_t x_60; 
-x_58 = lean_ctor_get(x_36, 0);
-x_59 = lean_ctor_get(x_36, 1);
-lean_dec(x_59);
-x_60 = !lean_is_exclusive(x_37);
-if (x_60 == 0)
-{
-lean_object* x_61; lean_object* x_62; size_t x_63; size_t x_64; lean_object* x_65; 
-x_61 = lean_ctor_get(x_37, 0);
-x_62 = lean_array_get_size(x_25);
-x_63 = lean_usize_of_nat(x_62);
-lean_dec(x_62);
-x_64 = 0;
-x_65 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_25, x_63, x_64, x_61, x_10, x_11, x_12, x_13, x_14, x_15, x_56);
-lean_dec(x_11);
-lean_dec(x_10);
-if (lean_obj_tag(x_65) == 0)
-{
-uint8_t x_66; 
-x_66 = !lean_is_exclusive(x_65);
-if (x_66 == 0)
-{
-lean_object* x_67; lean_object* x_68; 
-x_67 = lean_ctor_get(x_65, 0);
-x_68 = l_Lean_mkAppN(x_58, x_25);
-lean_ctor_set(x_37, 0, x_67);
-lean_ctor_set(x_36, 0, x_68);
-lean_ctor_set(x_65, 0, x_28);
-return x_65;
-}
-else
-{
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_69 = lean_ctor_get(x_65, 0);
-x_70 = lean_ctor_get(x_65, 1);
-lean_inc(x_70);
-lean_inc(x_69);
-lean_dec(x_65);
-x_71 = l_Lean_mkAppN(x_58, x_25);
-lean_ctor_set(x_37, 0, x_69);
-lean_ctor_set(x_36, 0, x_71);
-x_72 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_72, 0, x_28);
-lean_ctor_set(x_72, 1, x_70);
-return x_72;
-}
-}
-else
-{
-uint8_t x_73; 
-lean_free_object(x_37);
-lean_free_object(x_36);
-lean_dec(x_58);
-lean_free_object(x_28);
-lean_dec(x_25);
-x_73 = !lean_is_exclusive(x_65);
-if (x_73 == 0)
-{
-return x_65;
-}
-else
-{
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_65, 0);
-x_75 = lean_ctor_get(x_65, 1);
-lean_inc(x_75);
-lean_inc(x_74);
-lean_dec(x_65);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_74);
-lean_ctor_set(x_76, 1, x_75);
-return x_76;
-}
-}
-}
-else
-{
-lean_object* x_77; lean_object* x_78; size_t x_79; size_t x_80; lean_object* x_81; 
-x_77 = lean_ctor_get(x_37, 0);
-lean_inc(x_77);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_46 = lean_ctor_get(x_37, 0);
+lean_inc(x_46);
 lean_dec(x_37);
-x_78 = lean_array_get_size(x_25);
-x_79 = lean_usize_of_nat(x_78);
-lean_dec(x_78);
-x_80 = 0;
-x_81 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_25, x_79, x_80, x_77, x_10, x_11, x_12, x_13, x_14, x_15, x_56);
-lean_dec(x_11);
-lean_dec(x_10);
-if (lean_obj_tag(x_81) == 0)
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_82 = lean_ctor_get(x_81, 0);
-lean_inc(x_82);
-x_83 = lean_ctor_get(x_81, 1);
-lean_inc(x_83);
-if (lean_is_exclusive(x_81)) {
- lean_ctor_release(x_81, 0);
- lean_ctor_release(x_81, 1);
- x_84 = x_81;
-} else {
- lean_dec_ref(x_81);
- x_84 = lean_box(0);
-}
-x_85 = l_Lean_mkAppN(x_58, x_25);
-x_86 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_86, 0, x_82);
-lean_ctor_set(x_36, 1, x_86);
-lean_ctor_set(x_36, 0, x_85);
-if (lean_is_scalar(x_84)) {
- x_87 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_87 = x_84;
-}
-lean_ctor_set(x_87, 0, x_28);
-lean_ctor_set(x_87, 1, x_83);
-return x_87;
-}
-else
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-lean_free_object(x_36);
-lean_dec(x_58);
-lean_free_object(x_28);
-lean_dec(x_25);
-x_88 = lean_ctor_get(x_81, 0);
-lean_inc(x_88);
-x_89 = lean_ctor_get(x_81, 1);
-lean_inc(x_89);
-if (lean_is_exclusive(x_81)) {
- lean_ctor_release(x_81, 0);
- lean_ctor_release(x_81, 1);
- x_90 = x_81;
-} else {
- lean_dec_ref(x_81);
- x_90 = lean_box(0);
-}
-if (lean_is_scalar(x_90)) {
- x_91 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_91 = x_90;
-}
-lean_ctor_set(x_91, 0, x_88);
-lean_ctor_set(x_91, 1, x_89);
-return x_91;
-}
+x_47 = l_Lean_mkAppN(x_46, x_27);
+x_48 = lean_box(0);
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+lean_ctor_set(x_29, 0, x_49);
+return x_28;
 }
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; size_t x_96; size_t x_97; lean_object* x_98; 
-x_92 = lean_ctor_get(x_36, 0);
-lean_inc(x_92);
-lean_dec(x_36);
-x_93 = lean_ctor_get(x_37, 0);
-lean_inc(x_93);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_50 = lean_ctor_get(x_28, 1);
+lean_inc(x_50);
+lean_dec(x_28);
+x_51 = lean_ctor_get(x_37, 0);
+lean_inc(x_51);
 if (lean_is_exclusive(x_37)) {
  lean_ctor_release(x_37, 0);
- x_94 = x_37;
+ lean_ctor_release(x_37, 1);
+ x_52 = x_37;
 } else {
  lean_dec_ref(x_37);
- x_94 = lean_box(0);
+ x_52 = lean_box(0);
 }
-x_95 = lean_array_get_size(x_25);
-x_96 = lean_usize_of_nat(x_95);
-lean_dec(x_95);
-x_97 = 0;
-x_98 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_25, x_96, x_97, x_93, x_10, x_11, x_12, x_13, x_14, x_15, x_56);
+x_53 = l_Lean_mkAppN(x_51, x_27);
+x_54 = lean_box(0);
+if (lean_is_scalar(x_52)) {
+ x_55 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_55 = x_52;
+}
+lean_ctor_set(x_55, 0, x_53);
+lean_ctor_set(x_55, 1, x_54);
+lean_ctor_set(x_29, 0, x_55);
+x_56 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_56, 0, x_29);
+lean_ctor_set(x_56, 1, x_50);
+return x_56;
+}
+}
+else
+{
+lean_object* x_57; uint8_t x_58; 
+x_57 = lean_ctor_get(x_28, 1);
+lean_inc(x_57);
+lean_dec(x_28);
+x_58 = !lean_is_exclusive(x_37);
+if (x_58 == 0)
+{
+lean_object* x_59; lean_object* x_60; uint8_t x_61; 
+x_59 = lean_ctor_get(x_37, 0);
+x_60 = lean_ctor_get(x_37, 1);
+lean_dec(x_60);
+x_61 = !lean_is_exclusive(x_38);
+if (x_61 == 0)
+{
+lean_object* x_62; lean_object* x_63; size_t x_64; size_t x_65; lean_object* x_66; 
+x_62 = lean_ctor_get(x_38, 0);
+x_63 = lean_array_get_size(x_27);
+x_64 = lean_usize_of_nat(x_63);
+lean_dec(x_63);
+x_65 = 0;
+x_66 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_27, x_64, x_65, x_62, x_10, x_11, x_12, x_13, x_14, x_15, x_57);
 lean_dec(x_11);
 lean_dec(x_10);
-if (lean_obj_tag(x_98) == 0)
+if (lean_obj_tag(x_66) == 0)
 {
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; 
-x_99 = lean_ctor_get(x_98, 0);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
+uint8_t x_67; 
+x_67 = !lean_is_exclusive(x_66);
+if (x_67 == 0)
+{
+lean_object* x_68; lean_object* x_69; 
+x_68 = lean_ctor_get(x_66, 0);
+x_69 = l_Lean_mkAppN(x_59, x_27);
+lean_ctor_set(x_38, 0, x_68);
+lean_ctor_set(x_37, 0, x_69);
+lean_ctor_set(x_66, 0, x_29);
+return x_66;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_70 = lean_ctor_get(x_66, 0);
+x_71 = lean_ctor_get(x_66, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_66);
+x_72 = l_Lean_mkAppN(x_59, x_27);
+lean_ctor_set(x_38, 0, x_70);
+lean_ctor_set(x_37, 0, x_72);
+x_73 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_73, 0, x_29);
+lean_ctor_set(x_73, 1, x_71);
+return x_73;
+}
+}
+else
+{
+uint8_t x_74; 
+lean_free_object(x_38);
+lean_free_object(x_37);
+lean_dec(x_59);
+lean_free_object(x_29);
+lean_dec(x_27);
+x_74 = !lean_is_exclusive(x_66);
+if (x_74 == 0)
+{
+return x_66;
+}
+else
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_75 = lean_ctor_get(x_66, 0);
+x_76 = lean_ctor_get(x_66, 1);
+lean_inc(x_76);
+lean_inc(x_75);
+lean_dec(x_66);
+x_77 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_77, 0, x_75);
+lean_ctor_set(x_77, 1, x_76);
+return x_77;
+}
+}
+}
+else
+{
+lean_object* x_78; lean_object* x_79; size_t x_80; size_t x_81; lean_object* x_82; 
+x_78 = lean_ctor_get(x_38, 0);
+lean_inc(x_78);
+lean_dec(x_38);
+x_79 = lean_array_get_size(x_27);
+x_80 = lean_usize_of_nat(x_79);
+lean_dec(x_79);
+x_81 = 0;
+x_82 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_27, x_80, x_81, x_78, x_10, x_11, x_12, x_13, x_14, x_15, x_57);
+lean_dec(x_11);
+lean_dec(x_10);
+if (lean_obj_tag(x_82) == 0)
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
+lean_inc(x_84);
+if (lean_is_exclusive(x_82)) {
+ lean_ctor_release(x_82, 0);
+ lean_ctor_release(x_82, 1);
+ x_85 = x_82;
+} else {
+ lean_dec_ref(x_82);
+ x_85 = lean_box(0);
+}
+x_86 = l_Lean_mkAppN(x_59, x_27);
+x_87 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_87, 0, x_83);
+lean_ctor_set(x_37, 1, x_87);
+lean_ctor_set(x_37, 0, x_86);
+if (lean_is_scalar(x_85)) {
+ x_88 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_88 = x_85;
+}
+lean_ctor_set(x_88, 0, x_29);
+lean_ctor_set(x_88, 1, x_84);
+return x_88;
+}
+else
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+lean_free_object(x_37);
+lean_dec(x_59);
+lean_free_object(x_29);
+lean_dec(x_27);
+x_89 = lean_ctor_get(x_82, 0);
+lean_inc(x_89);
+x_90 = lean_ctor_get(x_82, 1);
+lean_inc(x_90);
+if (lean_is_exclusive(x_82)) {
+ lean_ctor_release(x_82, 0);
+ lean_ctor_release(x_82, 1);
+ x_91 = x_82;
+} else {
+ lean_dec_ref(x_82);
+ x_91 = lean_box(0);
+}
+if (lean_is_scalar(x_91)) {
+ x_92 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_92 = x_91;
+}
+lean_ctor_set(x_92, 0, x_89);
+lean_ctor_set(x_92, 1, x_90);
+return x_92;
+}
+}
+}
+else
+{
+lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; size_t x_97; size_t x_98; lean_object* x_99; 
+x_93 = lean_ctor_get(x_37, 0);
+lean_inc(x_93);
+lean_dec(x_37);
+x_94 = lean_ctor_get(x_38, 0);
+lean_inc(x_94);
+if (lean_is_exclusive(x_38)) {
+ lean_ctor_release(x_38, 0);
+ x_95 = x_38;
+} else {
+ lean_dec_ref(x_38);
+ x_95 = lean_box(0);
+}
+x_96 = lean_array_get_size(x_27);
+x_97 = lean_usize_of_nat(x_96);
+lean_dec(x_96);
+x_98 = 0;
+x_99 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_27, x_97, x_98, x_94, x_10, x_11, x_12, x_13, x_14, x_15, x_57);
+lean_dec(x_11);
+lean_dec(x_10);
+if (lean_obj_tag(x_99) == 0)
+{
+lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_101 = x_98;
+x_101 = lean_ctor_get(x_99, 1);
+lean_inc(x_101);
+if (lean_is_exclusive(x_99)) {
+ lean_ctor_release(x_99, 0);
+ lean_ctor_release(x_99, 1);
+ x_102 = x_99;
 } else {
- lean_dec_ref(x_98);
- x_101 = lean_box(0);
+ lean_dec_ref(x_99);
+ x_102 = lean_box(0);
 }
-x_102 = l_Lean_mkAppN(x_92, x_25);
-if (lean_is_scalar(x_94)) {
- x_103 = lean_alloc_ctor(1, 1, 0);
+x_103 = l_Lean_mkAppN(x_93, x_27);
+if (lean_is_scalar(x_95)) {
+ x_104 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_103 = x_94;
+ x_104 = x_95;
 }
-lean_ctor_set(x_103, 0, x_99);
-x_104 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_104, 0, x_102);
-lean_ctor_set(x_104, 1, x_103);
-lean_ctor_set(x_28, 0, x_104);
-if (lean_is_scalar(x_101)) {
- x_105 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_104, 0, x_100);
+x_105 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_105, 0, x_103);
+lean_ctor_set(x_105, 1, x_104);
+lean_ctor_set(x_29, 0, x_105);
+if (lean_is_scalar(x_102)) {
+ x_106 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_105 = x_101;
+ x_106 = x_102;
 }
-lean_ctor_set(x_105, 0, x_28);
-lean_ctor_set(x_105, 1, x_100);
-return x_105;
+lean_ctor_set(x_106, 0, x_29);
+lean_ctor_set(x_106, 1, x_101);
+return x_106;
 }
 else
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-lean_dec(x_94);
-lean_dec(x_92);
-lean_free_object(x_28);
-lean_dec(x_25);
-x_106 = lean_ctor_get(x_98, 0);
-lean_inc(x_106);
-x_107 = lean_ctor_get(x_98, 1);
+lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+lean_dec(x_95);
+lean_dec(x_93);
+lean_free_object(x_29);
+lean_dec(x_27);
+x_107 = lean_ctor_get(x_99, 0);
 lean_inc(x_107);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_108 = x_98;
+x_108 = lean_ctor_get(x_99, 1);
+lean_inc(x_108);
+if (lean_is_exclusive(x_99)) {
+ lean_ctor_release(x_99, 0);
+ lean_ctor_release(x_99, 1);
+ x_109 = x_99;
 } else {
- lean_dec_ref(x_98);
- x_108 = lean_box(0);
+ lean_dec_ref(x_99);
+ x_109 = lean_box(0);
 }
-if (lean_is_scalar(x_108)) {
- x_109 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_109)) {
+ x_110 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_109 = x_108;
+ x_110 = x_109;
 }
-lean_ctor_set(x_109, 0, x_106);
-lean_ctor_set(x_109, 1, x_107);
-return x_109;
+lean_ctor_set(x_110, 0, x_107);
+lean_ctor_set(x_110, 1, x_108);
+return x_110;
 }
 }
 }
 }
 else
 {
-lean_object* x_110; lean_object* x_111; 
-x_110 = lean_ctor_get(x_28, 0);
-lean_inc(x_110);
-lean_dec(x_28);
-x_111 = lean_ctor_get(x_110, 1);
+lean_object* x_111; lean_object* x_112; 
+x_111 = lean_ctor_get(x_29, 0);
 lean_inc(x_111);
-if (lean_obj_tag(x_111) == 0)
+lean_dec(x_29);
+x_112 = lean_ctor_get(x_111, 1);
+lean_inc(x_112);
+if (lean_obj_tag(x_112) == 0)
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+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_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-x_112 = lean_ctor_get(x_27, 1);
-lean_inc(x_112);
-if (lean_is_exclusive(x_27)) {
- lean_ctor_release(x_27, 0);
- lean_ctor_release(x_27, 1);
- x_113 = x_27;
+x_113 = lean_ctor_get(x_28, 1);
+lean_inc(x_113);
+if (lean_is_exclusive(x_28)) {
+ lean_ctor_release(x_28, 0);
+ lean_ctor_release(x_28, 1);
+ x_114 = x_28;
 } else {
- lean_dec_ref(x_27);
- x_113 = lean_box(0);
+ lean_dec_ref(x_28);
+ x_114 = lean_box(0);
 }
-x_114 = lean_ctor_get(x_110, 0);
-lean_inc(x_114);
-if (lean_is_exclusive(x_110)) {
- lean_ctor_release(x_110, 0);
- lean_ctor_release(x_110, 1);
- x_115 = x_110;
-} else {
- lean_dec_ref(x_110);
- x_115 = lean_box(0);
-}
-x_116 = l_Lean_mkAppN(x_114, x_25);
-x_117 = lean_box(0);
-if (lean_is_scalar(x_115)) {
- x_118 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_118 = x_115;
-}
-lean_ctor_set(x_118, 0, x_116);
-lean_ctor_set(x_118, 1, x_117);
-x_119 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_119, 0, x_118);
-if (lean_is_scalar(x_113)) {
- x_120 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_120 = x_113;
-}
-lean_ctor_set(x_120, 0, x_119);
-lean_ctor_set(x_120, 1, x_112);
-return x_120;
-}
-else
-{
-lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; size_t x_127; size_t x_128; lean_object* x_129; 
-x_121 = lean_ctor_get(x_27, 1);
-lean_inc(x_121);
-lean_dec(x_27);
-x_122 = lean_ctor_get(x_110, 0);
-lean_inc(x_122);
-if (lean_is_exclusive(x_110)) {
- lean_ctor_release(x_110, 0);
- lean_ctor_release(x_110, 1);
- x_123 = x_110;
-} else {
- lean_dec_ref(x_110);
- x_123 = lean_box(0);
-}
-x_124 = lean_ctor_get(x_111, 0);
-lean_inc(x_124);
+x_115 = lean_ctor_get(x_111, 0);
+lean_inc(x_115);
 if (lean_is_exclusive(x_111)) {
  lean_ctor_release(x_111, 0);
- x_125 = x_111;
+ lean_ctor_release(x_111, 1);
+ x_116 = x_111;
 } else {
  lean_dec_ref(x_111);
- x_125 = lean_box(0);
+ x_116 = lean_box(0);
 }
-x_126 = lean_array_get_size(x_25);
-x_127 = lean_usize_of_nat(x_126);
-lean_dec(x_126);
-x_128 = 0;
-x_129 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_25, x_127, x_128, x_124, x_10, x_11, x_12, x_13, x_14, x_15, x_121);
+x_117 = l_Lean_mkAppN(x_115, x_27);
+x_118 = lean_box(0);
+if (lean_is_scalar(x_116)) {
+ x_119 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_119 = x_116;
+}
+lean_ctor_set(x_119, 0, x_117);
+lean_ctor_set(x_119, 1, x_118);
+x_120 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_120, 0, x_119);
+if (lean_is_scalar(x_114)) {
+ x_121 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_121 = x_114;
+}
+lean_ctor_set(x_121, 0, x_120);
+lean_ctor_set(x_121, 1, x_113);
+return x_121;
+}
+else
+{
+lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; size_t x_128; size_t x_129; lean_object* x_130; 
+x_122 = lean_ctor_get(x_28, 1);
+lean_inc(x_122);
+lean_dec(x_28);
+x_123 = lean_ctor_get(x_111, 0);
+lean_inc(x_123);
+if (lean_is_exclusive(x_111)) {
+ lean_ctor_release(x_111, 0);
+ lean_ctor_release(x_111, 1);
+ x_124 = x_111;
+} else {
+ lean_dec_ref(x_111);
+ x_124 = lean_box(0);
+}
+x_125 = lean_ctor_get(x_112, 0);
+lean_inc(x_125);
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ x_126 = x_112;
+} else {
+ lean_dec_ref(x_112);
+ x_126 = lean_box(0);
+}
+x_127 = lean_array_get_size(x_27);
+x_128 = lean_usize_of_nat(x_127);
+lean_dec(x_127);
+x_129 = 0;
+x_130 = l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_Rewrite_0__Lean_Meta_Simp_tryLemmaCore___spec__2(x_27, x_128, x_129, x_125, x_10, x_11, x_12, x_13, x_14, x_15, x_122);
 lean_dec(x_11);
 lean_dec(x_10);
-if (lean_obj_tag(x_129) == 0)
+if (lean_obj_tag(x_130) == 0)
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; 
-x_130 = lean_ctor_get(x_129, 0);
-lean_inc(x_130);
-x_131 = lean_ctor_get(x_129, 1);
+lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+x_131 = lean_ctor_get(x_130, 0);
 lean_inc(x_131);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- lean_ctor_release(x_129, 1);
- x_132 = x_129;
+x_132 = lean_ctor_get(x_130, 1);
+lean_inc(x_132);
+if (lean_is_exclusive(x_130)) {
+ lean_ctor_release(x_130, 0);
+ lean_ctor_release(x_130, 1);
+ x_133 = x_130;
 } else {
- lean_dec_ref(x_129);
- x_132 = lean_box(0);
+ lean_dec_ref(x_130);
+ x_133 = lean_box(0);
 }
-x_133 = l_Lean_mkAppN(x_122, x_25);
-if (lean_is_scalar(x_125)) {
- x_134 = lean_alloc_ctor(1, 1, 0);
+x_134 = l_Lean_mkAppN(x_123, x_27);
+if (lean_is_scalar(x_126)) {
+ x_135 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_134 = x_125;
+ x_135 = x_126;
 }
-lean_ctor_set(x_134, 0, x_130);
-if (lean_is_scalar(x_123)) {
- x_135 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_135, 0, x_131);
+if (lean_is_scalar(x_124)) {
+ x_136 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_135 = x_123;
-}
-lean_ctor_set(x_135, 0, x_133);
-lean_ctor_set(x_135, 1, x_134);
-x_136 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_136, 0, x_135);
-if (lean_is_scalar(x_132)) {
- x_137 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_137 = x_132;
+ x_136 = x_124;
 }
+lean_ctor_set(x_136, 0, x_134);
+lean_ctor_set(x_136, 1, x_135);
+x_137 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_137, 0, x_136);
-lean_ctor_set(x_137, 1, x_131);
-return x_137;
+if (lean_is_scalar(x_133)) {
+ x_138 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_138 = x_133;
+}
+lean_ctor_set(x_138, 0, x_137);
+lean_ctor_set(x_138, 1, x_132);
+return x_138;
 }
 else
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; 
-lean_dec(x_125);
+lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+lean_dec(x_126);
+lean_dec(x_124);
 lean_dec(x_123);
-lean_dec(x_122);
-lean_dec(x_25);
-x_138 = lean_ctor_get(x_129, 0);
-lean_inc(x_138);
-x_139 = lean_ctor_get(x_129, 1);
+lean_dec(x_27);
+x_139 = lean_ctor_get(x_130, 0);
 lean_inc(x_139);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- lean_ctor_release(x_129, 1);
- x_140 = x_129;
+x_140 = lean_ctor_get(x_130, 1);
+lean_inc(x_140);
+if (lean_is_exclusive(x_130)) {
+ lean_ctor_release(x_130, 0);
+ lean_ctor_release(x_130, 1);
+ x_141 = x_130;
 } else {
- lean_dec_ref(x_129);
- x_140 = lean_box(0);
+ lean_dec_ref(x_130);
+ x_141 = lean_box(0);
 }
-if (lean_is_scalar(x_140)) {
- x_141 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_141)) {
+ x_142 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_141 = x_140;
+ x_142 = x_141;
 }
-lean_ctor_set(x_141, 0, x_138);
-lean_ctor_set(x_141, 1, x_139);
-return x_141;
+lean_ctor_set(x_142, 0, x_139);
+lean_ctor_set(x_142, 1, x_140);
+return x_142;
 }
 }
 }
@@ -5788,31 +5790,31 @@ return x_141;
 }
 else
 {
-uint8_t x_142; 
-lean_dec(x_25);
+uint8_t x_143; 
+lean_dec(x_27);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-x_142 = !lean_is_exclusive(x_27);
-if (x_142 == 0)
+x_143 = !lean_is_exclusive(x_28);
+if (x_143 == 0)
 {
-return x_27;
+return x_28;
 }
 else
 {
-lean_object* x_143; lean_object* x_144; lean_object* x_145; 
-x_143 = lean_ctor_get(x_27, 0);
-x_144 = lean_ctor_get(x_27, 1);
+lean_object* x_144; lean_object* x_145; lean_object* x_146; 
+x_144 = lean_ctor_get(x_28, 0);
+x_145 = lean_ctor_get(x_28, 1);
+lean_inc(x_145);
 lean_inc(x_144);
-lean_inc(x_143);
-lean_dec(x_27);
-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_dec(x_28);
+x_146 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_146, 0, x_144);
+lean_ctor_set(x_146, 1, x_145);
+return x_146;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Parser/Syntax.c b/stage0/stdlib/Lean/Parser/Syntax.c
index adce503b88..2172fe1215 100644
--- a/stage0/stdlib/Lean/Parser/Syntax.c
+++ b/stage0/stdlib/Lean/Parser/Syntax.c
@@ -494,6 +494,7 @@ static lean_object* l_Lean_Parser_Command_macroTail___elambda__1___closed__9;
 static lean_object* l_Lean_Parser_Command_macro__rules___closed__8;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_infix;
+static lean_object* l_Lean_Parser_Command_macroRhs_formatter___closed__3;
 static lean_object* l_Lean_Parser_Command_syntax___elambda__1___closed__22;
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_identPrec_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Command_mixfix___elambda__1___closed__2;
@@ -663,6 +664,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Syntax_sepBy1___elambda__1(lean_object*,
 static lean_object* l_Lean_Parser_Command_catBehaviorSymbol___elambda__1___closed__3;
 static lean_object* l_Lean_Parser_Term_stx_quot___elambda__1___closed__5;
 static lean_object* l_Lean_Parser_Term_prec_quot___elambda__1___closed__5;
+static lean_object* l_Lean_Parser_Command_elabTail___elambda__1___closed__16;
 static lean_object* l_Lean_Parser_Command_macro__rules_formatter___closed__10;
 static lean_object* l_Lean_Parser_Command_notation___closed__3;
 static lean_object* l_Lean_Parser_Command_elab___elambda__1___closed__6;
@@ -806,6 +808,7 @@ static lean_object* l_Lean_Parser_Term_prio_quot_formatter___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_notation;
 LEAN_EXPORT lean_object* l___regBuiltinParser_Lean_Parser_Command_notation(lean_object*);
 static lean_object* l_Lean_Parser_Command_mixfix_formatter___closed__13;
+static lean_object* l_Lean_Parser_Command_elabTail_parenthesizer___closed__7;
 static lean_object* l_Lean_Parser_Term_stx_quot_formatter___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_precedenceParser_formatter___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_Term_stx_quot;
@@ -981,6 +984,7 @@ static lean_object* l_Lean_Parser_Command_catBehaviorBoth_formatter___closed__3;
 static lean_object* l_Lean_Parser_Syntax_sepBy1_parenthesizer___closed__3;
 static lean_object* l_Lean_Parser_Term_stx_quot_formatter___closed__4;
 static lean_object* l_Lean_Parser_Command_optKind_formatter___closed__3;
+LEAN_EXPORT lean_object* l_Lean_Parser_Command_macroRhs___lambda__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Command_macro_parenthesizer___closed__11;
 static lean_object* l_Lean_Parser_Command_macroTailDefault_parenthesizer___closed__1;
 static lean_object* l_Lean_Parser_Command_syntax___elambda__1___closed__15;
@@ -1098,6 +1102,7 @@ static lean_object* l_Lean_Parser_Command_prefix___closed__2;
 static lean_object* l_Lean_Parser_Command_syntax___elambda__1___closed__26;
 static lean_object* l_Lean_Parser_Command_macroArg___elambda__1___closed__1;
 static lean_object* l_Lean_Parser_Command_infix_parenthesizer___closed__3;
+static lean_object* l_Lean_Parser_Command_elabTail___closed__10;
 static lean_object* l_Lean_Parser_Term_prio_quot___closed__4;
 static lean_object* l_Lean_Parser_Command_notationItem___closed__2;
 static lean_object* l_Lean_Parser_Command_elab__rules___elambda__1___closed__1;
@@ -1217,6 +1222,7 @@ static lean_object* l_Lean_Parser_Command_notationItem___closed__1;
 static lean_object* l_Lean_Parser_precedence___elambda__1___lambda__2___closed__11;
 static lean_object* l_Lean_Parser_Syntax_nonReserved___elambda__1___closed__12;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Parser_Term_prec_quot_formatter(lean_object*);
+lean_object* l_Lean_PrettyPrinter_Formatter_withPosition_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Command_catBehaviorBoth___elambda__1___closed__5;
 LEAN_EXPORT lean_object* l___regBuiltinParser_Lean_Parser_Syntax_paren(lean_object*);
 lean_object* l_Lean_Parser_withResultOfFn(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1312,6 +1318,7 @@ static lean_object* l___regBuiltinParser_Lean_Parser_Syntax_numPrec___closed__3;
 LEAN_EXPORT lean_object* l___regBuiltinParser_Lean_Parser_Syntax_sepBy1(lean_object*);
 static lean_object* l_Lean_Parser_precedence___elambda__1___closed__10;
 lean_object* l_Lean_PrettyPrinter_Parenthesizer_checkNoWsBefore_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Command_elabTail_formatter___closed__7;
 static lean_object* l_Lean_Parser_Command_mixfix___closed__15;
 static lean_object* l_Lean_Parser_Command_mixfix_parenthesizer___closed__9;
 static lean_object* l_Lean_Parser_Command_macroTailTactic___elambda__1___closed__4;
@@ -1480,6 +1487,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Command_syntaxAbbrev_formatter(lean_objec
 static lean_object* l_Lean_Parser_Command_syntaxAbbrev_formatter___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Parser_precedenceParser(lean_object*);
 static lean_object* l___regBuiltin_Lean_Parser_Command_macro_parenthesizer___closed__1;
+static lean_object* l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3;
 static lean_object* l_Lean_Parser_Command_macroTailTactic___closed__6;
 static lean_object* l_Lean_Parser_Command_notation___closed__1;
 static lean_object* l_Lean_Parser_Command_macro_formatter___closed__12;
@@ -1738,6 +1746,7 @@ static lean_object* l_Lean_Parser_Term_stx_quot___elambda__1___closed__1;
 static lean_object* l_Lean_Parser_Command_elab__rules___elambda__1___closed__5;
 static lean_object* l___regBuiltin_Lean_Parser_Syntax_unary_formatter___closed__1;
 static lean_object* l_Lean_Parser_Syntax_nonReserved___elambda__1___closed__9;
+lean_object* l_Lean_PrettyPrinter_Parenthesizer_withPosition_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Command_macro_parenthesizer___closed__3;
 static lean_object* l_Lean_Parser_Term_prec_quot___elambda__1___closed__3;
 static lean_object* l_Lean_Parser_Command_macro_formatter___closed__10;
@@ -2041,6 +2050,7 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Syntax_sepBy1_formatter(lean_object*, lea
 static lean_object* l_Lean_Parser_Syntax_cat_parenthesizer___closed__4;
 static lean_object* l_Lean_Parser_Command_syntax___closed__4;
 lean_object* l_Lean_Parser_setLhsPrecFn___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Parser_Command_elabTail___elambda__1___closed__15;
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_syntaxAbbrev_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Command_macroTail___closed__5;
 static lean_object* l___regBuiltin_Lean_Parser_Syntax_paren_parenthesizer___closed__2;
@@ -22733,6 +22743,61 @@ return x_9;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Parser_Command_macroRhs___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_2);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_5 = lean_ctor_get(x_2, 5);
+lean_dec(x_5);
+x_6 = lean_ctor_get(x_3, 2);
+lean_inc(x_6);
+x_7 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_7, 0, x_6);
+lean_ctor_set(x_2, 5, x_7);
+x_8 = lean_unsigned_to_nat(0u);
+x_9 = l_Lean_Parser_categoryParser___elambda__1(x_1, x_8, x_2, x_3);
+return x_9;
+}
+else
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_10 = lean_ctor_get(x_2, 0);
+x_11 = lean_ctor_get(x_2, 1);
+x_12 = lean_ctor_get(x_2, 2);
+x_13 = lean_ctor_get(x_2, 3);
+x_14 = lean_ctor_get(x_2, 4);
+x_15 = lean_ctor_get_uint8(x_2, sizeof(void*)*7);
+x_16 = lean_ctor_get(x_2, 6);
+lean_inc(x_16);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_dec(x_2);
+x_17 = lean_ctor_get(x_3, 2);
+lean_inc(x_17);
+x_18 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_18, 0, x_17);
+x_19 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_19, 0, x_10);
+lean_ctor_set(x_19, 1, x_11);
+lean_ctor_set(x_19, 2, x_12);
+lean_ctor_set(x_19, 3, x_13);
+lean_ctor_set(x_19, 4, x_14);
+lean_ctor_set(x_19, 5, x_18);
+lean_ctor_set(x_19, 6, x_16);
+lean_ctor_set_uint8(x_19, sizeof(void*)*7, x_15);
+x_20 = lean_unsigned_to_nat(0u);
+x_21 = l_Lean_Parser_categoryParser___elambda__1(x_1, x_20, x_19, x_3);
+return x_21;
+}
+}
+}
 static lean_object* _init_l_Lean_Parser_Command_macroRhs___closed__1() {
 _start:
 {
@@ -22782,7 +22847,7 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_macroRhs(lean_object* x_1) {
 _start:
 {
-lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
 x_3 = lean_ctor_get(x_1, 1);
@@ -22807,37 +22872,39 @@ lean_closure_set(x_13, 1, x_9);
 x_14 = l_Lean_Parser_Command_mixfix___closed__1;
 x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
-x_16 = l_Lean_Parser_orelseInfo(x_11, x_15);
-x_17 = l_Lean_Parser_Command_mixfix___elambda__1___closed__5;
-x_18 = lean_alloc_closure((void*)(l_Lean_Parser_orelseFn), 4, 2);
-lean_closure_set(x_18, 0, x_13);
-lean_closure_set(x_18, 1, x_17);
-x_19 = l_Lean_Parser_Command_macroRhs___elambda__1___closed__2;
-x_20 = l_Lean_Parser_nodeInfo(x_19, x_16);
-x_21 = lean_alloc_closure((void*)(l_Lean_Parser_nodeFn), 4, 2);
-lean_closure_set(x_21, 0, x_19);
-lean_closure_set(x_21, 1, x_18);
-x_22 = l_Lean_Parser_epsilonInfo;
-x_23 = l_Lean_Parser_andthenInfo(x_20, x_22);
-x_24 = l_Lean_Parser_precedence___elambda__1___closed__17;
-x_25 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
-lean_closure_set(x_25, 0, x_21);
-lean_closure_set(x_25, 1, x_24);
-x_26 = l_Lean_Parser_andthenInfo(x_22, x_23);
-x_27 = l_Lean_Parser_precedence___elambda__1___closed__15;
-x_28 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
-lean_closure_set(x_28, 0, x_27);
-lean_closure_set(x_28, 1, x_25);
-x_29 = l_Lean_Parser_Command_macroRhs___elambda__1___closed__4;
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = l_Lean_Parser_orelseInfo(x_30, x_26);
-x_32 = lean_alloc_closure((void*)(l_Lean_Parser_Command_macroRhs___elambda__1), 3, 1);
-lean_closure_set(x_32, 0, x_28);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
-return x_33;
+x_16 = l___regBuiltinParser_Lean_Parser_Term_stx_quot___closed__2;
+x_17 = lean_alloc_closure((void*)(l_Lean_Parser_Command_macroRhs___lambda__1), 3, 1);
+lean_closure_set(x_17, 0, x_16);
+x_18 = l_Lean_Parser_orelseInfo(x_11, x_15);
+x_19 = lean_alloc_closure((void*)(l_Lean_Parser_orelseFn), 4, 2);
+lean_closure_set(x_19, 0, x_13);
+lean_closure_set(x_19, 1, x_17);
+x_20 = l_Lean_Parser_Command_macroRhs___elambda__1___closed__2;
+x_21 = l_Lean_Parser_nodeInfo(x_20, x_18);
+x_22 = lean_alloc_closure((void*)(l_Lean_Parser_nodeFn), 4, 2);
+lean_closure_set(x_22, 0, x_20);
+lean_closure_set(x_22, 1, x_19);
+x_23 = l_Lean_Parser_epsilonInfo;
+x_24 = l_Lean_Parser_andthenInfo(x_21, x_23);
+x_25 = l_Lean_Parser_precedence___elambda__1___closed__17;
+x_26 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
+lean_closure_set(x_26, 0, x_22);
+lean_closure_set(x_26, 1, x_25);
+x_27 = l_Lean_Parser_andthenInfo(x_23, x_24);
+x_28 = l_Lean_Parser_precedence___elambda__1___closed__15;
+x_29 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
+lean_closure_set(x_29, 0, x_28);
+lean_closure_set(x_29, 1, x_26);
+x_30 = l_Lean_Parser_Command_macroRhs___elambda__1___closed__4;
+x_31 = lean_ctor_get(x_30, 0);
+lean_inc(x_31);
+x_32 = l_Lean_Parser_orelseInfo(x_31, x_27);
+x_33 = lean_alloc_closure((void*)(l_Lean_Parser_Command_macroRhs___elambda__1), 3, 1);
+lean_closure_set(x_33, 0, x_29);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_macroTailTactic___elambda__1___closed__1() {
@@ -24213,6 +24280,16 @@ lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
+static lean_object* _init_l_Lean_Parser_Command_macroRhs_formatter___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Command_mixfix_formatter___closed__3;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_withPosition_formatter), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_macroRhs_formatter(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:
 {
@@ -24227,7 +24304,7 @@ x_10 = l_Lean_Parser_Command_macroRhs_formatter___closed__2;
 x_11 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_11, 0, x_10);
 lean_closure_set(x_11, 1, x_9);
-x_12 = l_Lean_Parser_Command_mixfix_formatter___closed__3;
+x_12 = l_Lean_Parser_Command_macroRhs_formatter___closed__3;
 x_13 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_orelse_formatter), 7, 2);
 lean_closure_set(x_13, 0, x_11);
 lean_closure_set(x_13, 1, x_12);
@@ -24820,6 +24897,16 @@ lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
+static lean_object* _init_l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Command_mixfix_parenthesizer___closed__2;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_withPosition_parenthesizer), 6, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Parser_Command_macroRhs_parenthesizer(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:
 {
@@ -24834,7 +24921,7 @@ x_10 = l_Lean_Parser_Command_macroRhs_parenthesizer___closed__2;
 x_11 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
 lean_closure_set(x_11, 0, x_10);
 lean_closure_set(x_11, 1, x_9);
-x_12 = l_Lean_Parser_Command_mixfix_parenthesizer___closed__2;
+x_12 = l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3;
 x_13 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_orelse_parenthesizer), 7, 2);
 lean_closure_set(x_13, 0, x_11);
 lean_closure_set(x_13, 1, x_12);
@@ -26408,22 +26495,20 @@ return x_2;
 static lean_object* _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__11() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__10;
-x_2 = l_Lean_Parser_Command_mixfix___elambda__1___closed__7;
-x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___regBuiltinParser_Lean_Parser_Term_stx_quot___closed__2;
+x_2 = lean_alloc_closure((void*)(l_Lean_Parser_Command_macroRhs___lambda__1), 3, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
+x_1 = l_Lean_Parser_Command_mixfix___elambda__1___closed__6;
 x_2 = l_Lean_Parser_Command_elabTail___elambda__1___closed__11;
-x_3 = lean_alloc_closure((void*)(l_Lean_Parser_nodeFn), 4, 2);
+x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
@@ -26433,8 +26518,8 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__12;
-x_2 = l_Lean_Parser_precedence___elambda__1___closed__17;
+x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__10;
+x_2 = l_Lean_Parser_Command_elabTail___elambda__1___closed__12;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -26445,8 +26530,32 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_precedence___elambda__1___closed__15;
+x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
 x_2 = l_Lean_Parser_Command_elabTail___elambda__1___closed__13;
+x_3 = lean_alloc_closure((void*)(l_Lean_Parser_nodeFn), 4, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__15() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__14;
+x_2 = l_Lean_Parser_precedence___elambda__1___closed__17;
+x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__16() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_precedence___elambda__1___closed__15;
+x_2 = l_Lean_Parser_Command_elabTail___elambda__1___closed__15;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -26548,28 +26657,53 @@ return x_29;
 }
 else
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
-x_30 = l___regBuiltinParser_Lean_Parser_Term_stx_quot___closed__2;
-x_31 = lean_unsigned_to_nat(0u);
-lean_inc(x_1);
-x_32 = l_Lean_Parser_categoryParser___elambda__1(x_30, x_31, x_1, x_22);
-x_33 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
-x_34 = l_Lean_Parser_ParserState_mkNode(x_32, x_33, x_12);
-x_35 = lean_ctor_get(x_34, 4);
-lean_inc(x_35);
-x_36 = l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_734____at_Lean_Parser_ParserState_hasError___spec__1(x_35, x_9);
-lean_dec(x_35);
-if (x_36 == 0)
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 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; uint8_t x_46; 
+x_30 = lean_ctor_get(x_1, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_1, 1);
+lean_inc(x_31);
+x_32 = lean_ctor_get(x_1, 2);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_1, 3);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_1, 4);
+lean_inc(x_34);
+x_35 = lean_ctor_get_uint8(x_1, sizeof(void*)*7);
+x_36 = lean_ctor_get(x_1, 6);
+lean_inc(x_36);
+x_37 = lean_ctor_get(x_22, 2);
+lean_inc(x_37);
+x_38 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_38, 0, x_37);
+x_39 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_39, 0, x_30);
+lean_ctor_set(x_39, 1, x_31);
+lean_ctor_set(x_39, 2, x_32);
+lean_ctor_set(x_39, 3, x_33);
+lean_ctor_set(x_39, 4, x_34);
+lean_ctor_set(x_39, 5, x_38);
+lean_ctor_set(x_39, 6, x_36);
+lean_ctor_set_uint8(x_39, sizeof(void*)*7, x_35);
+x_40 = l___regBuiltinParser_Lean_Parser_Term_stx_quot___closed__2;
+x_41 = lean_unsigned_to_nat(0u);
+x_42 = l_Lean_Parser_categoryParser___elambda__1(x_40, x_41, x_39, x_22);
+x_43 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
+x_44 = l_Lean_Parser_ParserState_mkNode(x_42, x_43, x_12);
+x_45 = lean_ctor_get(x_44, 4);
+lean_inc(x_45);
+x_46 = l___private_Init_Data_Option_Basic_0__beqOption____x40_Init_Data_Option_Basic___hyg_734____at_Lean_Parser_ParserState_hasError___spec__1(x_45, x_9);
+lean_dec(x_45);
+if (x_46 == 0)
 {
 lean_dec(x_1);
-return x_34;
+return x_44;
 }
 else
 {
-lean_object* x_37; 
-x_37 = l_Lean_Parser_setLhsPrecFn(x_6, x_1, x_34);
+lean_object* x_47; 
+x_47 = l_Lean_Parser_setLhsPrecFn(x_6, x_1, x_44);
 lean_dec(x_1);
-return x_37;
+return x_47;
 }
 }
 }
@@ -26577,11 +26711,11 @@ return x_37;
 }
 else
 {
-lean_object* x_38; uint8_t x_39; lean_object* x_40; 
-x_38 = l_Lean_Parser_Command_elabTail___elambda__1___closed__14;
-x_39 = 1;
-x_40 = l_Lean_Parser_orelseFnCore(x_4, x_38, x_39, x_1, x_2);
-return x_40;
+lean_object* x_48; uint8_t x_49; lean_object* x_50; 
+x_48 = l_Lean_Parser_Command_elabTail___elambda__1___closed__16;
+x_49 = 1;
+x_50 = l_Lean_Parser_orelseFnCore(x_4, x_48, x_49, x_1, x_2);
+return x_50;
 }
 }
 }
@@ -26612,20 +26746,24 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__3() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___closed__2;
-x_2 = l_Lean_Parser_Command_mixfix___closed__2;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l_Lean_Parser_Command_mixfix___closed__1;
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = l_Lean_Parser_darrow;
+x_4 = lean_ctor_get(x_3, 0);
+lean_inc(x_4);
+x_5 = l_Lean_Parser_andthenInfo(x_4, x_2);
+return x_5;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
+x_1 = l_Lean_Parser_Command_elabTail___closed__2;
 x_2 = l_Lean_Parser_Command_elabTail___closed__3;
-x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
 }
@@ -26633,9 +26771,9 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___closed__4;
-x_2 = l_Lean_Parser_epsilonInfo;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
+x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
+x_2 = l_Lean_Parser_Command_elabTail___closed__4;
+x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
 return x_3;
 }
 }
@@ -26643,8 +26781,8 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_epsilonInfo;
-x_2 = l_Lean_Parser_Command_elabTail___closed__5;
+x_1 = l_Lean_Parser_Command_elabTail___closed__5;
+x_2 = l_Lean_Parser_epsilonInfo;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
@@ -26652,16 +26790,26 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__7() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_epsilonInfo;
+x_2 = l_Lean_Parser_Command_elabTail___closed__6;
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__8() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__4;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_elabTail___closed__6;
+x_3 = l_Lean_Parser_Command_elabTail___closed__7;
 x_4 = l_Lean_Parser_orelseInfo(x_2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__8() {
+static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__9() {
 _start:
 {
 lean_object* x_1; 
@@ -26669,12 +26817,12 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Parser_Command_elabTail___elambda__1), 2
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__9() {
+static lean_object* _init_l_Lean_Parser_Command_elabTail___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail___closed__7;
-x_2 = l_Lean_Parser_Command_elabTail___closed__8;
+x_1 = l_Lean_Parser_Command_elabTail___closed__8;
+x_2 = l_Lean_Parser_Command_elabTail___closed__9;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -26685,7 +26833,7 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Command_elabTail___closed__9;
+x_1 = l_Lean_Parser_Command_elabTail___closed__10;
 return x_1;
 }
 }
@@ -26781,7 +26929,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Command_elab___elambda__1___closed__9;
 x_2 = lean_ctor_get(x_1, 1);
 lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_elabTail___closed__8;
+x_3 = l_Lean_Parser_Command_elabTail___closed__9;
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_4, 0, x_2);
 lean_closure_set(x_4, 1, x_3);
@@ -27217,8 +27365,8 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail_formatter___closed__5()
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail_formatter___closed__4;
-x_2 = l_Lean_Parser_Command_mixfix_formatter___closed__4;
+x_1 = l_Lean_Parser_Command_mixfix_formatter___closed__2;
+x_2 = l_Lean_Parser_Command_macroRhs_formatter___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -27228,10 +27376,22 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_elabTail_formatter___closed__6() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Command_elabTail_formatter___closed__4;
+x_2 = l_Lean_Parser_Command_elabTail_formatter___closed__5;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Command_elabTail_formatter___closed__7() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Command_elabTail_formatter___closed__5;
+x_3 = l_Lean_Parser_Command_elabTail_formatter___closed__6;
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_leadingNode_formatter___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
@@ -27244,7 +27404,7 @@ _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_Parser_Command_elabTail_formatter___closed__1;
-x_7 = l_Lean_Parser_Command_elabTail_formatter___closed__6;
+x_7 = l_Lean_Parser_Command_elabTail_formatter___closed__7;
 x_8 = l_Lean_PrettyPrinter_Formatter_orelse_formatter(x_6, x_7, x_1, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -27509,8 +27669,8 @@ static lean_object* _init_l_Lean_Parser_Command_elabTail_parenthesizer___closed_
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__4;
-x_2 = l_Lean_Parser_Command_mixfix_parenthesizer___closed__4;
+x_1 = l_Lean_Parser_Command_mixfix_parenthesizer___closed__3;
+x_2 = l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -27520,10 +27680,22 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_elabTail_parenthesizer___closed__6() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__4;
+x_2 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__5;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Command_elabTail_parenthesizer___closed__7() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_elabTail___elambda__1___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__5;
+x_3 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__6;
 x_4 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_leadingNode_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
@@ -27536,7 +27708,7 @@ _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__1;
-x_7 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__6;
+x_7 = l_Lean_Parser_Command_elabTail_parenthesizer___closed__7;
 x_8 = l_Lean_PrettyPrinter_Parenthesizer_orelse_parenthesizer(x_6, x_7, x_1, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -30772,6 +30944,8 @@ l_Lean_Parser_Command_macroRhs_formatter___closed__1 = _init_l_Lean_Parser_Comma
 lean_mark_persistent(l_Lean_Parser_Command_macroRhs_formatter___closed__1);
 l_Lean_Parser_Command_macroRhs_formatter___closed__2 = _init_l_Lean_Parser_Command_macroRhs_formatter___closed__2();
 lean_mark_persistent(l_Lean_Parser_Command_macroRhs_formatter___closed__2);
+l_Lean_Parser_Command_macroRhs_formatter___closed__3 = _init_l_Lean_Parser_Command_macroRhs_formatter___closed__3();
+lean_mark_persistent(l_Lean_Parser_Command_macroRhs_formatter___closed__3);
 l_Lean_Parser_Command_macroTailTactic_formatter___closed__1 = _init_l_Lean_Parser_Command_macroTailTactic_formatter___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_macroTailTactic_formatter___closed__1);
 l_Lean_Parser_Command_macroTailTactic_formatter___closed__2 = _init_l_Lean_Parser_Command_macroTailTactic_formatter___closed__2();
@@ -30867,6 +31041,8 @@ l_Lean_Parser_Command_macroRhs_parenthesizer___closed__1 = _init_l_Lean_Parser_C
 lean_mark_persistent(l_Lean_Parser_Command_macroRhs_parenthesizer___closed__1);
 l_Lean_Parser_Command_macroRhs_parenthesizer___closed__2 = _init_l_Lean_Parser_Command_macroRhs_parenthesizer___closed__2();
 lean_mark_persistent(l_Lean_Parser_Command_macroRhs_parenthesizer___closed__2);
+l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3 = _init_l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3();
+lean_mark_persistent(l_Lean_Parser_Command_macroRhs_parenthesizer___closed__3);
 l_Lean_Parser_Command_macroTailTactic_parenthesizer___closed__1 = _init_l_Lean_Parser_Command_macroTailTactic_parenthesizer___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_macroTailTactic_parenthesizer___closed__1);
 l_Lean_Parser_Command_macroTailTactic_parenthesizer___closed__2 = _init_l_Lean_Parser_Command_macroTailTactic_parenthesizer___closed__2();
@@ -31137,6 +31313,10 @@ l_Lean_Parser_Command_elabTail___elambda__1___closed__13 = _init_l_Lean_Parser_C
 lean_mark_persistent(l_Lean_Parser_Command_elabTail___elambda__1___closed__13);
 l_Lean_Parser_Command_elabTail___elambda__1___closed__14 = _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__14();
 lean_mark_persistent(l_Lean_Parser_Command_elabTail___elambda__1___closed__14);
+l_Lean_Parser_Command_elabTail___elambda__1___closed__15 = _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__15();
+lean_mark_persistent(l_Lean_Parser_Command_elabTail___elambda__1___closed__15);
+l_Lean_Parser_Command_elabTail___elambda__1___closed__16 = _init_l_Lean_Parser_Command_elabTail___elambda__1___closed__16();
+lean_mark_persistent(l_Lean_Parser_Command_elabTail___elambda__1___closed__16);
 l_Lean_Parser_Command_elabTail___closed__1 = _init_l_Lean_Parser_Command_elabTail___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_elabTail___closed__1);
 l_Lean_Parser_Command_elabTail___closed__2 = _init_l_Lean_Parser_Command_elabTail___closed__2();
@@ -31155,6 +31335,8 @@ l_Lean_Parser_Command_elabTail___closed__8 = _init_l_Lean_Parser_Command_elabTai
 lean_mark_persistent(l_Lean_Parser_Command_elabTail___closed__8);
 l_Lean_Parser_Command_elabTail___closed__9 = _init_l_Lean_Parser_Command_elabTail___closed__9();
 lean_mark_persistent(l_Lean_Parser_Command_elabTail___closed__9);
+l_Lean_Parser_Command_elabTail___closed__10 = _init_l_Lean_Parser_Command_elabTail___closed__10();
+lean_mark_persistent(l_Lean_Parser_Command_elabTail___closed__10);
 l_Lean_Parser_Command_elabTail = _init_l_Lean_Parser_Command_elabTail();
 lean_mark_persistent(l_Lean_Parser_Command_elabTail);
 l_Lean_Parser_Command_elab___elambda__1___closed__1 = _init_l_Lean_Parser_Command_elab___elambda__1___closed__1();
@@ -31242,6 +31424,8 @@ l_Lean_Parser_Command_elabTail_formatter___closed__5 = _init_l_Lean_Parser_Comma
 lean_mark_persistent(l_Lean_Parser_Command_elabTail_formatter___closed__5);
 l_Lean_Parser_Command_elabTail_formatter___closed__6 = _init_l_Lean_Parser_Command_elabTail_formatter___closed__6();
 lean_mark_persistent(l_Lean_Parser_Command_elabTail_formatter___closed__6);
+l_Lean_Parser_Command_elabTail_formatter___closed__7 = _init_l_Lean_Parser_Command_elabTail_formatter___closed__7();
+lean_mark_persistent(l_Lean_Parser_Command_elabTail_formatter___closed__7);
 l_Lean_Parser_Command_elab_formatter___closed__1 = _init_l_Lean_Parser_Command_elab_formatter___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_elab_formatter___closed__1);
 l_Lean_Parser_Command_elab_formatter___closed__2 = _init_l_Lean_Parser_Command_elab_formatter___closed__2();
@@ -31289,6 +31473,8 @@ l_Lean_Parser_Command_elabTail_parenthesizer___closed__5 = _init_l_Lean_Parser_C
 lean_mark_persistent(l_Lean_Parser_Command_elabTail_parenthesizer___closed__5);
 l_Lean_Parser_Command_elabTail_parenthesizer___closed__6 = _init_l_Lean_Parser_Command_elabTail_parenthesizer___closed__6();
 lean_mark_persistent(l_Lean_Parser_Command_elabTail_parenthesizer___closed__6);
+l_Lean_Parser_Command_elabTail_parenthesizer___closed__7 = _init_l_Lean_Parser_Command_elabTail_parenthesizer___closed__7();
+lean_mark_persistent(l_Lean_Parser_Command_elabTail_parenthesizer___closed__7);
 l_Lean_Parser_Command_elab_parenthesizer___closed__1 = _init_l_Lean_Parser_Command_elab_parenthesizer___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_elab_parenthesizer___closed__1);
 l_Lean_Parser_Command_elab_parenthesizer___closed__2 = _init_l_Lean_Parser_Command_elab_parenthesizer___closed__2();
diff --git a/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c b/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c
index 8a37f5508f..15e07892be 100644
--- a/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c
+++ b/stage0/stdlib/Lean/PrettyPrinter/Delaborator/Builtins.c
@@ -108,7 +108,6 @@ lean_object* lean_name_mk_string(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabConst___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabAppExplicit___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdx___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_Match_inaccessible_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_delabLam___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_PrettyPrinter_Delaborator_withMDatasOptions___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -460,6 +459,7 @@ static lean_object* l_Lean_PrettyPrinter_Delaborator_unexpandCoe___lambda__1___c
 LEAN_EXPORT uint8_t l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_shouldGroupWithNext_getPPBinderTypes(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_getMatcherInfo_x3f___at_Lean_PrettyPrinter_Delaborator_delabAppMatch___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabAppMatch___closed__1;
+lean_object* l_Lean_inaccessible_x3f(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_PrettyPrinter_Delaborator_Builtins_0__Lean_PrettyPrinter_Delaborator_skippingBinders___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_PrettyPrinter_Delaborator_delabNamedPattern___closed__2;
 static lean_object* l_Lean_PrettyPrinter_Delaborator_delabMVar___closed__6;
@@ -19630,7 +19630,7 @@ lean_inc(x_9);
 x_10 = lean_ctor_get(x_8, 1);
 lean_inc(x_10);
 lean_dec(x_8);
-x_11 = l_Lean_Meta_Match_inaccessible_x3f(x_9);
+x_11 = l_Lean_inaccessible_x3f(x_9);
 lean_dec(x_9);
 if (lean_obj_tag(x_11) == 0)
 {
diff --git a/stage0/stdlib/Lean/Server/FileWorker.c b/stage0/stdlib/Lean/Server/FileWorker.c
index 229e6adacc..1c97de309d 100644
--- a/stage0/stdlib/Lean/Server/FileWorker.c
+++ b/stage0/stdlib/Lean/Server/FileWorker.c
@@ -314,7 +314,6 @@ uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t l_Std_RBNode_isRed___rarg(lean_object*);
 lean_object* l_Std_PersistentArray_toArray___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Server_FileWorker_parseParams___at_Lean_Server_FileWorker_handleNotification___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Server_FileWorker_compileHeader___closed__8;
 LEAN_EXPORT lean_object* l_IO_AsyncList_unfoldAsync_step___at_Lean_Server_FileWorker_unfoldCmdSnaps___spec__2(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Server_FileWorker_initAndRunWorker___closed__3;
 lean_object* l_Lean_addSearchPathFromEnv(lean_object*, lean_object*);
@@ -417,6 +416,7 @@ static lean_object* l_IO_FS_Stream_readRequestAs___at_Lean_Server_FileWorker_ini
 static lean_object* l_IO_FS_Stream_readRequestAs___at_Lean_Server_FileWorker_initAndRunWorker___spec__2___closed__51;
 LEAN_EXPORT lean_object* l_Lean_Server_FileWorker_lakeSetupSearchPath_processStderr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Server_FileWorker_lakeSetupSearchPath___closed__10;
+static lean_object* l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__6;
 lean_object* l_Lean_Json_getObjValAs_x3f___at_Lean_Lsp_instFromJsonInitializeParams___spec__3(lean_object*, lean_object*);
 static lean_object* l_IO_FS_Stream_readRequestAs___at_Lean_Server_FileWorker_initAndRunWorker___spec__2___closed__62;
 LEAN_EXPORT lean_object* l_Std_RBNode_forIn_visit___at_Lean_Server_FileWorker_mainLoop___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -4445,6 +4445,14 @@ static lean_object* _init_l_Lean_Server_FileWorker_compileHeader___lambda__4___c
 _start:
 {
 lean_object* x_1; 
+x_1 = lean_mk_string("lake");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__6() {
+_start:
+{
+lean_object* x_1; 
 x_1 = lean_mk_string("LEAN_SRC_PATH");
 return x_1;
 }
@@ -4456,7 +4464,7 @@ lean_object* x_11;
 x_11 = l_IO_appDir(x_10);
 if (lean_obj_tag(x_11) == 0)
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_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_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_12 = lean_ctor_get(x_11, 0);
 lean_inc(x_12);
 x_13 = lean_ctor_get(x_11, 1);
@@ -4470,47 +4478,53 @@ x_18 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__3;
 x_19 = l_System_FilePath_join(x_17, x_18);
 x_20 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__4;
 x_21 = l_System_FilePath_join(x_19, x_20);
-x_22 = lean_box(0);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-x_24 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5;
-x_25 = lean_io_getenv(x_24, x_13);
-if (lean_obj_tag(x_25) == 0)
+x_22 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5;
+lean_inc(x_21);
+x_23 = l_System_FilePath_join(x_21, x_22);
+x_24 = lean_box(0);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_21);
+lean_ctor_set(x_26, 1, x_25);
+x_27 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__6;
+x_28 = lean_io_getenv(x_27, x_13);
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_26; 
-x_26 = lean_ctor_get(x_25, 0);
-lean_inc(x_26);
-if (lean_obj_tag(x_26) == 0)
+lean_object* x_29; 
+x_29 = lean_ctor_get(x_28, 0);
+lean_inc(x_29);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_25, 1);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = lean_box(0);
-x_29 = l_Lean_Server_FileWorker_compileHeader___lambda__3(x_1, x_22, x_2, x_3, x_4, x_5, x_6, x_9, x_7, x_8, x_23, x_28, x_27);
-return x_29;
-}
-else
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_30 = lean_ctor_get(x_25, 1);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_28, 1);
 lean_inc(x_30);
-lean_dec(x_25);
-x_31 = lean_ctor_get(x_26, 0);
-lean_inc(x_31);
+lean_dec(x_28);
+x_31 = lean_box(0);
+x_32 = l_Lean_Server_FileWorker_compileHeader___lambda__3(x_1, x_24, x_2, x_3, x_4, x_5, x_6, x_9, x_7, x_8, x_26, x_31, x_30);
+return x_32;
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_33 = lean_ctor_get(x_28, 1);
+lean_inc(x_33);
+lean_dec(x_28);
+x_34 = lean_ctor_get(x_29, 0);
+lean_inc(x_34);
+lean_dec(x_29);
+x_35 = l_System_SearchPath_parse(x_34);
+x_36 = l_List_appendTR___rarg(x_35, x_26);
+x_37 = lean_box(0);
+x_38 = l_Lean_Server_FileWorker_compileHeader___lambda__3(x_1, x_24, x_2, x_3, x_4, x_5, x_6, x_9, x_7, x_8, x_36, x_37, x_33);
+return x_38;
+}
+}
+else
+{
+uint8_t x_39; 
 lean_dec(x_26);
-x_32 = l_System_SearchPath_parse(x_31);
-x_33 = l_List_appendTR___rarg(x_23, x_32);
-x_34 = lean_box(0);
-x_35 = l_Lean_Server_FileWorker_compileHeader___lambda__3(x_1, x_22, x_2, x_3, x_4, x_5, x_6, x_9, x_7, x_8, x_33, x_34, x_30);
-return x_35;
-}
-}
-else
-{
-uint8_t x_36; 
-lean_dec(x_23);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -4520,29 +4534,29 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_36 = !lean_is_exclusive(x_25);
-if (x_36 == 0)
+x_39 = !lean_is_exclusive(x_28);
+if (x_39 == 0)
 {
-return x_25;
+return x_28;
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_25, 0);
-x_38 = lean_ctor_get(x_25, 1);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_dec(x_25);
-x_39 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_39, 0, x_37);
-lean_ctor_set(x_39, 1, x_38);
-return x_39;
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_28, 0);
+x_41 = lean_ctor_get(x_28, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_28);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
 }
 }
 }
 else
 {
-uint8_t x_40; 
+uint8_t x_43; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -4552,23 +4566,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_40 = !lean_is_exclusive(x_11);
-if (x_40 == 0)
+x_43 = !lean_is_exclusive(x_11);
+if (x_43 == 0)
 {
 return x_11;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_41 = lean_ctor_get(x_11, 0);
-x_42 = lean_ctor_get(x_11, 1);
-lean_inc(x_42);
-lean_inc(x_41);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_44 = lean_ctor_get(x_11, 0);
+x_45 = lean_ctor_get(x_11, 1);
+lean_inc(x_45);
+lean_inc(x_44);
 lean_dec(x_11);
-x_43 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_43, 0, x_41);
-lean_ctor_set(x_43, 1, x_42);
-return x_43;
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_44);
+lean_ctor_set(x_46, 1, x_45);
+return x_46;
 }
 }
 }
@@ -4627,19 +4641,11 @@ static lean_object* _init_l_Lean_Server_FileWorker_compileHeader___closed__6() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("lake");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Server_FileWorker_compileHeader___closed__7() {
-_start:
-{
-lean_object* x_1; 
 x_1 = lean_mk_string("bin");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Server_FileWorker_compileHeader___closed__8() {
+static lean_object* _init_l_Lean_Server_FileWorker_compileHeader___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -4752,7 +4758,7 @@ lean_inc(x_62);
 x_63 = lean_ctor_get(x_61, 1);
 lean_inc(x_63);
 lean_dec(x_61);
-x_64 = l_Lean_Server_FileWorker_compileHeader___closed__8;
+x_64 = l_Lean_Server_FileWorker_compileHeader___closed__7;
 x_65 = l_System_FilePath_join(x_62, x_64);
 x_66 = l_Lean_Server_FileWorker_compileHeader___lambda__5(x_20, x_65, x_63);
 return x_66;
@@ -4790,9 +4796,9 @@ lean_dec(x_30);
 x_72 = lean_ctor_get(x_59, 0);
 lean_inc(x_72);
 lean_dec(x_59);
-x_73 = l_Lean_Server_FileWorker_compileHeader___closed__7;
+x_73 = l_Lean_Server_FileWorker_compileHeader___closed__6;
 x_74 = l_System_FilePath_join(x_72, x_73);
-x_75 = l_Lean_Server_FileWorker_compileHeader___closed__8;
+x_75 = l_Lean_Server_FileWorker_compileHeader___closed__7;
 x_76 = l_System_FilePath_join(x_74, x_75);
 x_77 = l_Lean_Server_FileWorker_compileHeader___lambda__5(x_20, x_76, x_71);
 return x_77;
@@ -4853,7 +4859,7 @@ lean_inc(x_35);
 x_36 = lean_ctor_get(x_34, 1);
 lean_inc(x_36);
 lean_dec(x_34);
-x_37 = l_Lean_Server_FileWorker_compileHeader___closed__6;
+x_37 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5;
 x_38 = l_System_FilePath_join(x_35, x_37);
 x_39 = l_Lean_Server_FileWorker_compileHeader___lambda__5(x_20, x_38, x_36);
 return x_39;
@@ -4891,9 +4897,9 @@ lean_dec(x_30);
 x_45 = lean_ctor_get(x_32, 0);
 lean_inc(x_45);
 lean_dec(x_32);
-x_46 = l_Lean_Server_FileWorker_compileHeader___closed__7;
+x_46 = l_Lean_Server_FileWorker_compileHeader___closed__6;
 x_47 = l_System_FilePath_join(x_45, x_46);
-x_48 = l_Lean_Server_FileWorker_compileHeader___closed__6;
+x_48 = l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5;
 x_49 = l_System_FilePath_join(x_47, x_48);
 x_50 = l_Lean_Server_FileWorker_compileHeader___lambda__5(x_20, x_49, x_44);
 return x_50;
@@ -19734,6 +19740,8 @@ l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__4 = _init_l_Lean_Se
 lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__4);
 l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5 = _init_l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5();
 lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__5);
+l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__6 = _init_l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__6();
+lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___lambda__4___closed__6);
 l_Lean_Server_FileWorker_compileHeader___closed__1 = _init_l_Lean_Server_FileWorker_compileHeader___closed__1();
 lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___closed__1);
 l_Lean_Server_FileWorker_compileHeader___closed__2 = _init_l_Lean_Server_FileWorker_compileHeader___closed__2();
@@ -19748,8 +19756,6 @@ l_Lean_Server_FileWorker_compileHeader___closed__6 = _init_l_Lean_Server_FileWor
 lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___closed__6);
 l_Lean_Server_FileWorker_compileHeader___closed__7 = _init_l_Lean_Server_FileWorker_compileHeader___closed__7();
 lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___closed__7);
-l_Lean_Server_FileWorker_compileHeader___closed__8 = _init_l_Lean_Server_FileWorker_compileHeader___closed__8();
-lean_mark_persistent(l_Lean_Server_FileWorker_compileHeader___closed__8);
 l_List_get_x21___at_Lean_Server_FileWorker_updateDocument___spec__3___closed__1 = _init_l_List_get_x21___at_Lean_Server_FileWorker_updateDocument___spec__3___closed__1();
 lean_mark_persistent(l_List_get_x21___at_Lean_Server_FileWorker_updateDocument___spec__3___closed__1);
 l_List_get_x21___at_Lean_Server_FileWorker_updateDocument___spec__3___closed__2 = _init_l_List_get_x21___at_Lean_Server_FileWorker_updateDocument___spec__3___closed__2();