diff --git a/stage0/stdlib/Init/Data/Array/Basic.c b/stage0/stdlib/Init/Data/Array/Basic.c
index 698fb65c30..370e7a3883 100644
--- a/stage0/stdlib/Init/Data/Array/Basic.c
+++ b/stage0/stdlib/Init/Data/Array/Basic.c
@@ -287,8 +287,8 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Uns
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -309,8 +309,8 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe___redArg___boxed(lean_object*, lea
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe___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_foldlM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlM_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -326,8 +326,8 @@ LEAN_EXPORT lean_object* l_Array_foldrMUnsafe___redArg___boxed(lean_object*, lea
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe___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_foldrM_fold___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrM_fold(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldrM_fold___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -340,12 +340,12 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_m
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -355,8 +355,8 @@ LEAN_EXPORT lean_object* l_Array_mapIdxM___redArg___lam__0(lean_object*, lean_ob
 LEAN_EXPORT lean_object* l_Array_mapIdxM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapIdxM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_firstM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_firstM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -412,8 +412,8 @@ LEAN_EXPORT lean_object* l_Array_allM___redArg___boxed(lean_object*, lean_object
 LEAN_EXPORT lean_object* l_Array_allM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_allM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -735,8 +735,8 @@ LEAN_EXPORT lean_object* l_Array_isPrefixOf___redArg___boxed(lean_object*, lean_
 LEAN_EXPORT uint8_t l_Array_isPrefixOf(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_isPrefixOf___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_zipWithMAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_zipWith___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_zipWith(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2413,15 +2413,6 @@ x_10 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___redArg(
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Array_forIn_x27_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2451,7 +2442,7 @@ x_13 = lean_nat_sub(x_4, x_12);
 lean_inc(x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-x_14 = lean_alloc_closure((void*)(l_Array_forIn_x27_loop___redArg___lam__0___boxed), 6, 5);
+x_14 = lean_alloc_closure((void*)(l_Array_forIn_x27_loop___redArg___lam__0), 6, 5);
 lean_closure_set(x_14, 0, x_8);
 lean_closure_set(x_14, 1, x_1);
 lean_closure_set(x_14, 2, x_2);
@@ -2498,6 +2489,15 @@ return x_10;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Array_forIn_x27_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Array_forIn_x27_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2792,16 +2792,6 @@ lean_dec(x_8);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg___lam__0___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_Array_foldlM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg(lean_object* x_1, 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:
 {
@@ -2854,7 +2844,7 @@ x_19 = lean_nat_sub(x_5, x_18);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_6);
-x_20 = lean_alloc_closure((void*)(l_Array_foldlM_loop___redArg___lam__0___boxed), 7, 6);
+x_20 = lean_alloc_closure((void*)(l_Array_foldlM_loop___redArg___lam__0), 7, 6);
 lean_closure_set(x_20, 0, x_6);
 lean_closure_set(x_20, 1, x_1);
 lean_closure_set(x_20, 2, x_2);
@@ -2881,6 +2871,16 @@ x_10 = l_Array_foldlM_loop___redArg(x_2, x_3, x_4, x_5, x_6, x_9, x_7);
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg___lam__0___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_Array_foldlM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Array_foldlM_loop___redArg___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:
 {
@@ -3147,15 +3147,6 @@ lean_dec(x_8);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Array_foldrM_fold___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg(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:
 {
@@ -3191,7 +3182,7 @@ x_15 = lean_nat_sub(x_5, x_14);
 lean_inc(x_15);
 lean_inc_ref(x_3);
 lean_inc(x_2);
-x_16 = lean_alloc_closure((void*)(l_Array_foldrM_fold___redArg___lam__0___boxed), 6, 5);
+x_16 = lean_alloc_closure((void*)(l_Array_foldrM_fold___redArg___lam__0), 6, 5);
 lean_closure_set(x_16, 0, x_1);
 lean_closure_set(x_16, 1, x_2);
 lean_closure_set(x_16, 2, x_3);
@@ -3230,6 +3221,15 @@ x_7 = l_Array_foldrM_fold___redArg(x_1, x_2, x_3, x_4, x_5, x_6);
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Array_foldrM_fold___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Array_foldrM_fold___redArg___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:
 {
@@ -3372,15 +3372,6 @@ x_9 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___redArg(x_4, x_
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -3410,7 +3401,7 @@ lean_inc(x_11);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_4);
-x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0___boxed), 6, 5);
+x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0), 6, 5);
 lean_closure_set(x_12, 0, x_4);
 lean_closure_set(x_12, 1, x_5);
 lean_closure_set(x_12, 2, x_1);
@@ -3436,6 +3427,15 @@ x_10 = l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg(x_3, x_4, x_
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapM_map(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -3444,16 +3444,6 @@ x_9 = l___private_Init_Data_Array_Basic_0__Array_mapM_map___redArg(x_4, x_5, x_6
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___lam__0___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_Array_mapFinIdxM_map___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg(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:
 {
@@ -3484,7 +3474,7 @@ x_14 = lean_nat_sub(x_4, x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_5);
-x_15 = lean_alloc_closure((void*)(l_Array_mapFinIdxM_map___redArg___lam__0___boxed), 7, 6);
+x_15 = lean_alloc_closure((void*)(l_Array_mapFinIdxM_map___redArg___lam__0), 7, 6);
 lean_closure_set(x_15, 0, x_5);
 lean_closure_set(x_15, 1, x_6);
 lean_closure_set(x_15, 2, x_1);
@@ -3510,6 +3500,16 @@ x_11 = l_Array_mapFinIdxM_map___redArg(x_3, x_4, x_5, x_6, x_9, x_10);
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___lam__0___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_Array_mapFinIdxM_map___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___redArg___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:
 {
@@ -3592,15 +3592,6 @@ x_11 = l_Array_mapFinIdxM_map___redArg(x_4, x_6, x_7, x_8, x_9, x_10);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0___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___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_1);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -3627,7 +3618,7 @@ lean_inc(x_9);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_4);
-x_10 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0___boxed), 5, 4);
+x_10 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0), 5, 4);
 lean_closure_set(x_10, 0, x_4);
 lean_closure_set(x_10, 1, x_1);
 lean_closure_set(x_10, 2, x_2);
@@ -3651,6 +3642,15 @@ x_8 = l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg(x_2, x_3, x_
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0___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___private_Init_Data_Array_Basic_0__Array_firstM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_1);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_firstM_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
@@ -4833,15 +4833,6 @@ lean_dec(x_6);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -4872,7 +4863,7 @@ x_13 = lean_nat_sub(x_4, x_12);
 lean_inc(x_13);
 lean_inc_ref(x_3);
 lean_inc(x_2);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0___boxed), 6, 5);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0), 6, 5);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_2);
 lean_closure_set(x_14, 2, x_3);
@@ -4908,6 +4899,15 @@ return x_8;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_findSomeRevM_x3f_find___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -9892,15 +9892,6 @@ x_6 = lean_box(x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg___lam__0___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_Array_zipWithMAux___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg(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:
 {
@@ -9953,7 +9944,7 @@ lean_inc(x_4);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_5);
-x_18 = lean_alloc_closure((void*)(l_Array_zipWithMAux___redArg___lam__0___boxed), 7, 6);
+x_18 = lean_alloc_closure((void*)(l_Array_zipWithMAux___redArg___lam__0), 7, 6);
 lean_closure_set(x_18, 0, x_5);
 lean_closure_set(x_18, 1, x_6);
 lean_closure_set(x_18, 2, x_1);
@@ -9983,6 +9974,15 @@ x_11 = l_Array_zipWithMAux___redArg(x_3, x_4, x_5, x_6, x_9, x_10);
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l_Array_zipWithMAux___redArg___lam__0___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_Array_zipWithMAux___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Array_zipWithMAux(lean_object* x_1, lean_object* x_2, 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:
 {
diff --git a/stage0/stdlib/Init/Data/Array/BasicAux.c b/stage0/stdlib/Init/Data/Array/BasicAux.c
index 7806c1fbf5..0b9e37da70 100644
--- a/stage0/stdlib/Init/Data/Array/BasicAux.c
+++ b/stage0/stdlib/Init/Data/Array/BasicAux.c
@@ -15,25 +15,25 @@ extern "C" {
 #endif
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__List_toArrayAux_match__1_splitter___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__List_toArrayAux_match__1_splitter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapM_x27___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapM_x27(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_ptr_addr(lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -99,15 +99,6 @@ x_7 = l___private_Init_Data_Array_BasicAux_0__List_toArrayAux_match__1_splitter_
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -122,7 +113,7 @@ lean_inc(x_8);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_4);
-x_9 = lean_alloc_closure((void*)(l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0___boxed), 6, 5);
+x_9 = lean_alloc_closure((void*)(l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0), 6, 5);
 lean_closure_set(x_9, 0, x_4);
 lean_closure_set(x_9, 1, x_5);
 lean_closure_set(x_9, 2, x_1);
@@ -163,6 +154,15 @@ x_10 = l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg(x_3, x
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__Array_mapM_x27_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -190,16 +190,6 @@ x_7 = l_Array_mapM_x27___redArg(x_4, x_5, x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -228,7 +218,7 @@ lean_inc(x_10);
 x_11 = lean_array_fget(x_4, x_3);
 lean_inc(x_2);
 lean_inc(x_11);
-x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0___boxed), 6, 5);
+x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0), 6, 5);
 lean_closure_set(x_12, 0, x_11);
 lean_closure_set(x_12, 1, x_3);
 lean_closure_set(x_12, 2, x_4);
@@ -267,6 +257,16 @@ return x_16;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Data/Array/Subarray.c b/stage0/stdlib/Init/Data/Array/Subarray.c
index ba12120be8..86f06dc5ab 100644
--- a/stage0/stdlib/Init/Data/Array/Subarray.c
+++ b/stage0/stdlib/Init/Data/Array/Subarray.c
@@ -124,10 +124,10 @@ LEAN_EXPORT uint8_t l_Subarray_all___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_all___redArg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Subarray_all(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_all___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2189,15 +2189,6 @@ x_5 = lean_box(x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -2228,7 +2219,7 @@ x_13 = lean_nat_sub(x_4, x_12);
 lean_inc(x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0___boxed), 6, 5);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0), 6, 5);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_2);
 lean_closure_set(x_14, 2, x_3);
@@ -2264,6 +2255,15 @@ return x_8;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Subarray_0__Subarray_findSomeRevM_x3f_find___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Data/ByteArray/Basic.c b/stage0/stdlib/Init/Data/ByteArray/Basic.c
index 3b9bb4fb07..66d3a36ce8 100644
--- a/stage0/stdlib/Init/Data/ByteArray/Basic.c
+++ b/stage0/stdlib/Init/Data/ByteArray/Basic.c
@@ -151,8 +151,8 @@ LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe_loop___boxed(lean_object*, lean
 LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_forInUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -173,8 +173,8 @@ LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe___redArg___boxed(lean_object*,
 LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_foldlMUnsafe___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop(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_ByteArray_foldlM_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1077,15 +1077,6 @@ x_9 = l_ByteArray_forInUnsafe_loop___redArg(x_3, x_4, x_6, x_7, x_8, x_5);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___lam__0___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___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1115,7 +1106,7 @@ x_13 = lean_nat_sub(x_4, x_12);
 lean_inc(x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-x_14 = lean_alloc_closure((void*)(l_ByteArray_forIn_loop___redArg___lam__0___boxed), 6, 5);
+x_14 = lean_alloc_closure((void*)(l_ByteArray_forIn_loop___redArg___lam__0), 6, 5);
 lean_closure_set(x_14, 0, x_8);
 lean_closure_set(x_14, 1, x_1);
 lean_closure_set(x_14, 2, x_2);
@@ -1163,6 +1154,15 @@ return x_10;
 }
 }
 }
+LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___lam__0___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___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_ByteArray_forIn_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1458,16 +1458,6 @@ lean_dec(x_7);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___lam__0___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___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg(lean_object* x_1, 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:
 {
@@ -1520,7 +1510,7 @@ x_19 = lean_nat_sub(x_5, x_18);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_6);
-x_20 = lean_alloc_closure((void*)(l_ByteArray_foldlM_loop___redArg___lam__0___boxed), 7, 6);
+x_20 = lean_alloc_closure((void*)(l_ByteArray_foldlM_loop___redArg___lam__0), 7, 6);
 lean_closure_set(x_20, 0, x_6);
 lean_closure_set(x_20, 1, x_1);
 lean_closure_set(x_20, 2, x_2);
@@ -1548,6 +1538,16 @@ x_10 = l_ByteArray_foldlM_loop___redArg(x_2, x_3, x_4, x_5, x_6, x_9, x_7);
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___lam__0___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___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_ByteArray_foldlM_loop___redArg___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:
 {
diff --git a/stage0/stdlib/Init/Data/Fin/Fold.c b/stage0/stdlib/Init/Data/Fin/Fold.c
index 1881abf6eb..b27232bce8 100644
--- a/stage0/stdlib/Init/Data/Fin/Fold.c
+++ b/stage0/stdlib/Init/Data/Fin/Fold.c
@@ -31,8 +31,8 @@ LEAN_EXPORT lean_object* l_Fin_foldr_loop___boxed(lean_object*, lean_object*, le
 LEAN_EXPORT lean_object* l_Fin_foldr___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Fin_foldr(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Fin_foldlM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Fin_foldlM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -200,15 +200,6 @@ x_5 = l_Fin_foldr_loop___redArg(x_3, x_2, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0___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___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_1);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -236,7 +227,7 @@ x_10 = lean_ctor_get(x_1, 1);
 lean_inc(x_10);
 lean_inc(x_3);
 lean_inc(x_5);
-x_11 = lean_alloc_closure((void*)(l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0___boxed), 5, 4);
+x_11 = lean_alloc_closure((void*)(l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0), 5, 4);
 lean_closure_set(x_11, 0, x_5);
 lean_closure_set(x_11, 1, x_1);
 lean_closure_set(x_11, 2, x_2);
@@ -257,6 +248,15 @@ x_8 = l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg(x_2, x_3, x_4,
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0___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___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_1);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop(lean_object* x_1, 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:
 {
@@ -283,15 +283,6 @@ x_8 = l___private_Init_Data_Fin_Fold_0__Fin_foldlM_loop___redArg(x_3, x_4, x_5,
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -320,7 +311,7 @@ x_12 = lean_nat_sub(x_3, x_11);
 lean_inc(x_2);
 lean_inc(x_12);
 x_13 = lean_apply_2(x_2, x_12, x_4);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg___boxed), 4, 3);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg), 4, 3);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_2);
 lean_closure_set(x_14, 2, x_12);
@@ -329,6 +320,15 @@ return x_15;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop___redArg(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Fin_Fold_0__Fin_foldrM_loop(lean_object* x_1, 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:
 {
diff --git a/stage0/stdlib/Init/Data/Float.c b/stage0/stdlib/Init/Data/Float.c
index 9373aa0c54..3e98a86d10 100644
--- a/stage0/stdlib/Init/Data/Float.c
+++ b/stage0/stdlib/Init/Data/Float.c
@@ -281,7 +281,7 @@ _start:
 {
 uint64_t x_2; double x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_float_of_bits(x_2);
 x_4 = lean_box_float(x_3);
 return x_4;
@@ -497,7 +497,7 @@ _start:
 {
 uint64_t x_2; double x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_float(x_2);
 x_4 = lean_box_float(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/Float32.c b/stage0/stdlib/Init/Data/Float32.c
index f1706e84a9..3dbbfd0155 100644
--- a/stage0/stdlib/Init/Data/Float32.c
+++ b/stage0/stdlib/Init/Data/Float32.c
@@ -501,7 +501,7 @@ _start:
 {
 uint64_t x_2; float x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_float32(x_2);
 x_4 = lean_box_float32(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/FloatArray/Basic.c b/stage0/stdlib/Init/Data/FloatArray/Basic.c
index 5f1878eb41..ac3759b1de 100644
--- a/stage0/stdlib/Init/Data/FloatArray/Basic.c
+++ b/stage0/stdlib/Init/Data/FloatArray/Basic.c
@@ -135,8 +135,8 @@ LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_fo
 LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_forInUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -157,8 +157,8 @@ LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe___redArg___boxed(lean_object*
 LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_FloatArray_foldlMUnsafe___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -892,15 +892,6 @@ x_9 = l___private_Init_Data_FloatArray_Basic_0__FloatArray_forInUnsafe_loop___re
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -930,7 +921,7 @@ x_13 = lean_nat_sub(x_4, x_12);
 lean_inc(x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0___boxed), 6, 5);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0), 6, 5);
 lean_closure_set(x_14, 0, x_8);
 lean_closure_set(x_14, 1, x_1);
 lean_closure_set(x_14, 2, x_2);
@@ -978,6 +969,15 @@ return x_10;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_forIn_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1273,16 +1273,6 @@ lean_dec(x_7);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0___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_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg(lean_object* x_1, 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:
 {
@@ -1335,7 +1325,7 @@ x_19 = lean_nat_sub(x_5, x_18);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_6);
-x_20 = lean_alloc_closure((void*)(l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0___boxed), 7, 6);
+x_20 = lean_alloc_closure((void*)(l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0), 7, 6);
 lean_closure_set(x_20, 0, x_6);
 lean_closure_set(x_20, 1, x_1);
 lean_closure_set(x_20, 2, x_2);
@@ -1363,6 +1353,16 @@ x_10 = l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0___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_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_FloatArray_Basic_0__FloatArray_foldlM_loop___redArg___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:
 {
diff --git a/stage0/stdlib/Init/Data/Format/Basic.c b/stage0/stdlib/Init/Data/Format/Basic.c
index 235fc776e5..cab7cb57a9 100644
--- a/stage0/stdlib/Init/Data/Format/Basic.c
+++ b/stage0/stdlib/Init/Data/Format/Basic.c
@@ -152,7 +152,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___r
 lean_object* l_instInhabitedOfMonad___redArg(lean_object*, lean_object*);
 lean_object* l_panic___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_length(lean_object*);
 static lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___closed__1;
 lean_object* lean_string_utf8_next(lean_object*, lean_object*);
@@ -161,6 +160,7 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___r
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___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_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Format_prettyM___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Format_prettyM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2272,15 +2272,6 @@ return x_21;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
-{
-lean_object* x_11; 
-x_11 = l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_1);
-return x_11;
-}
-}
 static lean_object* _init_l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___closed__1() {
 _start:
 {
@@ -2365,15 +2356,6 @@ x_15 = l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg(x_6, x_7, x_
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec(x_1);
-return x_10;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -2591,7 +2573,7 @@ lean_inc(x_50);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_1);
-x_59 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed), 10, 9);
+x_59 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6), 10, 9);
 lean_closure_set(x_59, 0, x_56);
 lean_closure_set(x_59, 1, x_1);
 lean_closure_set(x_59, 2, x_2);
@@ -2877,7 +2859,7 @@ lean_inc(x_119);
 lean_dec_ref(x_24);
 x_120 = lean_ctor_get(x_3, 3);
 lean_inc(x_120);
-x_121 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___boxed), 9, 8);
+x_121 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12), 9, 8);
 lean_closure_set(x_121, 0, x_26);
 lean_closure_set(x_121, 1, x_119);
 lean_closure_set(x_121, 2, x_25);
@@ -3052,7 +3034,7 @@ lean_inc(x_150);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_1);
-x_159 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed), 10, 9);
+x_159 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6), 10, 9);
 lean_closure_set(x_159, 0, x_156);
 lean_closure_set(x_159, 1, x_1);
 lean_closure_set(x_159, 2, x_2);
@@ -3348,7 +3330,7 @@ lean_inc(x_223);
 lean_dec_ref(x_124);
 x_224 = lean_ctor_get(x_3, 3);
 lean_inc(x_224);
-x_225 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___boxed), 9, 8);
+x_225 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12), 9, 8);
 lean_closure_set(x_225, 0, x_126);
 lean_closure_set(x_225, 1, x_223);
 lean_closure_set(x_225, 2, x_125);
@@ -3535,7 +3517,7 @@ lean_inc(x_256);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_1);
-x_265 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed), 10, 9);
+x_265 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6), 10, 9);
 lean_closure_set(x_265, 0, x_262);
 lean_closure_set(x_265, 1, x_1);
 lean_closure_set(x_265, 2, x_2);
@@ -3854,7 +3836,7 @@ lean_inc(x_333);
 lean_dec_ref(x_229);
 x_334 = lean_ctor_get(x_3, 3);
 lean_inc(x_334);
-x_335 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___boxed), 9, 8);
+x_335 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12), 9, 8);
 lean_closure_set(x_335, 0, x_231);
 lean_closure_set(x_335, 1, x_333);
 lean_closure_set(x_335, 2, x_230);
@@ -4056,7 +4038,7 @@ lean_inc(x_371);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_1);
-x_380 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed), 10, 9);
+x_380 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6), 10, 9);
 lean_closure_set(x_380, 0, x_377);
 lean_closure_set(x_380, 1, x_1);
 lean_closure_set(x_380, 2, x_2);
@@ -4390,7 +4372,7 @@ lean_inc(x_449);
 lean_dec_ref(x_344);
 x_450 = lean_ctor_get(x_3, 3);
 lean_inc(x_450);
-x_451 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___boxed), 9, 8);
+x_451 = lean_alloc_closure((void*)(l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12), 9, 8);
 lean_closure_set(x_451, 0, x_346);
 lean_closure_set(x_451, 1, x_449);
 lean_closure_set(x_451, 2, x_345);
@@ -4417,6 +4399,24 @@ x_6 = l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg(x_1, x_2, x_3
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__12(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_1);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
+x_11 = l___private_Init_Data_Format_Basic_0__Std_Format_be___redArg___lam__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_1);
+return x_11;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Data/Hashable.c b/stage0/stdlib/Init/Data/Hashable.c
index f3d98de8da..0432e89d2a 100644
--- a/stage0/stdlib/Init/Data/Hashable.c
+++ b/stage0/stdlib/Init/Data/Hashable.c
@@ -79,7 +79,6 @@ static const lean_ctor_object l_instHashableArray___redArg___lam__1___closed__8_
 static const lean_object* l_instHashableArray___redArg___lam__1___closed__8 = (const lean_object*)&l_instHashableArray___redArg___lam__1___closed__8_value;
 static const lean_ctor_object l_instHashableArray___redArg___lam__1___closed__9_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)&l_instHashableArray___redArg___lam__1___closed__8_value),((lean_object*)&l_instHashableArray___redArg___lam__1___closed__6_value)}};
 static const lean_object* l_instHashableArray___redArg___lam__1___closed__9 = (const lean_object*)&l_instHashableArray___redArg___lam__1___closed__9_value;
-LEAN_EXPORT lean_object* l_instHashableArray___redArg___lam__1___boxed__const__1;
 lean_object* lean_array_get_size(lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
@@ -145,9 +144,9 @@ lean_dec_ref(x_3);
 x_6 = lean_apply_1(x_1, x_4);
 x_7 = lean_apply_1(x_2, x_5);
 x_8 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_9 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_10 = lean_uint64_mix_hash(x_8, x_9);
 return x_10;
 }
@@ -260,7 +259,7 @@ lean_dec_ref(x_2);
 x_5 = lean_apply_1(x_1, x_4);
 x_6 = 13;
 x_7 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_8 = lean_uint64_mix_hash(x_7, x_6);
 return x_8;
 }
@@ -299,7 +298,7 @@ _start:
 lean_object* x_4; uint64_t x_5; uint64_t x_6; 
 x_4 = lean_apply_1(x_1, x_3);
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_6 = lean_uint64_mix_hash(x_2, x_5);
 return x_6;
 }
@@ -309,7 +308,7 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instHashableList___redArg___lam__0(x_1, x_4, x_3);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -369,7 +368,7 @@ _start:
 lean_object* x_4; uint64_t x_5; uint64_t x_6; 
 x_4 = lean_apply_1(x_1, x_3);
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_6 = lean_uint64_mix_hash(x_2, x_5);
 return x_6;
 }
@@ -379,21 +378,12 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instHashableArray___redArg___lam__0(x_1, x_4, x_3);
 x_6 = lean_box_uint64(x_5);
 return x_6;
 }
 }
-static lean_object* _init_l_instHashableArray___redArg___lam__1___boxed__const__1() {
-_start:
-{
-uint64_t x_1; lean_object* x_2; 
-x_1 = 7;
-x_2 = lean_box_uint64(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT uint64_t l_instHashableArray___redArg___lam__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -426,7 +416,7 @@ else
 size_t x_9; size_t x_10; lean_object* x_11; lean_object* x_12; uint64_t x_13; 
 x_9 = 0;
 x_10 = lean_usize_of_nat(x_5);
-x_11 = l_instHashableArray___redArg___lam__1___boxed__const__1;
+x_11 = l_instHashableList___redArg___lam__1___boxed__const__1;
 x_12 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold(lean_box(0), lean_box(0), lean_box(0), x_6, x_1, x_2, x_9, x_10, x_11);
 x_13 = lean_unbox_uint64(x_12);
 lean_dec(x_12);
@@ -438,7 +428,7 @@ else
 size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; uint64_t x_18; 
 x_14 = 0;
 x_15 = lean_usize_of_nat(x_5);
-x_16 = l_instHashableArray___redArg___lam__1___boxed__const__1;
+x_16 = l_instHashableList___redArg___lam__1___boxed__const__1;
 x_17 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold(lean_box(0), lean_box(0), lean_box(0), x_6, x_1, x_2, x_14, x_15, x_16);
 x_18 = lean_unbox_uint64(x_17);
 lean_dec(x_17);
@@ -486,7 +476,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_instHashableUInt64___lam__0(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -602,7 +592,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_hash64(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -623,8 +613,6 @@ if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_instHashableList___redArg___lam__1___boxed__const__1 = _init_l_instHashableList___redArg___lam__1___boxed__const__1();
 lean_mark_persistent(l_instHashableList___redArg___lam__1___boxed__const__1);
-l_instHashableArray___redArg___lam__1___boxed__const__1 = _init_l_instHashableArray___redArg___lam__1___boxed__const__1();
-lean_mark_persistent(l_instHashableArray___redArg___lam__1___boxed__const__1);
 l_instHashableInt___lam__0___closed__0 = _init_l_instHashableInt___lam__0___closed__0();
 lean_mark_persistent(l_instHashableInt___lam__0___closed__0);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Init/Data/Iterators/Lemmas/Basic.c b/stage0/stdlib/Init/Data/Iterators/Lemmas/Basic.c
index f3e4e40a85..1d4003b6cc 100644
--- a/stage0/stdlib/Init/Data/Iterators/Lemmas/Basic.c
+++ b/stage0/stdlib/Init/Data/Iterators/Lemmas/Basic.c
@@ -13,25 +13,16 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSteps(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSkips___redArg___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSkips___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSkips(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Iter_inductSkips___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Std_Iter_inductSteps___redArg___lam__0(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -45,7 +36,7 @@ _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 lean_inc(x_1);
-x_3 = lean_alloc_closure((void*)(l_Std_Iter_inductSteps___redArg___lam__0___boxed), 4, 1);
+x_3 = lean_alloc_closure((void*)(l_Std_Iter_inductSteps___redArg___lam__0), 4, 1);
 lean_closure_set(x_3, 0, x_1);
 lean_inc(x_1);
 x_4 = lean_alloc_closure((void*)(l_Std_Iter_inductSteps___redArg___lam__1), 3, 1);
@@ -62,6 +53,15 @@ x_5 = l_Std_Iter_inductSteps___redArg(x_1, x_2);
 return x_5;
 }
 }
+LEAN_EXPORT lean_object* l_Std_Iter_inductSteps___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Std_Iter_inductSteps___redArg___lam__0(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l_Std_Iter_inductSteps(lean_object* x_1, 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:
 {
diff --git a/stage0/stdlib/Init/Data/Iterators/Lemmas/Monadic/Basic.c b/stage0/stdlib/Init/Data/Iterators/Lemmas/Monadic/Basic.c
index dccc23bdaf..6c1f652afe 100644
--- a/stage0/stdlib/Init/Data/Iterators/Lemmas/Monadic/Basic.c
+++ b/stage0/stdlib/Init/Data/Iterators/Lemmas/Monadic/Basic.c
@@ -13,25 +13,16 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSteps(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSkips___redArg___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSkips___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSkips(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_IterM_inductSkips___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Std_IterM_inductSteps___redArg___lam__0(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -45,7 +36,7 @@ _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 lean_inc(x_1);
-x_3 = lean_alloc_closure((void*)(l_Std_IterM_inductSteps___redArg___lam__0___boxed), 4, 1);
+x_3 = lean_alloc_closure((void*)(l_Std_IterM_inductSteps___redArg___lam__0), 4, 1);
 lean_closure_set(x_3, 0, x_1);
 lean_inc(x_1);
 x_4 = lean_alloc_closure((void*)(l_Std_IterM_inductSteps___redArg___lam__1), 3, 1);
@@ -62,6 +53,15 @@ x_5 = l_Std_IterM_inductSteps___redArg(x_1, x_2);
 return x_5;
 }
 }
+LEAN_EXPORT lean_object* l_Std_IterM_inductSteps___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Std_IterM_inductSteps___redArg___lam__0(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l_Std_IterM_inductSteps(lean_object* x_1, lean_object* x_2, 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:
 {
diff --git a/stage0/stdlib/Init/Data/List/Control.c b/stage0/stdlib/Init/Data/List/Control.c
index aa3367f0b0..2abe8af52d 100644
--- a/stage0/stdlib/Init/Data/List/Control.c
+++ b/stage0/stdlib/Init/Data/List/Control.c
@@ -50,8 +50,8 @@ LEAN_EXPORT lean_object* l_List_filterM(lean_object*, lean_object*, lean_object*
 LEAN_EXPORT lean_object* l_List_filterRevM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterRevM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMapM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMapM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterMapM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -625,15 +625,6 @@ x_8 = l_List_filterAuxM___redArg(x_2, x_4, x_6, x_7);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg___lam__0___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_List_filterMapM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_5);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -662,7 +653,7 @@ x_11 = lean_ctor_get(x_3, 1);
 lean_inc(x_11);
 lean_dec_ref(x_3);
 lean_inc(x_2);
-x_12 = lean_alloc_closure((void*)(l_List_filterMapM_loop___redArg___lam__0___boxed), 5, 4);
+x_12 = lean_alloc_closure((void*)(l_List_filterMapM_loop___redArg___lam__0), 5, 4);
 lean_closure_set(x_12, 0, x_1);
 lean_closure_set(x_12, 1, x_2);
 lean_closure_set(x_12, 2, x_11);
@@ -695,6 +686,15 @@ return x_9;
 }
 }
 }
+LEAN_EXPORT lean_object* l_List_filterMapM_loop___redArg___lam__0___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_List_filterMapM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l_List_filterMapM_loop(lean_object* x_1, 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:
 {
diff --git a/stage0/stdlib/Init/Data/Nat/Control.c b/stage0/stdlib/Init/Data/Nat/Control.c
index 1387c67785..b9c5a09aa7 100644
--- a/stage0/stdlib/Init/Data/Nat/Control.c
+++ b/stage0/stdlib/Init/Data/Nat/Control.c
@@ -13,19 +13,19 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_forM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_forM(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -63,15 +63,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_anyM_loop(lean
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_anyM_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_anyM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_anyM(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0___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___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_4);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -102,7 +93,7 @@ x_13 = lean_nat_sub(x_4, x_12);
 lean_inc(x_13);
 lean_inc(x_3);
 lean_inc(x_2);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0___boxed), 5, 4);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0), 5, 4);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_2);
 lean_closure_set(x_14, 2, x_3);
@@ -126,6 +117,15 @@ x_6 = l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg(x_1, x_2, x_3,
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0___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___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forM_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -172,15 +172,6 @@ lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -209,7 +200,7 @@ x_11 = lean_unsigned_to_nat(1u);
 x_12 = lean_nat_sub(x_3, x_11);
 lean_inc(x_12);
 lean_inc(x_2);
-x_13 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0___boxed), 4, 3);
+x_13 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0), 4, 3);
 lean_closure_set(x_13, 0, x_1);
 lean_closure_set(x_13, 1, x_2);
 lean_closure_set(x_13, 2, x_12);
@@ -227,6 +218,15 @@ x_5 = l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg(x_1, x_2, x
 return x_5;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___lam__0(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_forRevM_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -288,15 +288,6 @@ lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg___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___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_4);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -328,7 +319,7 @@ x_15 = lean_nat_sub(x_14, x_12);
 lean_dec(x_14);
 lean_inc(x_3);
 x_16 = lean_apply_3(x_3, x_15, lean_box(0), x_5);
-x_17 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg___boxed), 5, 4);
+x_17 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg), 5, 4);
 lean_closure_set(x_17, 0, x_1);
 lean_closure_set(x_17, 1, x_2);
 lean_closure_set(x_17, 2, x_3);
@@ -338,6 +329,15 @@ return x_18;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg___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___private_Init_Data_Nat_Control_0__Nat_foldM_loop___redArg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldM_loop(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -375,15 +375,6 @@ lean_dec(x_4);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -412,7 +403,7 @@ x_12 = lean_nat_sub(x_3, x_11);
 lean_inc(x_2);
 lean_inc(x_12);
 x_13 = lean_apply_3(x_2, x_12, lean_box(0), x_4);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg___boxed), 4, 3);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg), 4, 3);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_2);
 lean_closure_set(x_14, 2, x_12);
@@ -421,6 +412,15 @@ return x_15;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop___redArg(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Nat_Control_0__Nat_foldRevM_loop(lean_object* x_1, lean_object* x_2, 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:
 {
diff --git a/stage0/stdlib/Init/Data/Ord/SInt.c b/stage0/stdlib/Init/Data/Ord/SInt.c
index 64e8462666..0a721c7040 100644
--- a/stage0/stdlib/Init/Data/Ord/SInt.c
+++ b/stage0/stdlib/Init/Data/Ord/SInt.c
@@ -208,9 +208,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Int64_instOrd___lam__0(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
diff --git a/stage0/stdlib/Init/Data/Ord/UInt.c b/stage0/stdlib/Init/Data/Ord/UInt.c
index 93683b8ba7..f60601efa3 100644
--- a/stage0/stdlib/Init/Data/Ord/UInt.c
+++ b/stage0/stdlib/Init/Data/Ord/UInt.c
@@ -208,9 +208,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_UInt64_instOrd___lam__0(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
diff --git a/stage0/stdlib/Init/Data/Range/Basic.c b/stage0/stdlib/Init/Data/Range/Basic.c
index 83415f5cd3..b058e54fec 100644
--- a/stage0/stdlib/Init/Data/Range/Basic.c
+++ b/stage0/stdlib/Init/Data/Range/Basic.c
@@ -77,10 +77,10 @@ static lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_
 static lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27___auto__1___closed__25;
 static lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27___auto__1___closed__26;
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27___auto__1;
-LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop_match__1_splitter___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop_match__1_splitter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -90,8 +90,8 @@ LEAN_EXPORT lean_object* l_Std_Legacy_Range_instForIn_x27NatInferInstanceMembers
 LEAN_EXPORT lean_object* l_Std_Legacy_Range_instForIn_x27NatInferInstanceMembershipOfMonad___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Std_Legacy_Range_instForIn_x27NatInferInstanceMembershipOfMonad(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Legacy_Range_forM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Legacy_Range_forM(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -635,16 +635,6 @@ x_1 = l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27___auto__1_
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0___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_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -678,7 +668,7 @@ x_13 = lean_ctor_get(x_1, 1);
 lean_inc(x_13);
 lean_inc(x_3);
 lean_inc(x_5);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0___boxed), 7, 6);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0), 7, 6);
 lean_closure_set(x_14, 0, x_12);
 lean_closure_set(x_14, 1, x_5);
 lean_closure_set(x_14, 2, x_7);
@@ -722,6 +712,16 @@ return x_13;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0___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_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forIn_x27_loop(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -811,16 +811,6 @@ lean_closure_set(x_3, 0, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -853,7 +843,7 @@ x_12 = lean_ctor_get(x_1, 1);
 lean_inc(x_12);
 lean_inc(x_3);
 lean_inc(x_4);
-x_13 = lean_alloc_closure((void*)(l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0___boxed), 6, 5);
+x_13 = lean_alloc_closure((void*)(l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0), 6, 5);
 lean_closure_set(x_13, 0, x_4);
 lean_closure_set(x_13, 1, x_6);
 lean_closure_set(x_13, 2, x_1);
@@ -874,6 +864,16 @@ x_8 = l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg(x
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Range_Basic_0__Std_Legacy_Range_forM_loop(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Data/Range/Polymorphic/SInt.c b/stage0/stdlib/Init/Data/Range/Polymorphic/SInt.c
index c0fc23daeb..c1423d77f2 100644
--- a/stage0/stdlib/Init/Data/Range/Polymorphic/SInt.c
+++ b/stage0/stdlib/Init/Data/Range/Polymorphic/SInt.c
@@ -1379,7 +1379,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Int64_instUpwardEnumerable___lam__0(x_2);
 return x_3;
 }
@@ -1428,7 +1428,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Int64_instUpwardEnumerable___lam__1(x_1, x_3);
 return x_4;
 }
@@ -1502,9 +1502,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Int64_instRxcHasSize___lam__0(x_3, x_4);
 return x_5;
 }
@@ -1534,9 +1534,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Int64_instRxoHasSize___lam__0(x_3, x_4);
 return x_5;
 }
@@ -1569,7 +1569,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Int64_instRxiHasSize___lam__0(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Data/Range/Polymorphic/UInt.c b/stage0/stdlib/Init/Data/Range/Polymorphic/UInt.c
index b35bd033b4..d23ddabbcf 100644
--- a/stage0/stdlib/Init/Data/Range/Polymorphic/UInt.c
+++ b/stage0/stdlib/Init/Data/Range/Polymorphic/UInt.c
@@ -701,7 +701,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_UInt64_instUpwardEnumerable___lam__0(x_2);
 return x_3;
 }
@@ -747,7 +747,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_UInt64_instUpwardEnumerable___lam__1(x_1, x_3);
 lean_dec(x_1);
 return x_4;
@@ -800,9 +800,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_UInt64_instHasSize___lam__0(x_3, x_4);
 return x_5;
 }
@@ -829,9 +829,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_UInt64_instHasSize__1___lam__0(x_3, x_4);
 return x_5;
 }
@@ -852,7 +852,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_UInt64_instHasSize__2___lam__0(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Data/Repr.c b/stage0/stdlib/Init/Data/Repr.c
index d8bdb30c29..78869883f6 100644
--- a/stage0/stdlib/Init/Data/Repr.c
+++ b/stage0/stdlib/Init/Data/Repr.c
@@ -2732,7 +2732,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_instReprUInt64___lam__0(x_3, x_2);
 lean_dec(x_2);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/SInt/Basic.c b/stage0/stdlib/Init/Data/SInt/Basic.c
index 4cc362ec44..994a1b9701 100644
--- a/stage0/stdlib/Init/Data/SInt/Basic.c
+++ b/stage0/stdlib/Init/Data/SInt/Basic.c
@@ -3074,7 +3074,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Int64_toBitVec(x_2);
 return x_3;
 }
@@ -3090,7 +3090,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_UInt64_toInt64(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -3157,7 +3157,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_int_sint(x_2);
 return x_3;
 }
@@ -3177,7 +3177,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Int64_toNatClampNeg(x_2);
 return x_3;
 }
@@ -3204,7 +3204,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_int8(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -3215,7 +3215,7 @@ _start:
 {
 uint64_t x_2; uint16_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_int16(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -3226,7 +3226,7 @@ _start:
 {
 uint64_t x_2; uint32_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_int32(x_2);
 x_4 = lean_box_uint32(x_3);
 return x_4;
@@ -3268,7 +3268,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_neg(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -3312,7 +3312,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_instToStringInt64___lam__0(x_2);
 return x_3;
 }
@@ -3350,7 +3350,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_instReprInt64___lam__0(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -3375,7 +3375,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_instHashableInt64___lam__0(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -3548,9 +3548,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_add(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3561,9 +3561,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_sub(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3574,9 +3574,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_mul(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3587,9 +3587,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_div(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3633,7 +3633,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Int64_pow(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
@@ -3645,9 +3645,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_mod(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3658,9 +3658,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_land(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3671,9 +3671,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_lor(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3684,9 +3684,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_xor(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3697,9 +3697,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_shift_left(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3710,9 +3710,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_shift_right(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3723,7 +3723,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_complement(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -3734,7 +3734,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_abs(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -3745,9 +3745,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_dec_eq(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -3799,9 +3799,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instDecidableEqInt64(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -3822,9 +3822,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_dec_lt(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -3835,9 +3835,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_int64_dec_le(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -3863,9 +3863,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instMaxInt64___lam__0(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -3891,9 +3891,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instMinInt64___lam__0(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -4135,7 +4135,7 @@ _start:
 {
 uint64_t x_2; size_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_isize(x_2);
 x_4 = lean_box_usize(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/SInt/Float.c b/stage0/stdlib/Init/Data/SInt/Float.c
index e4073bbf2c..5ca1de1b90 100644
--- a/stage0/stdlib/Init/Data/SInt/Float.c
+++ b/stage0/stdlib/Init/Data/SInt/Float.c
@@ -124,7 +124,7 @@ _start:
 {
 uint64_t x_2; double x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_float(x_2);
 x_4 = lean_box_float(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/SInt/Float32.c b/stage0/stdlib/Init/Data/SInt/Float32.c
index 882f0228d5..1639f40ddd 100644
--- a/stage0/stdlib/Init/Data/SInt/Float32.c
+++ b/stage0/stdlib/Init/Data/SInt/Float32.c
@@ -124,7 +124,7 @@ _start:
 {
 uint64_t x_2; float x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_int64_to_float32(x_2);
 x_4 = lean_box_float32(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/ToString/Basic.c b/stage0/stdlib/Init/Data/ToString/Basic.c
index a6778c3980..02a43d72c5 100644
--- a/stage0/stdlib/Init/Data/ToString/Basic.c
+++ b/stage0/stdlib/Init/Data/ToString/Basic.c
@@ -613,7 +613,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_instToStringUInt64___lam__0(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Data/UInt/Basic.c b/stage0/stdlib/Init/Data/UInt/Basic.c
index ed59ae9848..506ceada99 100644
--- a/stage0/stdlib/Init/Data/UInt/Basic.c
+++ b/stage0/stdlib/Init/Data/UInt/Basic.c
@@ -1537,9 +1537,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_add(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1550,9 +1550,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_sub(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1563,9 +1563,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_mul(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1576,9 +1576,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_div(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1613,7 +1613,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_UInt64_pow(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
@@ -1625,9 +1625,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_mod(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1669,7 +1669,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_UInt64_modn(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
@@ -1681,9 +1681,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_land(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1694,9 +1694,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_lor(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1707,9 +1707,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_xor(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1720,9 +1720,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_shift_left(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1733,9 +1733,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_shift_right(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1762,7 +1762,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_complement(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -1773,7 +1773,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_neg(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -1794,9 +1794,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_dec_lt(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -1807,9 +1807,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_dec_le(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -1835,9 +1835,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instMaxUInt64___lam__0(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1863,9 +1863,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instMinUInt64___lam__0(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -2183,7 +2183,7 @@ _start:
 {
 uint64_t x_2; size_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_usize(x_2);
 x_4 = lean_box_usize(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/UInt/BasicAux.c b/stage0/stdlib/Init/Data/UInt/BasicAux.c
index bae4b30ea5..8d6acbe09e 100644
--- a/stage0/stdlib/Init/Data/UInt/BasicAux.c
+++ b/stage0/stdlib/Init/Data/UInt/BasicAux.c
@@ -559,7 +559,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_UInt64_toFin(x_2);
 return x_3;
 }
@@ -652,7 +652,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_nat(x_2);
 return x_3;
 }
@@ -662,7 +662,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_uint8(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -673,7 +673,7 @@ _start:
 {
 uint64_t x_2; uint16_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_uint16(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -684,7 +684,7 @@ _start:
 {
 uint64_t x_2; uint32_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_uint32(x_2);
 x_4 = lean_box_uint32(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/UInt/Log2.c b/stage0/stdlib/Init/Data/UInt/Log2.c
index d27d2772b7..9d8dfd347a 100644
--- a/stage0/stdlib/Init/Data/UInt/Log2.c
+++ b/stage0/stdlib/Init/Data/UInt/Log2.c
@@ -59,7 +59,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_log2(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
diff --git a/stage0/stdlib/Init/Data/Vector/Basic.c b/stage0/stdlib/Init/Data/Vector/Basic.c
index 482e0df8d8..ced5c9e258 100644
--- a/stage0/stdlib/Init/Data/Vector/Basic.c
+++ b/stage0/stdlib/Init/Data/Vector/Basic.c
@@ -421,10 +421,10 @@ LEAN_EXPORT lean_object* l_Vector_mapFinIdx___redArg(lean_object*, lean_object*)
 LEAN_EXPORT lean_object* l_Vector_mapFinIdx(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_mapFinIdx___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Vector_mapM___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Vector_mapM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -434,17 +434,17 @@ LEAN_EXPORT lean_object* l_Vector_forM___redArg(lean_object*, lean_object*, lean
 LEAN_EXPORT lean_object* l_Vector_forM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_forM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go(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_Init_Data_Vector_Basic_0__Vector_flatMapM_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_flatMapM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_flatMapM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_flatMapM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map(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_Vector_mapFinIdxM_map___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2915,15 +2915,6 @@ lean_dec(x_2);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0___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_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg(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:
 {
@@ -2953,7 +2944,7 @@ lean_inc(x_11);
 lean_inc_ref(x_4);
 lean_inc(x_3);
 lean_inc(x_5);
-x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0___boxed), 7, 6);
+x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0), 7, 6);
 lean_closure_set(x_12, 0, x_5);
 lean_closure_set(x_12, 1, x_6);
 lean_closure_set(x_12, 2, x_1);
@@ -2980,6 +2971,15 @@ x_11 = l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg(x_3, x_4, x
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0___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_Init_Data_Vector_Basic_0__Vector_mapM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_mapM_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
@@ -3162,16 +3162,6 @@ lean_dec(x_3);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0___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_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec_ref(x_7);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg(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:
 {
@@ -3201,7 +3191,7 @@ lean_inc(x_11);
 lean_inc(x_4);
 lean_inc_ref(x_3);
 lean_inc(x_5);
-x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0___boxed), 7, 6);
+x_12 = lean_alloc_closure((void*)(l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0), 7, 6);
 lean_closure_set(x_12, 0, x_5);
 lean_closure_set(x_12, 1, x_6);
 lean_closure_set(x_12, 2, x_1);
@@ -3228,6 +3218,16 @@ x_11 = l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg(x_3, x_
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0___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_Init_Data_Vector_Basic_0__Vector_flatMapM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec_ref(x_7);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_Basic_0__Vector_flatMapM_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
@@ -3274,16 +3274,6 @@ lean_dec(x_5);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___lam__0___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_Vector_mapFinIdxM_map___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_1);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg(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:
 {
@@ -3314,7 +3304,7 @@ x_14 = lean_nat_sub(x_4, x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_5);
-x_15 = lean_alloc_closure((void*)(l_Vector_mapFinIdxM_map___redArg___lam__0___boxed), 7, 6);
+x_15 = lean_alloc_closure((void*)(l_Vector_mapFinIdxM_map___redArg___lam__0), 7, 6);
 lean_closure_set(x_15, 0, x_5);
 lean_closure_set(x_15, 1, x_6);
 lean_closure_set(x_15, 2, x_1);
@@ -3340,6 +3330,16 @@ x_11 = l_Vector_mapFinIdxM_map___redArg(x_3, x_4, x_5, x_6, x_9, x_10);
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___lam__0___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_Vector_mapFinIdxM_map___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_1);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Vector_mapFinIdxM_map___redArg___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:
 {
diff --git a/stage0/stdlib/Init/Data/Vector/OfFn.c b/stage0/stdlib/Init/Data/Vector/OfFn.c
index ae068671ae..32ea4f7576 100644
--- a/stage0/stdlib/Init/Data/Vector/OfFn.c
+++ b/stage0/stdlib/Init/Data/Vector/OfFn.c
@@ -13,12 +13,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Vector_ofFnM___redArg(lean_object*, lean_object*, lean_object*);
@@ -79,15 +79,6 @@ static lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM__go__succ_
 static lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM__go__succ___auto__5___closed__25;
 static lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM__go__succ___auto__5___closed__26;
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM__go__succ___auto__5;
-LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -115,7 +106,7 @@ x_10 = lean_ctor_get(x_2, 1);
 lean_inc(x_10);
 lean_inc(x_3);
 lean_inc(x_4);
-x_11 = lean_alloc_closure((void*)(l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0___boxed), 6, 5);
+x_11 = lean_alloc_closure((void*)(l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0), 6, 5);
 lean_closure_set(x_11, 0, x_4);
 lean_closure_set(x_11, 1, x_5);
 lean_closure_set(x_11, 2, x_1);
@@ -138,6 +129,15 @@ x_10 = l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg(x_3, x_4, x
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Vector_OfFn_0__Vector_ofFnM_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
diff --git a/stage0/stdlib/Init/GrindInstances/Ring/SInt.c b/stage0/stdlib/Init/GrindInstances/Ring/SInt.c
index fff51a618a..a0750c4c85 100644
--- a/stage0/stdlib/Init/GrindInstances/Ring/SInt.c
+++ b/stage0/stdlib/Init/GrindInstances/Ring/SInt.c
@@ -370,7 +370,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Grind_instCommRingInt64___lam__0(x_1, x_3);
 lean_dec(x_1);
 x_5 = lean_box_uint64(x_4);
@@ -391,7 +391,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Grind_instCommRingInt64___lam__1(x_1, x_3);
 lean_dec(x_1);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Init/GrindInstances/Ring/UInt.c b/stage0/stdlib/Init/GrindInstances/Ring/UInt.c
index 6588b5013f..5f027b2e9c 100644
--- a/stage0/stdlib/Init/GrindInstances/Ring/UInt.c
+++ b/stage0/stdlib/Init/GrindInstances/Ring/UInt.c
@@ -370,7 +370,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Grind_instCommRingUInt64___lam__0(x_1, x_3);
 lean_dec(x_1);
 x_5 = lean_box_uint64(x_4);
@@ -391,7 +391,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Grind_instCommRingUInt64___lam__1(x_1, x_3);
 lean_dec(x_1);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Init/GrindInstances/ToInt.c b/stage0/stdlib/Init/GrindInstances/ToInt.c
index dd426d039d..a7e4c3d264 100644
--- a/stage0/stdlib/Init/GrindInstances/ToInt.c
+++ b/stage0/stdlib/Init/GrindInstances/ToInt.c
@@ -181,7 +181,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Grind_instToIntUInt64UintOfNatNat___lam__0(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Meta/Defs.c b/stage0/stdlib/Init/Meta/Defs.c
index 698029cb68..e119487b97 100644
--- a/stage0/stdlib/Init/Meta/Defs.c
+++ b/stage0/stdlib/Init/Meta/Defs.c
@@ -1006,10 +1006,10 @@ LEAN_EXPORT lean_object* l_Array_filterSepElemsM___at___00Array_filterSepElems_s
 LEAN_EXPORT lean_object* l_Array_filterSepElemsM___at___00Array_filterSepElems_spec__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterSepElems(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterSepElems___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_mod(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapSepElemsM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapSepElemsM(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -16569,15 +16569,6 @@ lean_dec_ref(x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -16627,7 +16618,7 @@ lean_inc(x_11);
 x_20 = lean_ctor_get(x_1, 1);
 lean_inc(x_20);
 lean_inc(x_3);
-x_21 = lean_alloc_closure((void*)(l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0___boxed), 6, 5);
+x_21 = lean_alloc_closure((void*)(l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0), 6, 5);
 lean_closure_set(x_21, 0, x_4);
 lean_closure_set(x_21, 1, x_5);
 lean_closure_set(x_21, 2, x_1);
@@ -16651,6 +16642,15 @@ x_10 = l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg(x_3, x_4, x_
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Meta_Defs_0__Array_mapSepElemsMAux(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:
 {
diff --git a/stage0/stdlib/Init/Prelude.c b/stage0/stdlib/Init/Prelude.c
index 59739819fb..d9a6eb0e25 100644
--- a/stage0/stdlib/Init/Prelude.c
+++ b/stage0/stdlib/Init/Prelude.c
@@ -3925,7 +3925,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = lean_uint64_to_nat(x_2);
 return x_3;
 }
@@ -3945,9 +3945,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_dec_eq(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -3966,9 +3966,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_instDecidableEqUInt64(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -9570,9 +9570,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uint64_mix_hash(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -9584,7 +9584,7 @@ _start:
 lean_object* x_3; uint64_t x_4; 
 x_3 = lean_apply_1(x_1, x_2);
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 return x_4;
 }
 }
diff --git a/stage0/stdlib/Lake/Build/Common.c b/stage0/stdlib/Lake/Build/Common.c
index 472c7f6dd1..c23306e679 100644
--- a/stage0/stdlib/Lake/Build/Common.c
+++ b/stage0/stdlib/Lake/Build/Common.c
@@ -1620,7 +1620,7 @@ lean_ctor_set(x_16, 0, x_14);
 lean_ctor_set(x_16, 1, x_10);
 lean_ctor_set(x_16, 2, x_15);
 x_17 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 lean_ctor_set_uint64(x_16, sizeof(void*)*3, x_17);
 x_18 = lean_box(0);
 x_19 = l_Lake_BuildTrace_mix(x_8, x_16);
@@ -1656,7 +1656,7 @@ lean_ctor_set(x_33, 0, x_31);
 lean_ctor_set(x_33, 1, x_27);
 lean_ctor_set(x_33, 2, x_32);
 x_34 = lean_unbox_uint64(x_26);
-lean_dec(x_26);
+lean_dec_ref(x_26);
 lean_ctor_set_uint64(x_33, sizeof(void*)*3, x_34);
 x_35 = lean_box(0);
 x_36 = l_Lake_BuildTrace_mix(x_24, x_33);
@@ -1704,7 +1704,7 @@ lean_ctor_set(x_22, 0, x_20);
 lean_ctor_set(x_22, 1, x_16);
 lean_ctor_set(x_22, 2, x_21);
 x_23 = lean_unbox_uint64(x_15);
-lean_dec(x_15);
+lean_dec_ref(x_15);
 lean_ctor_set_uint64(x_22, sizeof(void*)*3, x_23);
 x_24 = lean_box(0);
 x_25 = l_Lake_BuildTrace_mix(x_14, x_22);
@@ -1740,7 +1740,7 @@ lean_ctor_set(x_39, 0, x_37);
 lean_ctor_set(x_39, 1, x_33);
 lean_ctor_set(x_39, 2, x_38);
 x_40 = lean_unbox_uint64(x_32);
-lean_dec(x_32);
+lean_dec_ref(x_32);
 lean_ctor_set_uint64(x_39, sizeof(void*)*3, x_40);
 x_41 = lean_box(0);
 x_42 = l_Lake_BuildTrace_mix(x_30, x_39);
@@ -2003,7 +2003,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_BuildMetadata_ofStub(x_2);
 return x_3;
 }
@@ -3472,7 +3472,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_BuildMetadata_ofFetch(x_3, x_2);
 return x_4;
 }
@@ -3959,7 +3959,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Lake_writeFetchTrace(x_1, x_5, x_3);
 return x_6;
 }
@@ -5695,7 +5695,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = l_Lake_SavedTrace_replayOrFetchIfUpToDate___redArg(x_5, x_2, x_3);
 lean_dec(x_2);
 return x_6;
@@ -5714,7 +5714,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = l_Lake_SavedTrace_replayOrFetchIfUpToDate(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
@@ -8257,7 +8257,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lake_writeFileHash(x_1, x_4);
 return x_5;
 }
@@ -12661,7 +12661,7 @@ _start:
 {
 uint64_t x_13; lean_object* x_14; 
 x_13 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_14 = l_Lake_getArtifacts_x3f___redArg(x_1, x_13, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 return x_14;
 }
@@ -12679,7 +12679,7 @@ _start:
 {
 uint64_t x_14; lean_object* x_15; 
 x_14 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_15 = l_Lake_getArtifacts_x3f(x_1, x_2, x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 return x_15;
 }
@@ -15348,7 +15348,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_9 = l_Lake_getArtifacts_x3f___at___00Lake_buildArtifactUnlessUpToDate_spec__0___redArg(x_8, x_2, x_3, x_4, x_5, x_6);
 return x_9;
 }
@@ -15366,7 +15366,7 @@ _start:
 {
 uint64_t x_12; lean_object* x_13; 
 x_12 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_13 = l_Lake_getArtifacts_x3f___at___00Lake_buildArtifactUnlessUpToDate_spec__0(x_1, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -15975,7 +15975,7 @@ _start:
 {
 uint64_t x_16; uint8_t x_17; uint8_t x_18; lean_object* x_19; 
 x_16 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_17 = lean_unbox(x_6);
 x_18 = lean_unbox(x_8);
 x_19 = l_Lake_buildArtifactUnlessUpToDate___lam__0(x_16, x_2, x_3, x_4, x_5, x_17, x_7, x_18, x_9, x_10, x_11, x_12, x_13, x_14);
@@ -16223,7 +16223,7 @@ x_19 = lean_unbox(x_4);
 x_20 = lean_unbox(x_5);
 x_21 = lean_unbox(x_6);
 x_22 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_23 = l_Lake_buildArtifactUnlessUpToDate___lam__1(x_18, x_2, x_3, x_19, x_20, x_21, x_7, x_8, x_22, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -19420,7 +19420,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_buildO___lam__0(x_3, x_2);
 lean_dec_ref(x_2);
 x_5 = lean_box_uint64(x_4);
@@ -20163,7 +20163,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lake_buildLeanO_spec__1(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lake/Build/ExternLib.c b/stage0/stdlib/Lake/Build/ExternLib.c
index af8f10e5c9..8ffc02a656 100644
--- a/stage0/stdlib/Lake/Build/ExternLib.c
+++ b/stage0/stdlib/Lake/Build/ExternLib.c
@@ -709,7 +709,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lake_buildLeanSharedLibOfStatic_spec__1(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lake/Build/Module.c b/stage0/stdlib/Lake/Build/Module.c
index 873c0dfce9..0299bc9c52 100644
--- a/stage0/stdlib/Lake/Build/Module.c
+++ b/stage0/stdlib/Lake/Build/Module.c
@@ -1163,7 +1163,6 @@ LEAN_EXPORT lean_object* l___private_Lake_Build_Module_0__Lake_setupExternalModu
 LEAN_EXPORT lean_object* l___private_Lake_Build_Module_0__Lake_setupExternalModule___lam__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_Build_Module_0__Lake_setupExternalModule___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 10, .m_capacity = 10, .m_length = 9, .m_data = "<targets>"};
 static const lean_object* l___private_Lake_Build_Module_0__Lake_setupExternalModule___closed__0 = (const lean_object*)&l___private_Lake_Build_Module_0__Lake_setupExternalModule___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1;
 extern lean_object* l_Lake_Package_extraDepFacet;
 extern lean_object* l_Lake_Package_keyword;
 LEAN_EXPORT lean_object* l___private_Lake_Build_Module_0__Lake_setupExternalModule(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -12138,7 +12137,7 @@ _start:
 uint8_t x_7; uint64_t x_8; size_t x_9; size_t x_10; uint8_t x_11; lean_object* x_12; 
 x_7 = lean_unbox(x_1);
 x_8 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_9 = lean_unbox_usize(x_5);
 lean_dec(x_5);
 x_10 = lean_unbox_usize(x_6);
@@ -26214,7 +26213,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_9 = l_Lake_getArtifacts_x3f___at___00__private_Lake_Build_Module_0__Lake_Module_recBuildLean_spec__1___redArg(x_8, x_2, x_3, x_4, x_5, x_6);
 return x_9;
 }
@@ -26232,7 +26231,7 @@ _start:
 {
 uint64_t x_12; lean_object* x_13; 
 x_12 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_13 = l_Lake_getArtifacts_x3f___at___00__private_Lake_Build_Module_0__Lake_Module_recBuildLean_spec__1(x_1, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -26566,7 +26565,7 @@ x_16 = lean_unbox(x_1);
 x_17 = lean_unbox(x_3);
 x_18 = lean_unbox(x_4);
 x_19 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_20 = l___private_Lake_Build_Module_0__Lake_Module_recBuildLean___lam__0(x_16, x_2, x_17, x_18, x_5, x_6, x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -27103,7 +27102,7 @@ _start:
 {
 uint64_t x_15; uint8_t x_16; lean_object* x_17; 
 x_15 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_16 = lean_unbox(x_7);
 x_17 = l___private_Lake_Build_Module_0__Lake_Module_recBuildLean___lam__1(x_15, x_2, x_3, x_4, x_5, x_6, x_16, x_8, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_11);
@@ -27755,7 +27754,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_Build_Module_0__Lake_Module_recBuildLean_spec__3(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -37782,15 +37781,6 @@ x_15 = l___private_Lake_Build_Module_0__Lake_setupExternalModule___lam__5(x_1, x
 return x_15;
 }
 }
-static lean_object* _init_l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_Build_Module_0__Lake_setupExternalModule(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -38023,7 +38013,7 @@ x_60 = lean_ctor_get(x_58, 0);
 x_61 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_Build_Module_0__Lake_fetchImportInfo_spec__3___closed__2));
 x_62 = l_Lake_Job_collectArray___redArg(x_49, x_61);
 lean_dec_ref(x_49);
-x_63 = l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1;
+x_63 = l___private_Lake_Build_Module_0__Lake_setupEditedModule___boxed__const__1;
 x_64 = lean_box(x_24);
 x_65 = lean_box(x_48);
 x_66 = lean_alloc_closure((void*)(l___private_Lake_Build_Module_0__Lake_setupExternalModule___lam__4___boxed), 19, 11);
@@ -38061,7 +38051,7 @@ lean_dec(x_58);
 x_73 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_Build_Module_0__Lake_fetchImportInfo_spec__3___closed__2));
 x_74 = l_Lake_Job_collectArray___redArg(x_49, x_73);
 lean_dec_ref(x_49);
-x_75 = l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1;
+x_75 = l___private_Lake_Build_Module_0__Lake_setupEditedModule___boxed__const__1;
 x_76 = lean_box(x_24);
 x_77 = lean_box(x_48);
 x_78 = lean_alloc_closure((void*)(l___private_Lake_Build_Module_0__Lake_setupExternalModule___lam__4___boxed), 19, 11);
@@ -40116,8 +40106,6 @@ l_Array_filterMapM___at___00__private_Lake_Build_Module_0__Lake_setupEditedModul
 lean_mark_persistent(l_Array_filterMapM___at___00__private_Lake_Build_Module_0__Lake_setupEditedModule_spec__1___closed__0);
 l___private_Lake_Build_Module_0__Lake_setupEditedModule___boxed__const__1 = _init_l___private_Lake_Build_Module_0__Lake_setupEditedModule___boxed__const__1();
 lean_mark_persistent(l___private_Lake_Build_Module_0__Lake_setupEditedModule___boxed__const__1);
-l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1 = _init_l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1();
-lean_mark_persistent(l___private_Lake_Build_Module_0__Lake_setupExternalModule___boxed__const__1);
 l___private_Lake_Build_Module_0__Lake_prepareLeanCommand_mkArgs___redArg___closed__2 = _init_l___private_Lake_Build_Module_0__Lake_prepareLeanCommand_mkArgs___redArg___closed__2();
 lean_mark_persistent(l___private_Lake_Build_Module_0__Lake_prepareLeanCommand_mkArgs___redArg___closed__2);
 l___private_Lake_Build_Module_0__Lake_prepareLeanCommand_mkArgs___redArg___closed__3 = _init_l___private_Lake_Build_Module_0__Lake_prepareLeanCommand_mkArgs___redArg___closed__3();
diff --git a/stage0/stdlib/Lake/Build/Trace.c b/stage0/stdlib/Lake/Build/Trace.c
index bf3ebf2b0a..6227558d60 100644
--- a/stage0/stdlib/Lake/Build/Trace.c
+++ b/stage0/stdlib/Lake/Build/Trace.c
@@ -259,7 +259,6 @@ LEAN_EXPORT lean_object* l_Lake_computeArrayHash___redArg___lam__1(lean_object*,
 LEAN_EXPORT lean_object* l_Lake_computeArrayHash___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_computeArrayHash___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_computeArrayHash___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_computeArrayHash___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_computeArrayHash(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_instComputeHashArrayOfMonad___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_instComputeHashArrayOfMonad(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -866,7 +865,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_instReprHash_repr___redArg(x_2);
 return x_3;
 }
@@ -884,7 +883,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_instReprHash_repr(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -903,9 +902,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lake_instDecidableEqHash_decEq(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -924,9 +923,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lake_instDecidableEqHash(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -943,7 +942,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_Hash_instHashable___lam__0(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -1139,7 +1138,7 @@ _start:
 {
 uint64_t x_5; uint64_t x_6; lean_object* x_7; 
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_6 = l___private_Init_Data_Nat_Fold_0__Nat_foldTR_loop___at___00Lake_Hash_ofHex_spec__0___redArg(x_1, x_2, x_3, x_5);
 lean_dec(x_2);
 lean_dec_ref(x_1);
@@ -1180,7 +1179,7 @@ _start:
 {
 uint64_t x_6; uint64_t x_7; lean_object* x_8; 
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = l___private_Init_Data_Nat_Fold_0__Nat_foldTR_loop___at___00Lake_Hash_ofHex_spec__0(x_1, x_2, x_3, x_4, x_6);
 lean_dec(x_2);
 lean_dec_ref(x_1);
@@ -1255,7 +1254,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_Hash_hex(x_2);
 return x_3;
 }
@@ -1371,9 +1370,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lake_Hash_mix(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1392,7 +1391,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_Hash_toString(x_2);
 return x_3;
 }
@@ -1404,7 +1403,7 @@ uint64_t x_3; lean_object* x_4; uint64_t x_5; uint64_t x_6;
 x_3 = 1723;
 x_4 = lean_apply_1(x_1, x_2);
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_6 = lean_uint64_mix_hash(x_3, x_5);
 return x_6;
 }
@@ -1425,7 +1424,7 @@ uint64_t x_4; lean_object* x_5; uint64_t x_6; uint64_t x_7;
 x_4 = 1723;
 x_5 = lean_apply_1(x_2, x_3);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_mix_hash(x_4, x_6);
 return x_7;
 }
@@ -1563,7 +1562,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_Hash_toJson(x_2);
 return x_3;
 }
@@ -1744,7 +1743,7 @@ _start:
 lean_object* x_3; uint64_t x_4; 
 x_3 = lean_apply_1(x_1, x_2);
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 return x_4;
 }
 }
@@ -1763,7 +1762,7 @@ _start:
 lean_object* x_4; uint64_t x_5; 
 x_4 = lean_apply_1(x_2, x_3);
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 return x_5;
 }
 }
@@ -2010,9 +2009,9 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Lake_computeArrayHash___redArg___lam__0(x_4, x_2, x_5);
 return x_6;
 }
@@ -2035,7 +2034,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_7 = l_Lake_computeArrayHash___redArg___lam__1(x_1, x_2, x_3, x_6, x_5);
 return x_7;
 }
@@ -2115,15 +2114,6 @@ return x_23;
 }
 }
 }
-static lean_object* _init_l_Lake_computeArrayHash___boxed__const__1() {
-_start:
-{
-uint64_t x_1; lean_object* x_2; 
-x_1 = 1723;
-x_2 = lean_box_uint64(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_computeArrayHash(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2141,7 +2131,7 @@ lean_inc(x_8);
 lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec(x_3);
-x_12 = l_Lake_computeArrayHash___boxed__const__1;
+x_12 = l_Lake_computeArrayHash___redArg___boxed__const__1;
 x_13 = lean_apply_2(x_8, lean_box(0), x_12);
 return x_13;
 }
@@ -2164,7 +2154,7 @@ lean_dec_ref(x_14);
 lean_inc(x_8);
 lean_dec_ref(x_5);
 lean_dec_ref(x_4);
-x_16 = l_Lake_computeArrayHash___boxed__const__1;
+x_16 = l_Lake_computeArrayHash___redArg___boxed__const__1;
 x_17 = lean_apply_2(x_8, lean_box(0), x_16);
 return x_17;
 }
@@ -2173,7 +2163,7 @@ else
 size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; 
 x_18 = 0;
 x_19 = lean_usize_of_nat(x_10);
-x_20 = l_Lake_computeArrayHash___boxed__const__1;
+x_20 = l_Lake_computeArrayHash___redArg___boxed__const__1;
 x_21 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold(lean_box(0), lean_box(0), lean_box(0), x_4, x_14, x_5, x_18, x_19, x_20);
 return x_21;
 }
@@ -2183,7 +2173,7 @@ else
 size_t x_22; size_t x_23; lean_object* x_24; lean_object* x_25; 
 x_22 = 0;
 x_23 = lean_usize_of_nat(x_10);
-x_24 = l_Lake_computeArrayHash___boxed__const__1;
+x_24 = l_Lake_computeArrayHash___redArg___boxed__const__1;
 x_25 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold(lean_box(0), lean_box(0), lean_box(0), x_4, x_14, x_5, x_22, x_23, x_24);
 return x_25;
 }
@@ -2994,7 +2984,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_BuildTrace_ofHash(x_3, x_2);
 return x_4;
 }
@@ -3019,7 +3009,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lake_BuildTrace_instCoeHash___lam__0(x_2);
 return x_3;
 }
@@ -3340,7 +3330,7 @@ _start:
 {
 uint64_t x_6; uint8_t x_7; lean_object* x_8; 
 x_6 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_7 = l_Lake_BuildTrace_checkAgainstHash___redArg(x_1, x_2, x_6, x_4);
 lean_dec_ref(x_4);
 x_8 = lean_box(x_7);
@@ -3360,7 +3350,7 @@ _start:
 {
 uint64_t x_7; uint8_t x_8; lean_object* x_9; 
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l_Lake_BuildTrace_checkAgainstHash(x_1, x_2, x_3, x_7, x_5);
 lean_dec_ref(x_5);
 x_9 = lean_box(x_8);
@@ -3450,8 +3440,6 @@ l_Lake_Hash_ofBool___closed__0 = _init_l_Lake_Hash_ofBool___closed__0();
 l_Lake_Hash_ofBool___closed__1 = _init_l_Lake_Hash_ofBool___closed__1();
 l_Lake_computeArrayHash___redArg___boxed__const__1 = _init_l_Lake_computeArrayHash___redArg___boxed__const__1();
 lean_mark_persistent(l_Lake_computeArrayHash___redArg___boxed__const__1);
-l_Lake_computeArrayHash___boxed__const__1 = _init_l_Lake_computeArrayHash___boxed__const__1();
-lean_mark_persistent(l_Lake_computeArrayHash___boxed__const__1);
 l_Lake_MTime_instOfNat___closed__0 = _init_l_Lake_MTime_instOfNat___closed__0();
 lean_mark_persistent(l_Lake_MTime_instOfNat___closed__0);
 l_Lake_MTime_instOfNat = _init_l_Lake_MTime_instOfNat();
diff --git a/stage0/stdlib/Lake/CLI/Main.c b/stage0/stdlib/Lake/CLI/Main.c
index 98cf463a33..89b202e4ad 100644
--- a/stage0/stdlib/Lake/CLI/Main.c
+++ b/stage0/stdlib/Lake/CLI/Main.c
@@ -82,7 +82,6 @@ static const lean_object* l___private_Lake_CLI_Main_0__Lake_instMonadLiftLogIOCl
 LEAN_EXPORT const lean_object* l___private_Lake_CLI_Main_0__Lake_instMonadLiftLogIOCliStateM = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_instMonadLiftLogIOCliStateM___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___lam__0(lean_object*, uint8_t, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO(lean_object*, lean_object*, lean_object*);
@@ -291,7 +290,6 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lakeLongOption
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__57 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__57_value;
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__58_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 13, .m_capacity = 13, .m_length = 12, .m_data = "service name"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__58 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__58_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lake_Manifest_loadEntries(lean_object*);
 lean_object* l_Array_append___redArg(lean_object*, lean_object*);
@@ -346,7 +344,6 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_verifyInstall_
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_verifyInstall___closed__1 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_verifyInstall___closed__1_value;
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_verifyInstall___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 7, .m_capacity = 7, .m_length = 6, .m_data = "Lake:\n"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_verifyInstall___closed__2 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_verifyInstall___closed__2_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
 extern lean_object* l_Std_Format_defWidth;
 lean_object* l_Std_Format_pretty(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
@@ -496,7 +493,6 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_cache_get
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__5 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__5_value;
 static const lean_ctor_object l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__6_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 8, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__5_value),LEAN_SCALAR_PTR_LITERAL(3, 0, 0, 0, 0, 0, 0, 0)}};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__6 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__6_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
 lean_object* l_Lake_loadWorkspace___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lake_CacheService_downloadOutputArtifacts___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lake_GitRepo_resolveRevision___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -524,12 +520,10 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_cache_put
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put_invalidEndpointConfig___closed__4 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_put_invalidEndpointConfig___closed__4_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put_invalidEndpointConfig(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put_invalidEndpointConfig___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 77, .m_capacity = 77, .m_length = 76, .m_data = ": package has changes; artifacts will be uploaded for the most recent commit"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1;
 lean_object* l_Lake_GitRepo_getHeadRevision___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lake_CacheMap_load___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lake_CacheMap_collectOutputDescrs___boxed(lean_object*, lean_object*, lean_object*);
@@ -546,10 +540,8 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_cache_put
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__2 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__2_value;
 static const lean_ctor_object l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 8, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__2_value),LEAN_SCALAR_PTR_LITERAL(3, 0, 0, 0, 0, 0, 0, 0)}};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__3 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__3_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1;
 lean_object* l_Lake_Cache_writeMap(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -559,7 +551,6 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_cache_cle
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__0_value;
 static const lean_ctor_object l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 8, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__0_value),LEAN_SCALAR_PTR_LITERAL(3, 0, 0, 0, 0, 0, 0, 0)}};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__1 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__1_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1;
 lean_object* l_IO_FS_removeDirAll(lean_object*);
 uint8_t l_Lake_configFileExists(lean_object*);
 lean_object* l_Lake_loadWorkspaceRoot___boxed(lean_object*, lean_object*, lean_object*);
@@ -567,7 +558,6 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___la
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1;
 lean_object* l_Lake_helpCache(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_help(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed(lean_object*, lean_object*, lean_object*);
@@ -583,7 +573,6 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_cacheCli_
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cacheCli___closed__4 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cacheCli___closed__4_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cacheCli(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cacheCli___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1;
 LEAN_EXPORT lean_object* l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*);
@@ -594,22 +583,18 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_list(lean
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_list___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_processLeadingOptions___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_processLeadingOptions___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1;
 lean_object* l_Lake_Script_run(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__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___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__1;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_run(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_script_doc___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 12, .m_capacity = 12, .m_length = 11, .m_data = "script name"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_script_doc___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1;
 lean_object* l_Lake_helpScript(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_help(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed(lean_object*, lean_object*, lean_object*);
@@ -637,7 +622,6 @@ lean_object* l_Lake_BuildInfo_key(lean_object*);
 lean_object* l_Lake_BuildKey_toSimpleString(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_build_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_build_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1;
 lean_object* l_Lake_parseTargetSpecs(lean_object*, lean_object*);
 lean_object* l_Lake_buildSpecs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lake_Workspace_runBuild___redArg(lean_object*, lean_object*, lean_object*);
@@ -649,10 +633,8 @@ lean_object* l_Lake_loadPackage___boxed(lean_object*, lean_object*, lean_object*
 uint8_t l_Array_isEmpty___redArg(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_checkBuild(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_checkBuild___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
 lean_object* l_Lake_querySpecs___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_Lake_CLI_Main_0__Lake_lake_query(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_query___boxed(lean_object*, lean_object*, lean_object*);
@@ -664,14 +646,12 @@ LEAN_EXPORT lean_object* l_IO_ofExcept___at___00__private_Lake_CLI_Main_0__Lake_
 lean_object* l_Lean_Name_toStringWithToken___at___00Lean_Name_toString_spec__0(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_IO_println___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_IO_println___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__1___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 13, .m_capacity = 13, .m_length = 12, .m_data = "build failed"};
 static const lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__0_value;
 static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 8, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__0_value),LEAN_SCALAR_PTR_LITERAL(3, 0, 0, 0, 0, 0, 0, 0)}};
 static const lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__1 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__1_value;
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed__const__1;
 lean_object* lean_io_wait(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -684,14 +664,12 @@ lean_object* l_Lake_PartialBuildKey_toString(lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*);
 lean_object* l_Lake_Job_renew___redArg(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1;
 lean_object* l_Lake_PartialBuildKey_parse(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_queryKind___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 16, .m_capacity = 16, .m_length = 15, .m_data = "job computation"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_queryKind___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_queryKind___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2;
 lean_object* l_Lake_Workspace_runFetchM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_queryKind(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed(lean_object*, lean_object*, lean_object*);
@@ -725,19 +703,16 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_upload(lean_obje
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_upload___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_ctor_object l___private_Lake_CLI_Main_0__Lake_lake_cache___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 0, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1))}};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_cache___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 30, .m_capacity = 30, .m_length = 29, .m_data = "failed to parse header JSON: "};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed__const__1;
 lean_object* l_Lean_Json_parse(lean_object*);
 lean_object* l_Lean_instFromJsonModuleHeader_fromJson(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "-"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1;
 uint32_t l_Lake_setupFile(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_get_stdin();
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -748,7 +723,6 @@ static const lean_closure_object l___private_Lake_CLI_Main_0__Lake_lake_setupFil
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___closed__1 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_setupFile___closed__1_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1;
 lean_object* l_Lake_Package_test(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -756,7 +730,6 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_test(lean_object
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_test___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_checkTest(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_checkTest___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1;
 lean_object* l_Lake_Package_lint(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -772,11 +745,9 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Uns
 lean_object* l_List_reverse___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1;
 lean_object* l_Lake_Package_clean(lean_object*);
 LEAN_EXPORT lean_object* l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
 lean_object* l_Lake_Workspace_clean(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_clean(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed(lean_object*, lean_object*, lean_object*);
@@ -790,7 +761,6 @@ static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_shake___c
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__2 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__2_value;
 static const lean_ctor_object l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 8, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__2_value),LEAN_SCALAR_PTR_LITERAL(3, 0, 0, 0, 0, 0, 0, 0)}};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__3 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__3_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
 extern lean_object* l_Lean_searchPathRef;
 lean_object* l_Lake_Workspace_augmentedLeanPath(lean_object*);
 lean_object* l_Lake_Workspace_augmentedLeanSrcPath(lean_object*);
@@ -799,10 +769,8 @@ uint8_t l_Lake_Workspace_checkNoBuild___redArg(lean_object*, lean_object*);
 lean_object* l_Lake_Package_defaultTargetRoots(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_shake(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1;
 lean_object* l_Lake_serve(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -810,13 +778,10 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_serve(lean_objec
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_serve___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "="};
 static const lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_ctor_object l___private_Lake_CLI_Main_0__Lake_lake_env___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*0 + 8, .m_other = 0, .m_tag = 0}, .m_objs = {LEAN_SCALAR_PTR_LITERAL(1, 1, 1, 0, 0, 0, 0, 0)}};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_env___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_env___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__1;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2;
 lean_object* lean_io_process_spawn(lean_object*);
 lean_object* lean_io_process_child_wait(lean_object*, lean_object*);
 lean_object* l_Lake_Env_vars(lean_object*);
@@ -829,12 +794,10 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe___lam__0(lea
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_exe___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 18, .m_capacity = 18, .m_length = 17, .m_data = "executable target"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_exe___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
 lean_object* l_Lake_parseExeTargetSpec(lean_object*, lean_object*);
 lean_object* l_Lake_env(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1;
 lean_object* l_Lake_Workspace_evalLeanFile(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -844,7 +807,6 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lean(lean_object
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lean___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 4, .m_capacity = 4, .m_length = 3, .m_data = "bak"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
 uint8_t l_System_FilePath_pathExists(lean_object*);
 lean_object* l_Lake_Package_mkConfigString___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_FS_writeFile(lean_object*, lean_object*);
@@ -917,7 +879,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___00__private_Lake_CLI_Main_0__Lake_lake_reservoirConfig_spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___00__private_Lake_CLI_Main_0__Lake_lake_reservoirConfig_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterTR_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_reservoirConfig_spec__3(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1;
 lean_object* l_Lake_GitRepo_getTags(lean_object*);
 lean_object* l_Lean_Json_pretty(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0(lean_object*, lean_object*, lean_object*);
@@ -927,11 +888,9 @@ static const lean_closure_object l___private_Lake_CLI_Main_0__Lake_lake_reservoi
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___closed__0_value;
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 25, .m_capacity = 25, .m_length = 24, .m_data = "invalid target version: "};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___closed__1 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___closed__1_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1;
 lean_object* l___private_Lake_Util_Version_0__Lake_runVerParse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_versionTags___lam__0(lean_object*, lean_object*);
@@ -946,7 +905,6 @@ static const lean_closure_object l___private_Lake_CLI_Main_0__Lake_lake_selfChec
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake_selfCheck___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake_selfCheck___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_selfCheck(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_selfCheck___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1;
 lean_object* l_Lake_help(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_help(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_help___boxed(lean_object*, lean_object*, lean_object*);
@@ -1020,7 +978,6 @@ LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lakeCli(lean_object*,
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lakeCli___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lake_CLI_Main_0__Lake_lake___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 10, .m_capacity = 10, .m_length = 9, .m_data = "--version"};
 static const lean_object* l___private_Lake_CLI_Main_0__Lake_lake___closed__0 = (const lean_object*)&l___private_Lake_CLI_Main_0__Lake_lake___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
 extern lean_object* l_Lake_usage;
 extern lean_object* l_Lake_uiVersionString;
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake(lean_object*, lean_object*);
@@ -2065,15 +2022,6 @@ lean_dec_ref(x_4);
 return x_8;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -2133,7 +2081,7 @@ if (x_21 == 0)
 lean_object* x_22; lean_object* x_23; 
 x_22 = lean_ctor_get(x_12, 0);
 lean_dec(x_22);
-x_23 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1;
+x_23 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_12, 0, x_23);
 return x_12;
 }
@@ -2141,7 +2089,7 @@ else
 {
 lean_object* x_24; lean_object* x_25; 
 lean_dec(x_12);
-x_24 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1;
+x_24 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_25 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_25, 0, x_24);
 return x_25;
@@ -7637,15 +7585,6 @@ lean_dec_ref(x_2);
 return x_8;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lakeLongOption(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -11886,7 +11825,7 @@ lean_ctor_set(x_1399, 0, x_1394);
 lean_ctor_set_uint8(x_1399, sizeof(void*)*1, x_1398);
 x_1400 = l_Lake_OutStream_logEntry(x_1397, x_1399, x_1395, x_1396);
 lean_dec_ref(x_1399);
-x_1401 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_1401 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_1309, 0, x_1401);
 return x_1309;
 }
@@ -11906,7 +11845,7 @@ lean_ctor_set(x_1408, 0, x_1403);
 lean_ctor_set_uint8(x_1408, sizeof(void*)*1, x_1407);
 x_1409 = l_Lake_OutStream_logEntry(x_1406, x_1408, x_1404, x_1405);
 lean_dec_ref(x_1408);
-x_1410 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_1410 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_1411 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_1411, 0, x_1410);
 return x_1411;
@@ -12092,7 +12031,7 @@ lean_ctor_set(x_1464, 0, x_1459);
 lean_ctor_set_uint8(x_1464, sizeof(void*)*1, x_1463);
 x_1465 = l_Lake_OutStream_logEntry(x_1462, x_1464, x_1460, x_1461);
 lean_dec_ref(x_1464);
-x_1466 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_1466 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_1458)) {
  x_1467 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -12299,7 +12238,7 @@ lean_ctor_set(x_1523, 0, x_1518);
 lean_ctor_set_uint8(x_1523, sizeof(void*)*1, x_1522);
 x_1524 = l_Lake_OutStream_logEntry(x_1521, x_1523, x_1519, x_1520);
 lean_dec_ref(x_1523);
-x_1525 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_1525 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_1517)) {
  x_1526 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -12521,7 +12460,7 @@ lean_ctor_set(x_1585, 0, x_1580);
 lean_ctor_set_uint8(x_1585, sizeof(void*)*1, x_1584);
 x_1586 = l_Lake_OutStream_logEntry(x_1583, x_1585, x_1581, x_1582);
 lean_dec_ref(x_1585);
-x_1587 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_1587 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_1579)) {
  x_1588 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -12783,7 +12722,7 @@ lean_ctor_set(x_1653, 0, x_1648);
 lean_ctor_set_uint8(x_1653, sizeof(void*)*1, x_1652);
 x_1654 = l_Lake_OutStream_logEntry(x_1651, x_1653, x_1649, x_1650);
 lean_dec_ref(x_1653);
-x_1655 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_1655 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_1647)) {
  x_1656 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -14873,7 +14812,7 @@ x_2248 = 0;
 x_2249 = lean_box(1);
 x_2250 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__48));
 x_2251 = l_Lake_OutStream_logEntry(x_2249, x_2250, x_2247, x_2248);
-x_2252 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2252 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2191, 1);
 lean_ctor_set(x_2191, 0, x_2252);
 return x_2191;
@@ -15036,7 +14975,7 @@ x_2298 = 0;
 x_2299 = lean_box(1);
 x_2300 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__48));
 x_2301 = l_Lake_OutStream_logEntry(x_2299, x_2300, x_2297, x_2298);
-x_2302 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2302 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2191, 1);
 lean_ctor_set(x_2191, 0, x_2302);
 return x_2191;
@@ -15217,7 +15156,7 @@ x_2351 = 0;
 x_2352 = lean_box(1);
 x_2353 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__48));
 x_2354 = l_Lake_OutStream_logEntry(x_2352, x_2353, x_2350, x_2351);
-x_2355 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2355 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2191, 1);
 lean_ctor_set(x_2191, 0, x_2355);
 return x_2191;
@@ -15414,7 +15353,7 @@ x_2407 = 0;
 x_2408 = lean_box(1);
 x_2409 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__48));
 x_2410 = l_Lake_OutStream_logEntry(x_2408, x_2409, x_2406, x_2407);
-x_2411 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2411 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2191, 1);
 lean_ctor_set(x_2191, 0, x_2411);
 return x_2191;
@@ -15652,7 +15591,7 @@ x_2470 = 0;
 x_2471 = lean_box(1);
 x_2472 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__48));
 x_2473 = l_Lake_OutStream_logEntry(x_2471, x_2472, x_2469, x_2470);
-x_2474 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2474 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_2475 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_2475, 0, x_2474);
 return x_2475;
@@ -16757,7 +16696,7 @@ x_2781 = 0;
 x_2782 = lean_box(1);
 x_2783 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__52));
 x_2784 = l_Lake_OutStream_logEntry(x_2782, x_2783, x_2780, x_2781);
-x_2785 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2785 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_2715)) {
  x_2786 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -16951,7 +16890,7 @@ x_2850 = 0;
 x_2851 = lean_box(1);
 x_2852 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__55));
 x_2853 = l_Lake_OutStream_logEntry(x_2851, x_2852, x_2849, x_2850);
-x_2854 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2854 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2793, 1);
 lean_ctor_set(x_2793, 0, x_2854);
 return x_2793;
@@ -17108,7 +17047,7 @@ x_2899 = 0;
 x_2900 = lean_box(1);
 x_2901 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__55));
 x_2902 = l_Lake_OutStream_logEntry(x_2900, x_2901, x_2898, x_2899);
-x_2903 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2903 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2793, 1);
 lean_ctor_set(x_2793, 0, x_2903);
 return x_2793;
@@ -17283,7 +17222,7 @@ x_2951 = 0;
 x_2952 = lean_box(1);
 x_2953 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__55));
 x_2954 = l_Lake_OutStream_logEntry(x_2952, x_2953, x_2950, x_2951);
-x_2955 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_2955 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2793, 1);
 lean_ctor_set(x_2793, 0, x_2955);
 return x_2793;
@@ -17474,7 +17413,7 @@ x_3006 = 0;
 x_3007 = lean_box(1);
 x_3008 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__55));
 x_3009 = l_Lake_OutStream_logEntry(x_3007, x_3008, x_3005, x_3006);
-x_3010 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3010 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_2793, 1);
 lean_ctor_set(x_2793, 0, x_3010);
 return x_2793;
@@ -17706,7 +17645,7 @@ x_3068 = 0;
 x_3069 = lean_box(1);
 x_3070 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___closed__55));
 x_3071 = l_Lake_OutStream_logEntry(x_3069, x_3070, x_3067, x_3068);
-x_3072 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3072 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_3073 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_3073, 0, x_3072);
 return x_3073;
@@ -17789,7 +17728,7 @@ lean_ctor_set(x_3095, 0, x_3090);
 lean_ctor_set_uint8(x_3095, sizeof(void*)*1, x_3094);
 x_3096 = l_Lake_OutStream_logEntry(x_3093, x_3095, x_3091, x_3092);
 lean_dec_ref(x_3095);
-x_3097 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3097 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_3075, 1);
 lean_ctor_set(x_3075, 0, x_3097);
 return x_3075;
@@ -17939,7 +17878,7 @@ lean_ctor_set(x_3145, 0, x_3140);
 lean_ctor_set_uint8(x_3145, sizeof(void*)*1, x_3144);
 x_3146 = l_Lake_OutStream_logEntry(x_3143, x_3145, x_3141, x_3142);
 lean_dec_ref(x_3145);
-x_3147 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3147 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_3075, 1);
 lean_ctor_set(x_3075, 0, x_3147);
 return x_3075;
@@ -18114,7 +18053,7 @@ lean_ctor_set(x_3195, 0, x_3190);
 lean_ctor_set_uint8(x_3195, sizeof(void*)*1, x_3194);
 x_3196 = l_Lake_OutStream_logEntry(x_3193, x_3195, x_3191, x_3192);
 lean_dec_ref(x_3195);
-x_3197 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3197 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_3075, 1);
 lean_ctor_set(x_3075, 0, x_3197);
 return x_3075;
@@ -18305,7 +18244,7 @@ lean_ctor_set(x_3248, 0, x_3243);
 lean_ctor_set_uint8(x_3248, sizeof(void*)*1, x_3247);
 x_3249 = l_Lake_OutStream_logEntry(x_3246, x_3248, x_3244, x_3245);
 lean_dec_ref(x_3248);
-x_3250 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3250 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_3075, 1);
 lean_ctor_set(x_3075, 0, x_3250);
 return x_3075;
@@ -18538,7 +18477,7 @@ lean_ctor_set(x_3308, 0, x_3303);
 lean_ctor_set_uint8(x_3308, sizeof(void*)*1, x_3307);
 x_3309 = l_Lake_OutStream_logEntry(x_3306, x_3308, x_3304, x_3305);
 lean_dec_ref(x_3308);
-x_3310 = l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1;
+x_3310 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_3311 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_3311, 0, x_3310);
 return x_3311;
@@ -23016,15 +22955,6 @@ x_3 = l_IO_println___at___00__private_Lake_CLI_Main_0__Lake_verifyInstall_spec__
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_verifyInstall(lean_object* x_1) {
 _start:
 {
@@ -23172,7 +23102,7 @@ lean_ctor_set(x_48, 0, x_43);
 lean_ctor_set_uint8(x_48, sizeof(void*)*1, x_47);
 x_49 = l_Lake_OutStream_logEntry(x_46, x_48, x_44, x_45);
 lean_dec_ref(x_48);
-x_50 = l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
+x_50 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_22, 0, x_50);
 return x_22;
 }
@@ -23192,7 +23122,7 @@ lean_ctor_set(x_57, 0, x_52);
 lean_ctor_set_uint8(x_57, sizeof(void*)*1, x_56);
 x_58 = l_Lake_OutStream_logEntry(x_55, x_57, x_53, x_54);
 lean_dec_ref(x_57);
-x_59 = l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
+x_59 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_60 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_60, 0, x_59);
 return x_60;
@@ -23218,7 +23148,7 @@ lean_ctor_set(x_68, 0, x_63);
 lean_ctor_set_uint8(x_68, sizeof(void*)*1, x_67);
 x_69 = l_Lake_OutStream_logEntry(x_66, x_68, x_64, x_65);
 lean_dec_ref(x_68);
-x_70 = l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
+x_70 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_17, 0, x_70);
 return x_17;
 }
@@ -23238,7 +23168,7 @@ lean_ctor_set(x_77, 0, x_72);
 lean_ctor_set_uint8(x_77, sizeof(void*)*1, x_76);
 x_78 = l_Lake_OutStream_logEntry(x_75, x_77, x_73, x_74);
 lean_dec_ref(x_77);
-x_79 = l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
+x_79 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_80 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_80, 0, x_79);
 return x_80;
@@ -23264,7 +23194,7 @@ lean_ctor_set(x_88, 0, x_83);
 lean_ctor_set_uint8(x_88, sizeof(void*)*1, x_87);
 x_89 = l_Lake_OutStream_logEntry(x_86, x_88, x_84, x_85);
 lean_dec_ref(x_88);
-x_90 = l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
+x_90 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_12, 0, x_90);
 return x_12;
 }
@@ -23284,7 +23214,7 @@ lean_ctor_set(x_97, 0, x_92);
 lean_ctor_set_uint8(x_97, sizeof(void*)*1, x_96);
 x_98 = l_Lake_OutStream_logEntry(x_95, x_97, x_93, x_94);
 lean_dec_ref(x_97);
-x_99 = l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1;
+x_99 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_100 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_100, 0, x_99);
 return x_100;
@@ -27171,15 +27101,6 @@ lean_dec(x_1);
 return x_9;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -27372,7 +27293,7 @@ x_169 = 0;
 x_170 = lean_box(1);
 x_171 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__2));
 x_172 = l_Lake_OutStream_logEntry(x_170, x_171, x_168, x_169);
-x_173 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_173 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_12)) {
  x_174 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -27441,7 +27362,7 @@ x_185 = 0;
 x_186 = lean_box(1);
 x_187 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__4));
 x_188 = l_Lake_OutStream_logEntry(x_186, x_187, x_184, x_185);
-x_189 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_189 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_12)) {
  x_190 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -27498,7 +27419,7 @@ x_205 = 0;
 x_206 = lean_box(1);
 x_207 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__6));
 x_208 = l_Lake_OutStream_logEntry(x_206, x_207, x_204, x_205);
-x_209 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_209 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_197, 1);
 lean_ctor_set(x_197, 0, x_209);
 return x_197;
@@ -27548,7 +27469,7 @@ x_220 = 0;
 x_221 = lean_box(1);
 x_222 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__6));
 x_223 = l_Lake_OutStream_logEntry(x_221, x_222, x_219, x_220);
-x_224 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_224 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_197, 1);
 lean_ctor_set(x_197, 0, x_224);
 return x_197;
@@ -27608,7 +27529,7 @@ x_236 = 0;
 x_237 = lean_box(1);
 x_238 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___closed__6));
 x_239 = l_Lake_OutStream_logEntry(x_237, x_238, x_235, x_236);
-x_240 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_240 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_241 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_241, 0, x_240);
 return x_241;
@@ -27730,7 +27651,7 @@ lean_ctor_set(x_269, 0, x_264);
 lean_ctor_set_uint8(x_269, sizeof(void*)*1, x_268);
 x_270 = l_Lake_OutStream_logEntry(x_267, x_269, x_265, x_266);
 lean_dec_ref(x_269);
-x_271 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_271 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_8)) {
  x_272 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -27774,7 +27695,7 @@ lean_ctor_set(x_281, 0, x_276);
 lean_ctor_set_uint8(x_281, sizeof(void*)*1, x_280);
 x_282 = l_Lake_OutStream_logEntry(x_279, x_281, x_277, x_278);
 lean_dec_ref(x_281);
-x_283 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_283 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_8)) {
  x_284 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -27950,7 +27871,7 @@ lean_ctor_set(x_65, 0, x_60);
 lean_ctor_set_uint8(x_65, sizeof(void*)*1, x_64);
 x_66 = l_Lake_OutStream_logEntry(x_63, x_65, x_61, x_62);
 lean_dec_ref(x_65);
-x_67 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_67 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_51, 1);
 lean_ctor_set(x_51, 0, x_67);
 return x_51;
@@ -28006,7 +27927,7 @@ lean_ctor_set(x_80, 0, x_75);
 lean_ctor_set_uint8(x_80, sizeof(void*)*1, x_79);
 x_81 = l_Lake_OutStream_logEntry(x_78, x_80, x_76, x_77);
 lean_dec_ref(x_80);
-x_82 = l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1;
+x_82 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_83 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_83, 0, x_82);
 return x_83;
@@ -28776,15 +28697,6 @@ lean_dec(x_1);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -28799,7 +28711,7 @@ lean_ctor_set(x_11, 0, x_6);
 lean_ctor_set_uint8(x_11, sizeof(void*)*1, x_10);
 x_12 = l_Lake_OutStream_logEntry(x_9, x_11, x_7, x_8);
 lean_dec_ref(x_11);
-x_13 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed__const__1;
+x_13 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_14 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_14, 0, x_13);
 return x_14;
@@ -28815,15 +28727,6 @@ lean_dec(x_1);
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -29157,7 +29060,7 @@ lean_dec_ref(x_74);
 lean_dec_ref(x_22);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_93 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1;
+x_93 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_16)) {
  x_94 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -29242,7 +29145,7 @@ lean_dec_ref(x_74);
 lean_dec_ref(x_22);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_112 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1;
+x_112 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_16)) {
  x_113 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -29627,15 +29530,6 @@ x_13 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1(x_1, x_2, x_3,
 return x_13;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_put(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -29769,7 +29663,7 @@ x_41 = 0;
 x_42 = lean_box(1);
 x_43 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__3));
 x_44 = l_Lake_OutStream_logEntry(x_42, x_43, x_40, x_41);
-x_45 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1;
+x_45 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_18, 1);
 lean_ctor_set(x_18, 0, x_45);
 return x_18;
@@ -29858,7 +29752,7 @@ x_68 = 0;
 x_69 = lean_box(1);
 x_70 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__3));
 x_71 = l_Lake_OutStream_logEntry(x_69, x_70, x_67, x_68);
-x_72 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1;
+x_72 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_73 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_73, 0, x_72);
 return x_73;
@@ -30002,7 +29896,7 @@ x_109 = 0;
 x_110 = lean_box(1);
 x_111 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_put___closed__3));
 x_112 = l_Lake_OutStream_logEntry(x_110, x_111, x_108, x_109);
-x_113 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1;
+x_113 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_87)) {
  x_114 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -30045,15 +29939,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_cache_put(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -30217,7 +30102,7 @@ lean_ctor_set(x_40, 0, x_35);
 lean_ctor_set_uint8(x_40, sizeof(void*)*1, x_39);
 x_41 = l_Lake_OutStream_logEntry(x_38, x_40, x_36, x_37);
 lean_dec_ref(x_40);
-x_42 = l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1;
+x_42 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_28, 0, x_42);
 return x_28;
 }
@@ -30237,7 +30122,7 @@ lean_ctor_set(x_49, 0, x_44);
 lean_ctor_set_uint8(x_49, sizeof(void*)*1, x_48);
 x_50 = l_Lake_OutStream_logEntry(x_47, x_49, x_45, x_46);
 lean_dec_ref(x_49);
-x_51 = l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1;
+x_51 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_52 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_52, 0, x_51);
 return x_52;
@@ -30309,7 +30194,7 @@ lean_ctor_set(x_70, 0, x_65);
 lean_ctor_set_uint8(x_70, sizeof(void*)*1, x_69);
 x_71 = l_Lake_OutStream_logEntry(x_68, x_70, x_66, x_67);
 lean_dec_ref(x_70);
-x_72 = l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1;
+x_72 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_64)) {
  x_73 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -30400,7 +30285,7 @@ lean_ctor_set(x_94, 0, x_89);
 lean_ctor_set_uint8(x_94, sizeof(void*)*1, x_93);
 x_95 = l_Lake_OutStream_logEntry(x_92, x_94, x_90, x_91);
 lean_dec_ref(x_94);
-x_96 = l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1;
+x_96 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_88)) {
  x_97 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -30603,7 +30488,7 @@ lean_ctor_set(x_139, 0, x_134);
 lean_ctor_set_uint8(x_139, sizeof(void*)*1, x_138);
 x_140 = l_Lake_OutStream_logEntry(x_137, x_139, x_135, x_136);
 lean_dec_ref(x_139);
-x_141 = l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1;
+x_141 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_133)) {
  x_142 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -31077,15 +30962,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_cache_add(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -31133,7 +31009,7 @@ x_46 = 0;
 x_47 = lean_box(1);
 x_48 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__1));
 x_49 = l_Lake_OutStream_logEntry(x_47, x_48, x_45, x_46);
-x_50 = l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1;
+x_50 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_37, 1);
 lean_ctor_set(x_37, 0, x_50);
 return x_37;
@@ -31228,7 +31104,7 @@ x_68 = 0;
 x_69 = lean_box(1);
 x_70 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___closed__1));
 x_71 = l_Lake_OutStream_logEntry(x_69, x_70, x_67, x_68);
-x_72 = l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1;
+x_72 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_73 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_73, 0, x_72);
 return x_73;
@@ -31369,7 +31245,7 @@ lean_ctor_set(x_23, 0, x_18);
 lean_ctor_set_uint8(x_23, sizeof(void*)*1, x_22);
 x_24 = l_Lake_OutStream_logEntry(x_21, x_23, x_19, x_20);
 lean_dec_ref(x_23);
-x_25 = l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1;
+x_25 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_7, 0, x_25);
 return x_7;
 }
@@ -31389,7 +31265,7 @@ lean_ctor_set(x_32, 0, x_27);
 lean_ctor_set_uint8(x_32, sizeof(void*)*1, x_31);
 x_33 = l_Lake_OutStream_logEntry(x_30, x_32, x_28, x_29);
 lean_dec_ref(x_32);
-x_34 = l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1;
+x_34 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_35 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_35, 0, x_34);
 return x_35;
@@ -31544,15 +31420,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_cache_clean(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache_help(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -31641,7 +31508,7 @@ lean_ctor_set(x_25, 0, x_20);
 lean_ctor_set_uint8(x_25, sizeof(void*)*1, x_24);
 x_26 = l_Lake_OutStream_logEntry(x_23, x_25, x_21, x_22);
 lean_dec_ref(x_25);
-x_27 = l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1;
+x_27 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_7, 0, x_27);
 return x_7;
 }
@@ -31661,7 +31528,7 @@ lean_ctor_set(x_34, 0, x_29);
 lean_ctor_set_uint8(x_34, sizeof(void*)*1, x_33);
 x_35 = l_Lake_OutStream_logEntry(x_32, x_34, x_30, x_31);
 lean_dec_ref(x_34);
-x_36 = l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1;
+x_36 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_37 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_37, 0, x_36);
 return x_37;
@@ -31766,15 +31633,6 @@ x_5 = l___private_Lake_CLI_Main_0__Lake_lake_cacheCli(x_1, x_2, x_3);
 return x_5;
 }
 }
-static lean_object* _init_l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -31836,7 +31694,7 @@ lean_ctor_set(x_23, 0, x_18);
 lean_ctor_set_uint8(x_23, sizeof(void*)*1, x_22);
 x_24 = l_Lake_OutStream_logEntry(x_21, x_23, x_19, x_20);
 lean_dec_ref(x_23);
-x_25 = l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1;
+x_25 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_13, 0, x_25);
 return x_13;
 }
@@ -31856,7 +31714,7 @@ lean_ctor_set(x_32, 0, x_27);
 lean_ctor_set_uint8(x_32, sizeof(void*)*1, x_31);
 x_33 = l_Lake_OutStream_logEntry(x_30, x_32, x_28, x_29);
 lean_dec_ref(x_32);
-x_34 = l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1;
+x_34 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_35 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_35, 0, x_34);
 return x_35;
@@ -32754,15 +32612,6 @@ x_5 = l_Lake_processLeadingOptions___at___00__private_Lake_CLI_Main_0__Lake_lake
 return x_5;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
@@ -32880,7 +32729,7 @@ lean_ctor_set(x_42, 0, x_37);
 lean_ctor_set_uint8(x_42, sizeof(void*)*1, x_41);
 x_43 = l_Lake_OutStream_logEntry(x_40, x_42, x_38, x_39);
 lean_dec_ref(x_42);
-x_44 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1;
+x_44 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_16, 0, x_44);
 return x_16;
 }
@@ -32900,7 +32749,7 @@ lean_ctor_set(x_51, 0, x_46);
 lean_ctor_set_uint8(x_51, sizeof(void*)*1, x_50);
 x_52 = l_Lake_OutStream_logEntry(x_49, x_51, x_47, x_48);
 lean_dec_ref(x_51);
-x_53 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1;
+x_53 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_54 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_54, 0, x_53);
 return x_54;
@@ -32931,15 +32780,6 @@ x_2 = lean_box_uint32(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_run(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -33135,7 +32975,7 @@ lean_ctor_set(x_52, 0, x_47);
 lean_ctor_set_uint8(x_52, sizeof(void*)*1, x_51);
 x_53 = l_Lake_OutStream_logEntry(x_50, x_52, x_48, x_49);
 lean_dec_ref(x_52);
-x_54 = l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2;
+x_54 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_41, 0, x_54);
 return x_41;
 }
@@ -33155,7 +32995,7 @@ lean_ctor_set(x_61, 0, x_56);
 lean_ctor_set_uint8(x_61, sizeof(void*)*1, x_60);
 x_62 = l_Lake_OutStream_logEntry(x_59, x_61, x_57, x_58);
 lean_dec_ref(x_61);
-x_63 = l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2;
+x_63 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_64 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_64, 0, x_63);
 return x_64;
@@ -33312,7 +33152,7 @@ lean_ctor_set(x_99, 0, x_94);
 lean_ctor_set_uint8(x_99, sizeof(void*)*1, x_98);
 x_100 = l_Lake_OutStream_logEntry(x_97, x_99, x_95, x_96);
 lean_dec_ref(x_99);
-x_101 = l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2;
+x_101 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_93)) {
  x_102 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -33561,7 +33401,7 @@ lean_ctor_set(x_153, 0, x_148);
 lean_ctor_set_uint8(x_153, sizeof(void*)*1, x_152);
 x_154 = l_Lake_OutStream_logEntry(x_151, x_153, x_149, x_150);
 lean_dec_ref(x_153);
-x_155 = l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2;
+x_155 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_147)) {
  x_156 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -33637,15 +33477,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_script_run(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -33778,7 +33609,7 @@ lean_ctor_set(x_34, 0, x_29);
 lean_ctor_set_uint8(x_34, sizeof(void*)*1, x_33);
 x_35 = l_Lake_OutStream_logEntry(x_32, x_34, x_30, x_31);
 lean_dec_ref(x_34);
-x_36 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
+x_36 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_22, 0, x_36);
 return x_22;
 }
@@ -33798,7 +33629,7 @@ lean_ctor_set(x_43, 0, x_38);
 lean_ctor_set_uint8(x_43, sizeof(void*)*1, x_42);
 x_44 = l_Lake_OutStream_logEntry(x_41, x_43, x_39, x_40);
 lean_dec_ref(x_43);
-x_45 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
+x_45 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_46 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_46, 0, x_45);
 return x_46;
@@ -33886,7 +33717,7 @@ lean_ctor_set(x_64, 0, x_59);
 lean_ctor_set_uint8(x_64, sizeof(void*)*1, x_63);
 x_65 = l_Lake_OutStream_logEntry(x_62, x_64, x_60, x_61);
 lean_dec_ref(x_64);
-x_66 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
+x_66 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_58)) {
  x_67 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -34028,7 +33859,7 @@ lean_ctor_set(x_93, 0, x_88);
 lean_ctor_set_uint8(x_93, sizeof(void*)*1, x_92);
 x_94 = l_Lake_OutStream_logEntry(x_91, x_93, x_89, x_90);
 lean_dec_ref(x_93);
-x_95 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
+x_95 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_87)) {
  x_96 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -34185,7 +34016,7 @@ lean_ctor_set(x_125, 0, x_120);
 lean_ctor_set_uint8(x_125, sizeof(void*)*1, x_124);
 x_126 = l_Lake_OutStream_logEntry(x_123, x_125, x_121, x_122);
 lean_dec_ref(x_125);
-x_127 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
+x_127 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_119)) {
  x_128 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -34359,7 +34190,7 @@ lean_ctor_set(x_161, 0, x_156);
 lean_ctor_set_uint8(x_161, sizeof(void*)*1, x_160);
 x_162 = l_Lake_OutStream_logEntry(x_159, x_161, x_157, x_158);
 lean_dec_ref(x_161);
-x_163 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1;
+x_163 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_155)) {
  x_164 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -34894,15 +34725,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_script_doc(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script_help(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -34991,7 +34813,7 @@ lean_ctor_set(x_25, 0, x_20);
 lean_ctor_set_uint8(x_25, sizeof(void*)*1, x_24);
 x_26 = l_Lake_OutStream_logEntry(x_23, x_25, x_21, x_22);
 lean_dec_ref(x_25);
-x_27 = l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1;
+x_27 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_7, 0, x_27);
 return x_7;
 }
@@ -35011,7 +34833,7 @@ lean_ctor_set(x_34, 0, x_29);
 lean_ctor_set_uint8(x_34, sizeof(void*)*1, x_33);
 x_35 = l_Lake_OutStream_logEntry(x_32, x_34, x_30, x_31);
 lean_dec_ref(x_34);
-x_36 = l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1;
+x_36 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_37 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_37, 0, x_36);
 return x_37;
@@ -35920,15 +35742,6 @@ lean_dec_ref(x_1);
 return x_10;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_build(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -36177,7 +35990,7 @@ lean_ctor_set(x_57, 0, x_52);
 lean_ctor_set_uint8(x_57, sizeof(void*)*1, x_56);
 x_58 = l_Lake_OutStream_logEntry(x_55, x_57, x_53, x_54);
 lean_dec_ref(x_57);
-x_59 = l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1;
+x_59 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_39, 0, x_59);
 return x_39;
 }
@@ -36197,7 +36010,7 @@ lean_ctor_set(x_66, 0, x_61);
 lean_ctor_set_uint8(x_66, sizeof(void*)*1, x_65);
 x_67 = l_Lake_OutStream_logEntry(x_64, x_66, x_62, x_63);
 lean_dec_ref(x_66);
-x_68 = l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1;
+x_68 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_69 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_69, 0, x_68);
 return x_69;
@@ -36541,7 +36354,7 @@ lean_ctor_set(x_141, 0, x_136);
 lean_ctor_set_uint8(x_141, sizeof(void*)*1, x_140);
 x_142 = l_Lake_OutStream_logEntry(x_139, x_141, x_137, x_138);
 lean_dec_ref(x_141);
-x_143 = l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1;
+x_143 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_135)) {
  x_144 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -36913,7 +36726,7 @@ lean_ctor_set(x_220, 0, x_215);
 lean_ctor_set_uint8(x_220, sizeof(void*)*1, x_219);
 x_221 = l_Lake_OutStream_logEntry(x_218, x_220, x_216, x_217);
 lean_dec_ref(x_220);
-x_222 = l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1;
+x_222 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_214)) {
  x_223 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -37581,15 +37394,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_checkBuild(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -37632,7 +37436,7 @@ lean_ctor_set(x_22, 0, x_17);
 lean_ctor_set_uint8(x_22, sizeof(void*)*1, x_21);
 x_23 = l_Lake_OutStream_logEntry(x_20, x_22, x_18, x_19);
 lean_dec_ref(x_22);
-x_24 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1;
+x_24 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_10, 0, x_24);
 return x_10;
 }
@@ -37652,7 +37456,7 @@ lean_ctor_set(x_31, 0, x_26);
 lean_ctor_set_uint8(x_31, sizeof(void*)*1, x_30);
 x_32 = l_Lake_OutStream_logEntry(x_29, x_31, x_27, x_28);
 lean_dec_ref(x_31);
-x_33 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1;
+x_33 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_34 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_34, 0, x_33);
 return x_34;
@@ -37689,15 +37493,6 @@ lean_dec_ref(x_1);
 return x_10;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_query(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -37945,7 +37740,7 @@ lean_ctor_set(x_75, 0, x_71);
 lean_ctor_set_uint8(x_75, sizeof(void*)*1, x_74);
 x_76 = l_Lake_OutStream_logEntry(x_32, x_75, x_72, x_73);
 lean_dec_ref(x_75);
-x_77 = l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
+x_77 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_37, 0, x_77);
 return x_37;
 }
@@ -37964,7 +37759,7 @@ lean_ctor_set(x_83, 0, x_79);
 lean_ctor_set_uint8(x_83, sizeof(void*)*1, x_82);
 x_84 = l_Lake_OutStream_logEntry(x_32, x_83, x_80, x_81);
 lean_dec_ref(x_83);
-x_85 = l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
+x_85 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_86 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_86, 0, x_85);
 return x_86;
@@ -38134,7 +37929,7 @@ lean_ctor_set(x_128, 0, x_124);
 lean_ctor_set_uint8(x_128, sizeof(void*)*1, x_127);
 x_129 = l_Lake_OutStream_logEntry(x_97, x_128, x_125, x_126);
 lean_dec_ref(x_128);
-x_130 = l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
+x_130 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_123)) {
  x_131 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -38323,7 +38118,7 @@ lean_ctor_set(x_176, 0, x_172);
 lean_ctor_set_uint8(x_176, sizeof(void*)*1, x_175);
 x_177 = l_Lake_OutStream_logEntry(x_143, x_176, x_173, x_174);
 lean_dec_ref(x_176);
-x_178 = l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
+x_178 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_171)) {
  x_179 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -38611,7 +38406,7 @@ lean_ctor_set(x_242, 0, x_238);
 lean_ctor_set_uint8(x_242, sizeof(void*)*1, x_241);
 x_243 = l_Lake_OutStream_logEntry(x_209, x_242, x_239, x_240);
 lean_dec_ref(x_242);
-x_244 = l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
+x_244 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_237)) {
  x_245 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -38937,7 +38732,7 @@ lean_ctor_set(x_314, 0, x_310);
 lean_ctor_set_uint8(x_314, sizeof(void*)*1, x_313);
 x_315 = l_Lake_OutStream_logEntry(x_281, x_314, x_311, x_312);
 lean_dec_ref(x_314);
-x_316 = l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1;
+x_316 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_309)) {
  x_317 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -39159,15 +38954,6 @@ x_3 = l_IO_println___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec_
 return x_3;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -39213,7 +38999,7 @@ lean_ctor_set(x_23, 0, x_18);
 lean_ctor_set_uint8(x_23, sizeof(void*)*1, x_22);
 x_24 = l_Lake_OutStream_logEntry(x_21, x_23, x_19, x_20);
 lean_dec_ref(x_23);
-x_25 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1;
+x_25 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_11, 0, x_25);
 return x_11;
 }
@@ -39233,7 +39019,7 @@ lean_ctor_set(x_32, 0, x_27);
 lean_ctor_set_uint8(x_32, sizeof(void*)*1, x_31);
 x_33 = l_Lake_OutStream_logEntry(x_30, x_32, x_28, x_29);
 lean_dec_ref(x_32);
-x_34 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1;
+x_34 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_35 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_35, 0, x_34);
 return x_35;
@@ -39270,15 +39056,6 @@ lean_dec_ref(x_1);
 return x_10;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -39317,7 +39094,7 @@ x_18 = 0;
 x_19 = lean_box(1);
 x_20 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___closed__1));
 x_21 = l_Lake_OutStream_logEntry(x_19, x_20, x_17, x_18);
-x_22 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed__const__1;
+x_22 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_23 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_23, 0, x_22);
 return x_23;
@@ -39544,15 +39321,6 @@ x_14 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__priv
 return x_14;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -39615,7 +39383,7 @@ lean_ctor_set(x_29, 0, x_24);
 lean_ctor_set_uint8(x_29, sizeof(void*)*1, x_28);
 x_30 = l_Lake_OutStream_logEntry(x_27, x_29, x_25, x_26);
 lean_dec_ref(x_29);
-x_31 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1;
+x_31 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_14, 0, x_31);
 return x_14;
 }
@@ -39635,7 +39403,7 @@ lean_ctor_set(x_38, 0, x_33);
 lean_ctor_set_uint8(x_38, sizeof(void*)*1, x_37);
 x_39 = l_Lake_OutStream_logEntry(x_36, x_38, x_34, x_35);
 lean_dec_ref(x_38);
-x_40 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1;
+x_40 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_41 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_41, 0, x_40);
 return x_41;
@@ -39659,15 +39427,6 @@ return x_9;
 static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1() {
 _start:
 {
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2() {
-_start:
-{
 size_t x_1; lean_object* x_2; 
 x_1 = 0;
 x_2 = lean_box_usize(x_1);
@@ -39833,7 +39592,7 @@ x_47 = l___private_Lake_CLI_Main_0__Lake_LakeOptions_mkBuildConfig(x_16, x_45, x
 lean_dec(x_16);
 x_48 = lean_array_size(x_42);
 x_49 = lean_box_usize(x_48);
-x_50 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2;
+x_50 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
 lean_inc(x_24);
 x_51 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__3___boxed), 11, 4);
 lean_closure_set(x_51, 0, x_24);
@@ -40067,7 +39826,7 @@ lean_ctor_set(x_96, 0, x_92);
 lean_ctor_set_uint8(x_96, sizeof(void*)*1, x_95);
 x_97 = l_Lake_OutStream_logEntry(x_45, x_96, x_93, x_94);
 lean_dec_ref(x_96);
-x_98 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
+x_98 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_53, 0, x_98);
 return x_53;
 }
@@ -40086,7 +39845,7 @@ lean_ctor_set(x_104, 0, x_100);
 lean_ctor_set_uint8(x_104, sizeof(void*)*1, x_103);
 x_105 = l_Lake_OutStream_logEntry(x_45, x_104, x_101, x_102);
 lean_dec_ref(x_104);
-x_106 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
+x_106 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_107 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_107, 0, x_106);
 return x_107;
@@ -40166,7 +39925,7 @@ x_123 = l___private_Lake_CLI_Main_0__Lake_LakeOptions_mkBuildConfig(x_16, x_121,
 lean_dec(x_16);
 x_124 = lean_array_size(x_118);
 x_125 = lean_box_usize(x_124);
-x_126 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2;
+x_126 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
 lean_inc(x_24);
 x_127 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__3___boxed), 11, 4);
 lean_closure_set(x_127, 0, x_24);
@@ -40404,7 +40163,7 @@ lean_ctor_set(x_172, 0, x_168);
 lean_ctor_set_uint8(x_172, sizeof(void*)*1, x_171);
 x_173 = l_Lake_OutStream_logEntry(x_121, x_172, x_169, x_170);
 lean_dec_ref(x_172);
-x_174 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
+x_174 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_167)) {
  x_175 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -40619,7 +40378,7 @@ x_220 = l___private_Lake_CLI_Main_0__Lake_LakeOptions_mkBuildConfig(x_188, x_218
 lean_dec(x_188);
 x_221 = lean_array_size(x_215);
 x_222 = lean_box_usize(x_221);
-x_223 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2;
+x_223 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
 lean_inc(x_196);
 x_224 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__3___boxed), 11, 4);
 lean_closure_set(x_224, 0, x_196);
@@ -40857,7 +40616,7 @@ lean_ctor_set(x_269, 0, x_265);
 lean_ctor_set_uint8(x_269, sizeof(void*)*1, x_268);
 x_270 = l_Lake_OutStream_logEntry(x_218, x_269, x_266, x_267);
 lean_dec_ref(x_269);
-x_271 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
+x_271 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_264)) {
  x_272 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -41106,7 +40865,7 @@ x_323 = l___private_Lake_CLI_Main_0__Lake_LakeOptions_mkBuildConfig(x_291, x_321
 lean_dec(x_291);
 x_324 = lean_array_size(x_318);
 x_325 = lean_box_usize(x_324);
-x_326 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2;
+x_326 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
 lean_inc(x_299);
 x_327 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__3___boxed), 11, 4);
 lean_closure_set(x_327, 0, x_299);
@@ -41344,7 +41103,7 @@ lean_ctor_set(x_372, 0, x_368);
 lean_ctor_set_uint8(x_372, sizeof(void*)*1, x_371);
 x_373 = l_Lake_OutStream_logEntry(x_321, x_372, x_369, x_370);
 lean_dec_ref(x_372);
-x_374 = l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1;
+x_374 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_367)) {
  x_375 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -43673,15 +43432,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_upload(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_cache(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -43824,7 +43574,7 @@ lean_ctor_set(x_41, 0, x_36);
 lean_ctor_set_uint8(x_41, sizeof(void*)*1, x_40);
 x_42 = l_Lake_OutStream_logEntry(x_39, x_41, x_37, x_38);
 lean_dec_ref(x_41);
-x_43 = l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1;
+x_43 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_29, 0, x_43);
 return x_29;
 }
@@ -43844,7 +43594,7 @@ lean_ctor_set(x_50, 0, x_45);
 lean_ctor_set_uint8(x_50, sizeof(void*)*1, x_49);
 x_51 = l_Lake_OutStream_logEntry(x_48, x_50, x_46, x_47);
 lean_dec_ref(x_50);
-x_52 = l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1;
+x_52 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_53 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_53, 0, x_52);
 return x_53;
@@ -43912,7 +43662,7 @@ lean_ctor_set(x_68, 0, x_63);
 lean_ctor_set_uint8(x_68, sizeof(void*)*1, x_67);
 x_69 = l_Lake_OutStream_logEntry(x_66, x_68, x_64, x_65);
 lean_dec_ref(x_68);
-x_70 = l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1;
+x_70 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_62)) {
  x_71 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -44015,7 +43765,7 @@ lean_ctor_set(x_93, 0, x_88);
 lean_ctor_set_uint8(x_93, sizeof(void*)*1, x_92);
 x_94 = l_Lake_OutStream_logEntry(x_91, x_93, x_89, x_90);
 lean_dec_ref(x_93);
-x_95 = l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1;
+x_95 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_87)) {
  x_96 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -44136,7 +43886,7 @@ lean_ctor_set(x_123, 0, x_118);
 lean_ctor_set_uint8(x_123, sizeof(void*)*1, x_122);
 x_124 = l_Lake_OutStream_logEntry(x_121, x_123, x_119, x_120);
 lean_dec_ref(x_123);
-x_125 = l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1;
+x_125 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_117)) {
  x_126 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -44165,15 +43915,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_cache(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -44301,7 +44042,7 @@ lean_ctor_set(x_11, 0, x_6);
 lean_ctor_set_uint8(x_11, sizeof(void*)*1, x_10);
 x_12 = l_Lake_OutStream_logEntry(x_9, x_11, x_7, x_8);
 lean_dec_ref(x_11);
-x_13 = l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed__const__1;
+x_13 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_14 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_14, 0, x_13);
 return x_14;
@@ -44316,15 +44057,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__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:
 {
@@ -44395,7 +44127,7 @@ lean_ctor_set(x_52, 0, x_48);
 lean_ctor_set_uint8(x_52, sizeof(void*)*1, x_51);
 x_53 = l_Lake_OutStream_logEntry(x_6, x_52, x_49, x_50);
 lean_dec_ref(x_52);
-x_54 = l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1;
+x_54 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_43, 0, x_54);
 return x_43;
 }
@@ -44414,7 +44146,7 @@ lean_ctor_set(x_60, 0, x_56);
 lean_ctor_set_uint8(x_60, sizeof(void*)*1, x_59);
 x_61 = l_Lake_OutStream_logEntry(x_6, x_60, x_57, x_58);
 lean_dec_ref(x_60);
-x_62 = l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1;
+x_62 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_63 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_63, 0, x_62);
 return x_63;
@@ -45192,15 +44924,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_setupFile(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0(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:
 {
@@ -45243,7 +44966,7 @@ lean_ctor_set(x_18, 0, x_14);
 lean_ctor_set_uint8(x_18, sizeof(void*)*1, x_17);
 x_19 = l_Lake_OutStream_logEntry(x_5, x_18, x_15, x_16);
 lean_dec_ref(x_18);
-x_20 = l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1;
+x_20 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_8, 0, x_20);
 return x_8;
 }
@@ -45262,7 +44985,7 @@ lean_ctor_set(x_26, 0, x_22);
 lean_ctor_set_uint8(x_26, sizeof(void*)*1, x_25);
 x_27 = l_Lake_OutStream_logEntry(x_5, x_26, x_23, x_24);
 lean_dec_ref(x_26);
-x_28 = l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1;
+x_28 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_29 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_29, 0, x_28);
 return x_29;
@@ -46186,15 +45909,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_checkTest(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0(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:
 {
@@ -46237,7 +45951,7 @@ lean_ctor_set(x_18, 0, x_14);
 lean_ctor_set_uint8(x_18, sizeof(void*)*1, x_17);
 x_19 = l_Lake_OutStream_logEntry(x_5, x_18, x_15, x_16);
 lean_dec_ref(x_18);
-x_20 = l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1;
+x_20 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_8, 0, x_20);
 return x_8;
 }
@@ -46256,7 +45970,7 @@ lean_ctor_set(x_26, 0, x_22);
 lean_ctor_set_uint8(x_26, sizeof(void*)*1, x_25);
 x_27 = l_Lake_OutStream_logEntry(x_5, x_26, x_23, x_24);
 lean_dec_ref(x_26);
-x_28 = l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1;
+x_28 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_29 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_29, 0, x_28);
 return x_29;
@@ -47412,15 +47126,6 @@ lean_dec_ref(x_1);
 return x_7;
 }
 }
-static lean_object* _init_l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -47476,7 +47181,7 @@ lean_ctor_set(x_21, 0, x_16);
 lean_ctor_set_uint8(x_21, sizeof(void*)*1, x_20);
 x_22 = l_Lake_OutStream_logEntry(x_19, x_21, x_17, x_18);
 lean_dec_ref(x_21);
-x_23 = l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1;
+x_23 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_12, 0, x_23);
 return x_12;
 }
@@ -47496,7 +47201,7 @@ lean_ctor_set(x_30, 0, x_25);
 lean_ctor_set_uint8(x_30, sizeof(void*)*1, x_29);
 x_31 = l_Lake_OutStream_logEntry(x_28, x_30, x_26, x_27);
 lean_dec_ref(x_30);
-x_32 = l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1;
+x_32 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_33 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_33, 0, x_32);
 return x_33;
@@ -47513,15 +47218,6 @@ x_5 = l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2(x_
 return x_5;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_clean(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -47773,7 +47469,7 @@ lean_ctor_set(x_67, 0, x_62);
 lean_ctor_set_uint8(x_67, sizeof(void*)*1, x_66);
 x_68 = l_Lake_OutStream_logEntry(x_65, x_67, x_63, x_64);
 lean_dec_ref(x_67);
-x_69 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_69 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_55, 0, x_69);
 return x_55;
 }
@@ -47793,7 +47489,7 @@ lean_ctor_set(x_76, 0, x_71);
 lean_ctor_set_uint8(x_76, sizeof(void*)*1, x_75);
 x_77 = l_Lake_OutStream_logEntry(x_74, x_76, x_72, x_73);
 lean_dec_ref(x_76);
-x_78 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_78 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_79 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_79, 0, x_78);
 return x_79;
@@ -47932,7 +47628,7 @@ lean_ctor_set(x_110, 0, x_105);
 lean_ctor_set_uint8(x_110, sizeof(void*)*1, x_109);
 x_111 = l_Lake_OutStream_logEntry(x_108, x_110, x_106, x_107);
 lean_dec_ref(x_110);
-x_112 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_112 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_104)) {
  x_113 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -48090,7 +47786,7 @@ lean_ctor_set(x_147, 0, x_142);
 lean_ctor_set_uint8(x_147, sizeof(void*)*1, x_146);
 x_148 = l_Lake_OutStream_logEntry(x_145, x_147, x_143, x_144);
 lean_dec_ref(x_147);
-x_149 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_149 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_141)) {
  x_150 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -48333,7 +48029,7 @@ lean_ctor_set(x_199, 0, x_194);
 lean_ctor_set_uint8(x_199, sizeof(void*)*1, x_198);
 x_200 = l_Lake_OutStream_logEntry(x_197, x_199, x_195, x_196);
 lean_dec_ref(x_199);
-x_201 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_201 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_193)) {
  x_202 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -48591,7 +48287,7 @@ lean_ctor_set(x_254, 0, x_249);
 lean_ctor_set_uint8(x_254, sizeof(void*)*1, x_253);
 x_255 = l_Lake_OutStream_logEntry(x_252, x_254, x_250, x_251);
 lean_dec_ref(x_254);
-x_256 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_256 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_248)) {
  x_257 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -48887,7 +48583,7 @@ lean_ctor_set(x_316, 0, x_311);
 lean_ctor_set_uint8(x_316, sizeof(void*)*1, x_315);
 x_317 = l_Lake_OutStream_logEntry(x_314, x_316, x_312, x_313);
 lean_dec_ref(x_316);
-x_318 = l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1;
+x_318 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_310)) {
  x_319 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -49021,15 +48717,6 @@ x_6 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__priva
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_shake(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -49321,7 +49008,7 @@ lean_ctor_set(x_65, 0, x_60);
 lean_ctor_set_uint8(x_65, sizeof(void*)*1, x_64);
 x_66 = l_Lake_OutStream_logEntry(x_63, x_65, x_61, x_62);
 lean_dec_ref(x_65);
-x_67 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_67 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_37, 0, x_67);
 return x_37;
 }
@@ -49341,7 +49028,7 @@ lean_ctor_set(x_74, 0, x_69);
 lean_ctor_set_uint8(x_74, sizeof(void*)*1, x_73);
 x_75 = l_Lake_OutStream_logEntry(x_72, x_74, x_70, x_71);
 lean_dec_ref(x_74);
-x_76 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_76 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_77 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_77, 0, x_76);
 return x_77;
@@ -49399,7 +49086,7 @@ x_93 = 0;
 x_94 = lean_box(1);
 x_95 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__1));
 x_96 = l_Lake_OutStream_logEntry(x_94, x_95, x_92, x_93);
-x_97 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_97 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_87, 1);
 lean_ctor_set(x_87, 0, x_97);
 return x_87;
@@ -49438,7 +49125,7 @@ x_102 = 0;
 x_103 = lean_box(1);
 x_104 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__1));
 x_105 = l_Lake_OutStream_logEntry(x_103, x_104, x_101, x_102);
-x_106 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_106 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_107 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_107, 0, x_106);
 return x_107;
@@ -49567,7 +49254,7 @@ x_130 = 0;
 x_131 = lean_box(1);
 x_132 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__1));
 x_133 = l_Lake_OutStream_logEntry(x_131, x_132, x_129, x_130);
-x_134 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_134 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_126)) {
  x_135 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -49649,7 +49336,7 @@ x_141 = 0;
 x_142 = lean_box(1);
 x_143 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__3));
 x_144 = l_Lake_OutStream_logEntry(x_142, x_143, x_140, x_141);
-x_145 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_145 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_23)) {
  x_146 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -49970,7 +49657,7 @@ lean_ctor_set(x_214, 0, x_209);
 lean_ctor_set_uint8(x_214, sizeof(void*)*1, x_213);
 x_215 = l_Lake_OutStream_logEntry(x_212, x_214, x_210, x_211);
 lean_dec_ref(x_214);
-x_216 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_216 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_208)) {
  x_217 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -50058,7 +49745,7 @@ x_241 = 0;
 x_242 = lean_box(1);
 x_243 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__1));
 x_244 = l_Lake_OutStream_logEntry(x_242, x_243, x_240, x_241);
-x_245 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_245 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_237)) {
  x_246 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -50139,7 +49826,7 @@ x_252 = 0;
 x_253 = lean_box(1);
 x_254 = ((lean_object*)(l___private_Lake_CLI_Main_0__Lake_lake_shake___closed__3));
 x_255 = l_Lake_OutStream_logEntry(x_253, x_254, x_251, x_252);
-x_256 = l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1;
+x_256 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_180)) {
  x_257 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -50239,15 +49926,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_shake(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_script(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -50390,7 +50068,7 @@ lean_ctor_set(x_41, 0, x_36);
 lean_ctor_set_uint8(x_41, sizeof(void*)*1, x_40);
 x_42 = l_Lake_OutStream_logEntry(x_39, x_41, x_37, x_38);
 lean_dec_ref(x_41);
-x_43 = l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1;
+x_43 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_29, 0, x_43);
 return x_29;
 }
@@ -50410,7 +50088,7 @@ lean_ctor_set(x_50, 0, x_45);
 lean_ctor_set_uint8(x_50, sizeof(void*)*1, x_49);
 x_51 = l_Lake_OutStream_logEntry(x_48, x_50, x_46, x_47);
 lean_dec_ref(x_50);
-x_52 = l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1;
+x_52 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_53 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_53, 0, x_52);
 return x_53;
@@ -50478,7 +50156,7 @@ lean_ctor_set(x_68, 0, x_63);
 lean_ctor_set_uint8(x_68, sizeof(void*)*1, x_67);
 x_69 = l_Lake_OutStream_logEntry(x_66, x_68, x_64, x_65);
 lean_dec_ref(x_68);
-x_70 = l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1;
+x_70 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_62)) {
  x_71 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -50581,7 +50259,7 @@ lean_ctor_set(x_93, 0, x_88);
 lean_ctor_set_uint8(x_93, sizeof(void*)*1, x_92);
 x_94 = l_Lake_OutStream_logEntry(x_91, x_93, x_89, x_90);
 lean_dec_ref(x_93);
-x_95 = l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1;
+x_95 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_87)) {
  x_96 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -50702,7 +50380,7 @@ lean_ctor_set(x_123, 0, x_118);
 lean_ctor_set_uint8(x_123, sizeof(void*)*1, x_122);
 x_124 = l_Lake_OutStream_logEntry(x_121, x_123, x_119, x_120);
 lean_dec_ref(x_123);
-x_125 = l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1;
+x_125 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_117)) {
  x_126 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -50731,15 +50409,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_script(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -50783,7 +50452,7 @@ lean_ctor_set(x_16, 0, x_11);
 lean_ctor_set_uint8(x_16, sizeof(void*)*1, x_15);
 x_17 = l_Lake_OutStream_logEntry(x_14, x_16, x_12, x_13);
 lean_dec_ref(x_16);
-x_18 = l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1;
+x_18 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_5, 0, x_18);
 return x_5;
 }
@@ -50803,7 +50472,7 @@ lean_ctor_set(x_25, 0, x_20);
 lean_ctor_set_uint8(x_25, sizeof(void*)*1, x_24);
 x_26 = l_Lake_OutStream_logEntry(x_23, x_25, x_21, x_22);
 lean_dec_ref(x_25);
-x_27 = l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1;
+x_27 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_28 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_28, 0, x_27);
 return x_28;
@@ -51111,15 +50780,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_serve(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -51190,7 +50850,7 @@ lean_ctor_set(x_28, 0, x_23);
 lean_ctor_set_uint8(x_28, sizeof(void*)*1, x_27);
 x_29 = l_Lake_OutStream_logEntry(x_26, x_28, x_24, x_25);
 lean_dec_ref(x_28);
-x_30 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1;
+x_30 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_16, 0, x_30);
 return x_16;
 }
@@ -51210,7 +50870,7 @@ lean_ctor_set(x_37, 0, x_32);
 lean_ctor_set_uint8(x_37, sizeof(void*)*1, x_36);
 x_38 = l_Lake_OutStream_logEntry(x_35, x_37, x_33, x_34);
 lean_dec_ref(x_37);
-x_39 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1;
+x_39 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_40 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_40, 0, x_39);
 return x_40;
@@ -51248,24 +50908,6 @@ lean_dec_ref(x_1);
 return x_10;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_env(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -51375,7 +51017,7 @@ return x_102;
 block_7:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__1;
+x_5 = l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__1;
 x_6 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_6, 0, x_5);
 return x_6;
@@ -51523,7 +51165,7 @@ lean_ctor_set(x_47, 0, x_42);
 lean_ctor_set_uint8(x_47, sizeof(void*)*1, x_46);
 x_48 = l_Lake_OutStream_logEntry(x_45, x_47, x_43, x_44);
 lean_dec_ref(x_47);
-x_49 = l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2;
+x_49 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_36, 0, x_49);
 return x_36;
 }
@@ -51543,7 +51185,7 @@ lean_ctor_set(x_56, 0, x_51);
 lean_ctor_set_uint8(x_56, sizeof(void*)*1, x_55);
 x_57 = l_Lake_OutStream_logEntry(x_54, x_56, x_52, x_53);
 lean_dec_ref(x_56);
-x_58 = l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2;
+x_58 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_59 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_59, 0, x_58);
 return x_59;
@@ -51568,7 +51210,7 @@ lean_ctor_set(x_67, 0, x_62);
 lean_ctor_set_uint8(x_67, sizeof(void*)*1, x_66);
 x_68 = l_Lake_OutStream_logEntry(x_65, x_67, x_63, x_64);
 lean_dec_ref(x_67);
-x_69 = l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2;
+x_69 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_34, 0, x_69);
 return x_34;
 }
@@ -51588,7 +51230,7 @@ lean_ctor_set(x_76, 0, x_71);
 lean_ctor_set_uint8(x_76, sizeof(void*)*1, x_75);
 x_77 = l_Lake_OutStream_logEntry(x_74, x_76, x_72, x_73);
 lean_dec_ref(x_76);
-x_78 = l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2;
+x_78 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_79 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_79, 0, x_78);
 return x_79;
@@ -51637,15 +51279,6 @@ x_9 = l___private_Lake_CLI_Main_0__Lake_lake_exe___lam__0(x_1, x_2, x_3, x_4, x_
 return x_9;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_exe(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -51808,7 +51441,7 @@ lean_ctor_set(x_47, 0, x_43);
 lean_ctor_set_uint8(x_47, sizeof(void*)*1, x_46);
 x_48 = l_Lake_OutStream_logEntry(x_31, x_47, x_44, x_45);
 lean_dec_ref(x_47);
-x_49 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_49 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_37, 0, x_49);
 return x_37;
 }
@@ -51827,7 +51460,7 @@ lean_ctor_set(x_55, 0, x_51);
 lean_ctor_set_uint8(x_55, sizeof(void*)*1, x_54);
 x_56 = l_Lake_OutStream_logEntry(x_31, x_55, x_52, x_53);
 lean_dec_ref(x_55);
-x_57 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_57 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_58 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_58, 0, x_57);
 return x_58;
@@ -51853,7 +51486,7 @@ lean_ctor_set(x_65, 0, x_61);
 lean_ctor_set_uint8(x_65, sizeof(void*)*1, x_64);
 x_66 = l_Lake_OutStream_logEntry(x_31, x_65, x_62, x_63);
 lean_dec_ref(x_65);
-x_67 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_67 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_34, 0, x_67);
 return x_34;
 }
@@ -51872,7 +51505,7 @@ lean_ctor_set(x_73, 0, x_69);
 lean_ctor_set_uint8(x_73, sizeof(void*)*1, x_72);
 x_74 = l_Lake_OutStream_logEntry(x_31, x_73, x_70, x_71);
 lean_dec_ref(x_73);
-x_75 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_75 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_76 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_76, 0, x_75);
 return x_76;
@@ -51982,7 +51615,7 @@ lean_ctor_set(x_103, 0, x_99);
 lean_ctor_set_uint8(x_103, sizeof(void*)*1, x_102);
 x_104 = l_Lake_OutStream_logEntry(x_87, x_103, x_100, x_101);
 lean_dec_ref(x_103);
-x_105 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_105 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_98)) {
  x_106 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -52015,7 +51648,7 @@ lean_ctor_set(x_113, 0, x_109);
 lean_ctor_set_uint8(x_113, sizeof(void*)*1, x_112);
 x_114 = l_Lake_OutStream_logEntry(x_87, x_113, x_110, x_111);
 lean_dec_ref(x_113);
-x_115 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_115 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_108)) {
  x_116 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -52222,7 +51855,7 @@ lean_ctor_set(x_160, 0, x_156);
 lean_ctor_set_uint8(x_160, sizeof(void*)*1, x_159);
 x_161 = l_Lake_OutStream_logEntry(x_144, x_160, x_157, x_158);
 lean_dec_ref(x_160);
-x_162 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_162 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_155)) {
  x_163 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -52255,7 +51888,7 @@ lean_ctor_set(x_170, 0, x_166);
 lean_ctor_set_uint8(x_170, sizeof(void*)*1, x_169);
 x_171 = l_Lake_OutStream_logEntry(x_144, x_170, x_167, x_168);
 lean_dec_ref(x_170);
-x_172 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_172 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_165)) {
  x_173 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -52495,7 +52128,7 @@ lean_ctor_set(x_223, 0, x_219);
 lean_ctor_set_uint8(x_223, sizeof(void*)*1, x_222);
 x_224 = l_Lake_OutStream_logEntry(x_207, x_223, x_220, x_221);
 lean_dec_ref(x_223);
-x_225 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_225 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_218)) {
  x_226 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -52528,7 +52161,7 @@ lean_ctor_set(x_233, 0, x_229);
 lean_ctor_set_uint8(x_233, sizeof(void*)*1, x_232);
 x_234 = l_Lake_OutStream_logEntry(x_207, x_233, x_230, x_231);
 lean_dec_ref(x_233);
-x_235 = l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1;
+x_235 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_228)) {
  x_236 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -52606,15 +52239,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_exe(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -52687,7 +52311,7 @@ lean_ctor_set(x_27, 0, x_23);
 lean_ctor_set_uint8(x_27, sizeof(void*)*1, x_26);
 x_28 = l_Lake_OutStream_logEntry(x_14, x_27, x_24, x_25);
 lean_dec_ref(x_27);
-x_29 = l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1;
+x_29 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_17, 0, x_29);
 return x_17;
 }
@@ -52706,7 +52330,7 @@ lean_ctor_set(x_35, 0, x_31);
 lean_ctor_set_uint8(x_35, sizeof(void*)*1, x_34);
 x_36 = l_Lake_OutStream_logEntry(x_14, x_35, x_32, x_33);
 lean_dec_ref(x_35);
-x_37 = l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1;
+x_37 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_38 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_38, 0, x_37);
 return x_38;
@@ -53068,15 +52692,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_lean(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -53229,7 +52844,7 @@ lean_ctor_set(x_42, 0, x_37);
 lean_ctor_set_uint8(x_42, sizeof(void*)*1, x_41);
 x_43 = l_Lake_OutStream_logEntry(x_40, x_42, x_38, x_39);
 lean_dec_ref(x_42);
-x_44 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_44 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_30, 0, x_44);
 return x_30;
 }
@@ -53249,7 +52864,7 @@ lean_ctor_set(x_51, 0, x_46);
 lean_ctor_set_uint8(x_51, sizeof(void*)*1, x_50);
 x_52 = l_Lake_OutStream_logEntry(x_49, x_51, x_47, x_48);
 lean_dec_ref(x_51);
-x_53 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_53 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_54 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_54, 0, x_53);
 return x_54;
@@ -53328,7 +52943,7 @@ lean_ctor_set(x_70, 0, x_65);
 lean_ctor_set_uint8(x_70, sizeof(void*)*1, x_69);
 x_71 = l_Lake_OutStream_logEntry(x_68, x_70, x_66, x_67);
 lean_dec_ref(x_70);
-x_72 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_72 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_64)) {
  x_73 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -53374,7 +52989,7 @@ lean_ctor_set(x_83, 0, x_78);
 lean_ctor_set_uint8(x_83, sizeof(void*)*1, x_82);
 x_84 = l_Lake_OutStream_logEntry(x_81, x_83, x_79, x_80);
 lean_dec_ref(x_83);
-x_85 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_85 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_24, 0, x_85);
 return x_24;
 }
@@ -53394,7 +53009,7 @@ lean_ctor_set(x_92, 0, x_87);
 lean_ctor_set_uint8(x_92, sizeof(void*)*1, x_91);
 x_93 = l_Lake_OutStream_logEntry(x_90, x_92, x_88, x_89);
 lean_dec_ref(x_92);
-x_94 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_94 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_95 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_95, 0, x_94);
 return x_95;
@@ -53483,7 +53098,7 @@ lean_ctor_set(x_115, 0, x_110);
 lean_ctor_set_uint8(x_115, sizeof(void*)*1, x_114);
 x_116 = l_Lake_OutStream_logEntry(x_113, x_115, x_111, x_112);
 lean_dec_ref(x_115);
-x_117 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_117 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_109)) {
  x_118 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -53538,7 +53153,7 @@ lean_ctor_set(x_129, 0, x_124);
 lean_ctor_set_uint8(x_129, sizeof(void*)*1, x_128);
 x_130 = l_Lake_OutStream_logEntry(x_127, x_129, x_125, x_126);
 lean_dec_ref(x_129);
-x_131 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_131 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_123)) {
  x_132 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -53646,7 +53261,7 @@ lean_ctor_set(x_155, 0, x_150);
 lean_ctor_set_uint8(x_155, sizeof(void*)*1, x_154);
 x_156 = l_Lake_OutStream_logEntry(x_153, x_155, x_151, x_152);
 lean_dec_ref(x_155);
-x_157 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_157 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_149)) {
  x_158 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -53706,7 +53321,7 @@ lean_ctor_set(x_170, 0, x_165);
 lean_ctor_set_uint8(x_170, sizeof(void*)*1, x_169);
 x_171 = l_Lake_OutStream_logEntry(x_168, x_170, x_166, x_167);
 lean_dec_ref(x_170);
-x_172 = l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1;
+x_172 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_164)) {
  x_173 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -55226,15 +54841,6 @@ goto _start;
 }
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -55466,7 +55072,7 @@ lean_ctor_set(x_71, 0, x_66);
 lean_ctor_set_uint8(x_71, sizeof(void*)*1, x_70);
 x_72 = l_Lake_OutStream_logEntry(x_69, x_71, x_67, x_68);
 lean_dec_ref(x_71);
-x_73 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1;
+x_73 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_55, 0, x_73);
 return x_55;
 }
@@ -55486,7 +55092,7 @@ lean_ctor_set(x_80, 0, x_75);
 lean_ctor_set_uint8(x_80, sizeof(void*)*1, x_79);
 x_81 = l_Lake_OutStream_logEntry(x_78, x_80, x_76, x_77);
 lean_dec_ref(x_80);
-x_82 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1;
+x_82 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_83 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_83, 0, x_82);
 return x_83;
@@ -55663,7 +55269,7 @@ lean_ctor_set(x_123, 0, x_118);
 lean_ctor_set_uint8(x_123, sizeof(void*)*1, x_122);
 x_124 = l_Lake_OutStream_logEntry(x_121, x_123, x_119, x_120);
 lean_dec_ref(x_123);
-x_125 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1;
+x_125 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_117)) {
  x_126 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -55924,7 +55530,7 @@ lean_ctor_set(x_193, 0, x_188);
 lean_ctor_set_uint8(x_193, sizeof(void*)*1, x_192);
 x_194 = l_Lake_OutStream_logEntry(x_191, x_193, x_189, x_190);
 lean_dec_ref(x_193);
-x_195 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1;
+x_195 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_187)) {
  x_196 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -55995,15 +55601,6 @@ lean_dec(x_2);
 return x_5;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -56108,7 +55705,7 @@ lean_ctor_set(x_40, 0, x_35);
 lean_ctor_set_uint8(x_40, sizeof(void*)*1, x_39);
 x_41 = l_Lake_OutStream_logEntry(x_38, x_40, x_36, x_37);
 lean_dec_ref(x_40);
-x_42 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1;
+x_42 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_18, 1);
 lean_ctor_set(x_18, 0, x_42);
 return x_18;
@@ -56179,7 +55776,7 @@ lean_ctor_set(x_63, 0, x_58);
 lean_ctor_set_uint8(x_63, sizeof(void*)*1, x_62);
 x_64 = l_Lake_OutStream_logEntry(x_61, x_63, x_59, x_60);
 lean_dec_ref(x_63);
-x_65 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1;
+x_65 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_66 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_66, 0, x_65);
 return x_66;
@@ -56303,7 +55900,7 @@ lean_ctor_set(x_97, 0, x_92);
 lean_ctor_set_uint8(x_97, sizeof(void*)*1, x_96);
 x_98 = l_Lake_OutStream_logEntry(x_95, x_97, x_93, x_94);
 lean_dec_ref(x_97);
-x_99 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1;
+x_99 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_77)) {
  x_100 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -56465,7 +56062,7 @@ lean_ctor_set(x_137, 0, x_132);
 lean_ctor_set_uint8(x_137, sizeof(void*)*1, x_136);
 x_138 = l_Lake_OutStream_logEntry(x_135, x_137, x_133, x_134);
 lean_dec_ref(x_137);
-x_139 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1;
+x_139 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_117)) {
  x_140 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -56558,15 +56155,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -56638,7 +56226,7 @@ lean_ctor_set(x_27, 0, x_22);
 lean_ctor_set_uint8(x_27, sizeof(void*)*1, x_26);
 x_28 = l_Lake_OutStream_logEntry(x_25, x_27, x_23, x_24);
 lean_dec_ref(x_27);
-x_29 = l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1;
+x_29 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_18, 0, x_29);
 return x_18;
 }
@@ -56658,7 +56246,7 @@ lean_ctor_set(x_36, 0, x_31);
 lean_ctor_set_uint8(x_36, sizeof(void*)*1, x_35);
 x_37 = l_Lake_OutStream_logEntry(x_34, x_36, x_32, x_33);
 lean_dec_ref(x_36);
-x_38 = l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1;
+x_38 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_39 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_39, 0, x_38);
 return x_39;
@@ -57427,15 +57015,6 @@ x_4 = l___private_Lake_CLI_Main_0__Lake_lake_selfCheck(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake_help(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -57524,7 +57103,7 @@ lean_ctor_set(x_25, 0, x_20);
 lean_ctor_set_uint8(x_25, sizeof(void*)*1, x_24);
 x_26 = l_Lake_OutStream_logEntry(x_23, x_25, x_21, x_22);
 lean_dec_ref(x_25);
-x_27 = l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1;
+x_27 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_7, 0, x_27);
 return x_7;
 }
@@ -57544,7 +57123,7 @@ lean_ctor_set(x_34, 0, x_29);
 lean_ctor_set_uint8(x_34, sizeof(void*)*1, x_33);
 x_35 = l_Lake_OutStream_logEntry(x_32, x_34, x_30, x_31);
 lean_dec_ref(x_34);
-x_36 = l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1;
+x_36 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_37 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_37, 0, x_36);
 return x_37;
@@ -58053,15 +57632,6 @@ x_5 = l___private_Lake_CLI_Main_0__Lake_lakeCli(x_1, x_2, x_3);
 return x_5;
 }
 }
-static lean_object* _init_l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_CLI_Main_0__Lake_lake(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -58128,7 +57698,7 @@ lean_ctor_set(x_334, 0, x_329);
 lean_ctor_set_uint8(x_334, sizeof(void*)*1, x_333);
 x_335 = l_Lake_OutStream_logEntry(x_332, x_334, x_330, x_331);
 lean_dec_ref(x_334);
-x_336 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_336 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_316, 0, x_336);
 return x_316;
 }
@@ -58148,7 +57718,7 @@ lean_ctor_set(x_343, 0, x_338);
 lean_ctor_set_uint8(x_343, sizeof(void*)*1, x_342);
 x_344 = l_Lake_OutStream_logEntry(x_341, x_343, x_339, x_340);
 lean_dec_ref(x_343);
-x_345 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_345 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_346 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_346, 0, x_345);
 return x_346;
@@ -58234,7 +57804,7 @@ lean_ctor_set(x_370, 0, x_365);
 lean_ctor_set_uint8(x_370, sizeof(void*)*1, x_369);
 x_371 = l_Lake_OutStream_logEntry(x_368, x_370, x_366, x_367);
 lean_dec_ref(x_370);
-x_372 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_372 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_352, 0, x_372);
 return x_352;
 }
@@ -58254,7 +57824,7 @@ lean_ctor_set(x_379, 0, x_374);
 lean_ctor_set_uint8(x_379, sizeof(void*)*1, x_378);
 x_380 = l_Lake_OutStream_logEntry(x_377, x_379, x_375, x_376);
 lean_dec_ref(x_379);
-x_381 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_381 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_382 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_382, 0, x_381);
 return x_382;
@@ -58397,7 +57967,7 @@ lean_ctor_set(x_40, 0, x_35);
 lean_ctor_set_uint8(x_40, sizeof(void*)*1, x_39);
 x_41 = l_Lake_OutStream_logEntry(x_38, x_40, x_36, x_37);
 lean_dec_ref(x_40);
-x_42 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_42 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_28, 0, x_42);
 return x_28;
 }
@@ -58417,7 +57987,7 @@ lean_ctor_set(x_49, 0, x_44);
 lean_ctor_set_uint8(x_49, sizeof(void*)*1, x_48);
 x_50 = l_Lake_OutStream_logEntry(x_47, x_49, x_45, x_46);
 lean_dec_ref(x_49);
-x_51 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_51 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_52 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_52, 0, x_51);
 return x_52;
@@ -58483,7 +58053,7 @@ lean_ctor_set(x_67, 0, x_62);
 lean_ctor_set_uint8(x_67, sizeof(void*)*1, x_66);
 x_68 = l_Lake_OutStream_logEntry(x_65, x_67, x_63, x_64);
 lean_dec_ref(x_67);
-x_69 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_69 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_61)) {
  x_70 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -58584,7 +58154,7 @@ lean_ctor_set(x_91, 0, x_86);
 lean_ctor_set_uint8(x_91, sizeof(void*)*1, x_90);
 x_92 = l_Lake_OutStream_logEntry(x_89, x_91, x_87, x_88);
 lean_dec_ref(x_91);
-x_93 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_93 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_85)) {
  x_94 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -58700,7 +58270,7 @@ lean_ctor_set(x_118, 0, x_113);
 lean_ctor_set_uint8(x_118, sizeof(void*)*1, x_117);
 x_119 = l_Lake_OutStream_logEntry(x_116, x_118, x_114, x_115);
 lean_dec_ref(x_118);
-x_120 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_120 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_112)) {
  x_121 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -58845,7 +58415,7 @@ lean_ctor_set(x_157, 0, x_152);
 lean_ctor_set_uint8(x_157, sizeof(void*)*1, x_156);
 x_158 = l_Lake_OutStream_logEntry(x_155, x_157, x_153, x_154);
 lean_dec_ref(x_157);
-x_159 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_159 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 lean_ctor_set(x_145, 0, x_159);
 return x_145;
 }
@@ -58865,7 +58435,7 @@ lean_ctor_set(x_166, 0, x_161);
 lean_ctor_set_uint8(x_166, sizeof(void*)*1, x_165);
 x_167 = l_Lake_OutStream_logEntry(x_164, x_166, x_162, x_163);
 lean_dec_ref(x_166);
-x_168 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_168 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 x_169 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_169, 0, x_168);
 return x_169;
@@ -58933,7 +58503,7 @@ lean_ctor_set(x_184, 0, x_179);
 lean_ctor_set_uint8(x_184, sizeof(void*)*1, x_183);
 x_185 = l_Lake_OutStream_logEntry(x_182, x_184, x_180, x_181);
 lean_dec_ref(x_184);
-x_186 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_186 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_178)) {
  x_187 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -59036,7 +58606,7 @@ lean_ctor_set(x_209, 0, x_204);
 lean_ctor_set_uint8(x_209, sizeof(void*)*1, x_208);
 x_210 = l_Lake_OutStream_logEntry(x_207, x_209, x_205, x_206);
 lean_dec_ref(x_209);
-x_211 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_211 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_203)) {
  x_212 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -59157,7 +58727,7 @@ lean_ctor_set(x_239, 0, x_234);
 lean_ctor_set_uint8(x_239, sizeof(void*)*1, x_238);
 x_240 = l_Lake_OutStream_logEntry(x_237, x_239, x_235, x_236);
 lean_dec_ref(x_239);
-x_241 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_241 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_233)) {
  x_242 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -59301,7 +58871,7 @@ lean_ctor_set(x_271, 0, x_266);
 lean_ctor_set_uint8(x_271, sizeof(void*)*1, x_270);
 x_272 = l_Lake_OutStream_logEntry(x_269, x_271, x_267, x_268);
 lean_dec_ref(x_271);
-x_273 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_273 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_265)) {
  x_274 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -59466,7 +59036,7 @@ lean_ctor_set(x_310, 0, x_305);
 lean_ctor_set_uint8(x_310, sizeof(void*)*1, x_309);
 x_311 = l_Lake_OutStream_logEntry(x_308, x_310, x_306, x_307);
 lean_dec_ref(x_310);
-x_312 = l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1;
+x_312 = l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_304)) {
  x_313 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -59617,14 +59187,8 @@ l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___closed__0 = _ini
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___closed__0);
 l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_CliStateM_runLogIO___redArg___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_CliStateM_runLoggerIO___redArg___boxed__const__1);
 l___private_Lake_CLI_Main_0__Lake_validateRepo_x3f___closed__4 = _init_l___private_Lake_CLI_Main_0__Lake_validateRepo_x3f___closed__4();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_validateRepo_x3f___closed__4);
-l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lakeLongOption___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_verifyInstall___boxed__const__1);
 l___private_Lake_CLI_Main_0__Lake_parseTemplateSpec___closed__0 = _init_l___private_Lake_CLI_Main_0__Lake_parseTemplateSpec___closed__0();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_parseTemplateSpec___closed__0);
 l___private_Lake_CLI_Main_0__Lake_parseLangSpec___closed__0 = _init_l___private_Lake_CLI_Main_0__Lake_parseLangSpec___closed__0();
@@ -59642,94 +59206,14 @@ lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutput
 l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutputs___closed__6 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutputs___closed__6();
 l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutputs___closed__7 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutputs___closed__7();
 l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutputs___closed__8 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_get_findOutputs___closed__8();
-l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_get___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_put___lam__1___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_put___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_add___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_clean___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache_help___boxed__const__1);
-l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1 = _init_l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1();
-lean_mark_persistent(l_Std_DTreeMap_Internal_Impl_foldlM___at___00__private_Lake_CLI_Main_0__Lake_lake_script_list_spec__0___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_script_run_spec__1___boxed__const__1);
 l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__1();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2 = _init_l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_script_run___boxed__const__2);
-l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_script_doc___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_script_help___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_build___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_query_spec__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_query___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__5___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__4___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lake_CLI_Main_0__Lake_lake_queryKind_spec__2___boxed__const__1);
 l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2 = _init_l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_queryKind___boxed__const__2);
-l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_cache___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_setupFile___lam__1___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_test___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_lint___lam__0___boxed__const__1);
-l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1 = _init_l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1();
-lean_mark_persistent(l_List_forM___at___00__private_Lake_CLI_Main_0__Lake_lake_clean_spec__2___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_clean___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_shake___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_script___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_serve___lam__0___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_CLI_Main_0__Lake_lake_env_spec__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2 = _init_l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_env___boxed__const__2);
-l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_exe___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_lean___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_translateConfig___lam__0___boxed__const__1);
 l___private_Lake_CLI_Main_0__Lake_lake_instToJsonReservoirConfig_toJson___closed__12 = _init_l___private_Lake_CLI_Main_0__Lake_lake_instToJsonReservoirConfig_toJson___closed__12();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_instToJsonReservoirConfig_toJson___closed__12);
-l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___lam__0___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_reservoirConfig___boxed__const__1);
-l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1 = _init_l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1();
-lean_mark_persistent(l_List_forIn_x27_loop___at___00__private_Lake_CLI_Main_0__Lake_lake_versionTags_spec__0___redArg___boxed__const__1);
-l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake_help___boxed__const__1);
 l___private_Lake_CLI_Main_0__Lake_lakeCli___closed__31 = _init_l___private_Lake_CLI_Main_0__Lake_lakeCli___closed__31();
 lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lakeCli___closed__31);
-l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1 = _init_l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1();
-lean_mark_persistent(l___private_Lake_CLI_Main_0__Lake_lake___boxed__const__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lake/Config/Artifact.c b/stage0/stdlib/Lake/Config/Artifact.c
index 6d6c69cf56..25cf8be0ff 100644
--- a/stage0/stdlib/Lake/Config/Artifact.c
+++ b/stage0/stdlib/Lake/Config/Artifact.c
@@ -180,7 +180,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_artifactPath(x_3, x_2);
 lean_dec_ref(x_2);
 return x_4;
@@ -358,7 +358,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_artifactWithExt(x_3, x_2);
 return x_4;
 }
diff --git a/stage0/stdlib/Lake/Config/Cache.c b/stage0/stdlib/Lake/Config/Cache.c
index 8906072f9d..3657ca9e17 100644
--- a/stage0/stdlib/Lake/Config/Cache.c
+++ b/stage0/stdlib/Lake/Config/Cache.c
@@ -1000,7 +1000,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lake_Config_Cache_0__Lake_CacheMap_parse_loop_spec__2_spec__5___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -1038,7 +1038,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lake_Config_Cache_0__Lake_CacheMap_parse_loop_spec__2_spec__3___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -1195,7 +1195,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lake_Config_Cache_0__Lake_CacheMap_parse_loop_spec__2___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -1717,7 +1717,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lake_Config_Cache_0__Lake_CacheMap_parse_loop_spec__2(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -1773,7 +1773,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lake_Config_Cache_0__Lake_CacheMap_parse_loop_spec__2_spec__3(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -1801,7 +1801,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lake_Config_Cache_0__Lake_CacheMap_parse_loop_spec__2_spec__5(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -3854,7 +3854,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lake_CacheMap_get_x3f_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -3888,7 +3888,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lake_CacheMap_get_x3f_spec__0___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -3907,7 +3907,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lake_CacheMap_get_x3f(x_3, x_2);
 lean_dec_ref(x_2);
 return x_4;
@@ -3926,7 +3926,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lake_CacheMap_get_x3f_spec__0(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 return x_5;
@@ -3945,7 +3945,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lake_CacheMap_get_x3f_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
@@ -3964,7 +3964,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Lake_CacheMap_insertCore(x_4, x_2, x_3);
 return x_5;
 }
@@ -3983,7 +3983,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Lake_CacheMap_insert___redArg(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -4002,7 +4002,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_7 = l_Lake_CacheMap_insert(x_1, x_2, x_6, x_4, x_5);
 return x_7;
 }
@@ -4608,7 +4608,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Lake_CacheRef_get_x3f(x_4, x_2);
 lean_dec(x_2);
 return x_5;
@@ -4630,7 +4630,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Lake_CacheRef_insert___redArg(x_1, x_6, x_3, x_4);
 lean_dec(x_4);
 return x_7;
@@ -4652,7 +4652,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = l_Lake_CacheRef_insert(x_1, x_2, x_7, x_4, x_5);
 lean_dec(x_5);
 return x_8;
@@ -5204,7 +5204,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lake_Cache_artifactPath(x_1, x_4, x_3);
 lean_dec_ref(x_3);
 return x_5;
@@ -5803,7 +5803,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Lake_Cache_outputsFile(x_1, x_2, x_4);
 return x_5;
 }
@@ -5850,7 +5850,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = l___private_Lake_Config_Cache_0__Lake_Cache_writeOutputsCore(x_1, x_2, x_7, x_4, x_5);
 return x_8;
 }
@@ -5869,7 +5869,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lake_Cache_writeOutputs___redArg(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
@@ -5888,7 +5888,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = l_Lake_Cache_writeOutputs(x_1, x_2, x_3, x_4, x_9, x_6, x_7);
 return x_10;
 }
@@ -6244,7 +6244,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_7 = l_Lake_Cache_readOutputs_x3f(x_1, x_2, x_6, x_4);
 return x_7;
 }
@@ -7276,7 +7276,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l___private_Lake_Config_Cache_0__Lake_CacheService_s3ArtifactUrl(x_4, x_2, x_3);
 return x_5;
 }
@@ -7340,7 +7340,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Lake_CacheService_artifactUrl(x_4, x_2, x_3);
 return x_5;
 }
@@ -10017,7 +10017,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_8 = l_Lake_CacheService_uploadArtifact(x_7, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -10059,7 +10059,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_8 = l_Lake_CacheService_uploadArtifact___at___00Lake_CacheService_uploadArtifacts___elam__0_spec__0(x_1, x_7, x_3, x_4, x_5);
 return x_8;
 }
diff --git a/stage0/stdlib/Lake/Load/Lean/Elab.c b/stage0/stdlib/Lake/Load/Lean/Elab.c
index 19411b4380..967b997baf 100644
--- a/stage0/stdlib/Lake/Load/Lean/Elab.c
+++ b/stage0/stdlib/Lake/Load/Lean/Elab.c
@@ -713,7 +713,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lake_importModulesUsingCache_spec__0_spec__1(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lake/Load/Resolve.c b/stage0/stdlib/Lake/Load/Resolve.c
index f7d6d2088c..e60f1f29a1 100644
--- a/stage0/stdlib/Lake/Load/Resolve.c
+++ b/stage0/stdlib/Lake/Load/Resolve.c
@@ -404,7 +404,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15_spec__21___lam__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_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15_spec__21(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_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15_spec__21___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4(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_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -631,7 +630,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1_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_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -13480,15 +13478,6 @@ x_16 = l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__p
 return x_16;
 }
 }
-static lean_object* _init_l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
@@ -13546,7 +13535,7 @@ lean_free_object(x_9);
 lean_dec(x_2);
 x_27 = lean_usize_of_nat(x_21);
 x_28 = lean_box_usize(x_27);
-x_29 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1;
+x_29 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0_spec__5___lam__4___boxed__const__1;
 x_30 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15_spec__21___boxed), 13, 10);
 lean_closure_set(x_30, 0, x_3);
 lean_closure_set(x_30, 1, x_7);
@@ -13618,7 +13607,7 @@ size_t x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_objec
 lean_dec(x_2);
 x_46 = lean_usize_of_nat(x_39);
 x_47 = lean_box_usize(x_46);
-x_48 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1;
+x_48 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0_spec__5___lam__4___boxed__const__1;
 x_49 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15_spec__21___boxed), 13, 10);
 lean_closure_set(x_49, 0, x_3);
 lean_closure_set(x_49, 1, x_7);
@@ -24274,15 +24263,6 @@ lean_dec(x_1);
 return x_9;
 }
 }
-static lean_object* _init_l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__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) {
 _start:
 {
@@ -24340,7 +24320,7 @@ lean_free_object(x_9);
 lean_dec(x_2);
 x_26 = lean_usize_of_nat(x_20);
 x_27 = lean_box_usize(x_26);
-x_28 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1;
+x_28 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0_spec__5___lam__4___boxed__const__1;
 x_29 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1_spec__2___boxed), 12, 10);
 lean_closure_set(x_29, 0, x_3);
 lean_closure_set(x_29, 1, x_7);
@@ -24412,7 +24392,7 @@ size_t x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_objec
 lean_dec(x_2);
 x_45 = lean_usize_of_nat(x_38);
 x_46 = lean_box_usize(x_45);
-x_47 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1;
+x_47 = l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0_spec__5___lam__4___boxed__const__1;
 x_48 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_foldrMUnsafe_fold___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1_spec__2___boxed), 12, 10);
 lean_closure_set(x_48, 0, x_3);
 lean_closure_set(x_48, 1, x_7);
@@ -25875,10 +25855,6 @@ l_Std_DTreeMap_Internal_Impl_insert_x21___at___00Lean_NameMap_toJson___at___00__
 lean_mark_persistent(l_Std_DTreeMap_Internal_Impl_insert_x21___at___00Lean_NameMap_toJson___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__1_spec__7_spec__10___redArg___closed__7);
 l_Std_DTreeMap_Internal_Impl_insert_x21___at___00Lean_NameMap_toJson___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__1_spec__7_spec__10___redArg___closed__8 = _init_l_Std_DTreeMap_Internal_Impl_insert_x21___at___00Lean_NameMap_toJson___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__1_spec__7_spec__10___redArg___closed__8();
 lean_mark_persistent(l_Std_DTreeMap_Internal_Impl_insert_x21___at___00Lean_NameMap_toJson___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__1_spec__7_spec__10___redArg___closed__8);
-l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1 = _init_l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1();
-lean_mark_persistent(l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__0___at___00__private_Lake_Load_Resolve_0__Lake_Workspace_updateAndMaterializeCore___elam__5_spec__10_spec__15___lam__4___boxed__const__1);
-l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1 = _init_l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1();
-lean_mark_persistent(l___private_Lake_Load_Resolve_0__Lake_Workspace_resolveDepsCore_go___at___00Lake_Workspace_materializeDeps___elam__0_spec__1___lam__4___boxed__const__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lake/Toml/Grammar.c b/stage0/stdlib/Lake/Toml/Grammar.c
index 71f916cf6b..e4d9f53366 100644
--- a/stage0/stdlib/Lake/Toml/Grammar.c
+++ b/stage0/stdlib/Lake/Toml/Grammar.c
@@ -743,7 +743,6 @@ LEAN_EXPORT lean_object* l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_f
 LEAN_EXPORT lean_object* l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_formatter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_formatter___closed__0___boxed__const__1;
 static lean_object* l_Lake_Toml_stdTable_formatter___closed__0;
-LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_formatter___closed__1___boxed__const__1;
 static lean_object* l_Lake_Toml_stdTable_formatter___closed__1;
 lean_object* l_Lean_PrettyPrinter_Formatter_notFollowedBy_formatter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lake_Toml_stdTable_formatter___closed__2;
@@ -807,7 +806,6 @@ LEAN_EXPORT lean_object* l_Lake_Toml_trailingWs_parenthesizer___redArg();
 LEAN_EXPORT lean_object* l_Lake_Toml_trailingWs_parenthesizer___redArg___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lake_Toml_trailingWs_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_Toml_trailingWs_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_Toml_key_parenthesizer___closed__0___boxed__const__1;
 lean_object* l_Lake_Toml_chAtom_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lake_Toml_key_parenthesizer___closed__0;
 lean_object* l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -819,21 +817,17 @@ lean_object* l_Lean_Parser_setExpected_parenthesizer___boxed(lean_object*, lean_
 static lean_object* l_Lake_Toml_key_parenthesizer___closed__4;
 LEAN_EXPORT lean_object* l_Lake_Toml_key_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_Toml_key_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0___boxed__const__1;
 static lean_object* l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0;
 LEAN_EXPORT lean_object* l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_parenthesizer___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_parenthesizer___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__0___boxed__const__1;
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__0;
-LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__1___boxed__const__1;
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__1;
 lean_object* l_Lean_PrettyPrinter_Parenthesizer_notFollowedBy_parenthesizer___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__2;
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__3;
-LEAN_EXPORT lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__4___boxed__const__1;
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__4;
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__5;
 static lean_object* l_Lake_Toml_stdTable_parenthesizer___closed__6;
@@ -6696,22 +6690,13 @@ lean_closure_set(x_4, 2, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_Toml_stdTable_formatter___closed__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 91;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lake_Toml_stdTable_formatter___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = ((lean_object*)(l___private_Lake_Toml_Grammar_0__Lake_Toml_decNumberTailAuxFn___closed__4));
 x_2 = l_Lake_Toml_stdTable___closed__8;
-x_3 = l_Lake_Toml_stdTable_formatter___closed__1___boxed__const__1;
+x_3 = l_Lake_Toml_stdTable_formatter___closed__0___boxed__const__1;
 x_4 = lean_alloc_closure((void*)(l_Lake_Toml_chAtom_formatter___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
@@ -7269,22 +7254,13 @@ lean_dec_ref(x_1);
 return x_6;
 }
 }
-static lean_object* _init_l_Lake_Toml_key_parenthesizer___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 46;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lake_Toml_key_parenthesizer___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = ((lean_object*)(l___private_Lake_Toml_Grammar_0__Lake_Toml_decNumberTailAuxFn___closed__4));
 x_2 = l_Lake_Toml_key___closed__7;
-x_3 = l_Lake_Toml_key_parenthesizer___closed__0___boxed__const__1;
+x_3 = l_Lake_Toml_key_formatter___closed__0___boxed__const__1;
 x_4 = lean_alloc_closure((void*)(l_Lake_Toml_chAtom_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
@@ -7365,22 +7341,13 @@ x_6 = l_Lake_Toml_key_parenthesizer(x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 61;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = ((lean_object*)(l___private_Lake_Toml_Grammar_0__Lake_Toml_decNumberTailAuxFn___closed__4));
 x_2 = l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore___closed__5;
-x_3 = l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0___boxed__const__1;
+x_3 = l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_formatter___closed__0___boxed__const__1;
 x_4 = lean_alloc_closure((void*)(l_Lake_Toml_chAtom_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
@@ -7439,22 +7406,13 @@ x_8 = l_Lake_Toml_stdTable_parenthesizer___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
 return x_8;
 }
 }
-static lean_object* _init_l_Lake_Toml_stdTable_parenthesizer___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 91;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lake_Toml_stdTable_parenthesizer___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = ((lean_object*)(l___private_Lake_Toml_Grammar_0__Lake_Toml_decNumberTailAuxFn___closed__4));
 x_2 = ((lean_object*)(l_Lake_Toml_stdTable___closed__3));
-x_3 = l_Lake_Toml_stdTable_parenthesizer___closed__0___boxed__const__1;
+x_3 = l_Lake_Toml_stdTable_formatter___closed__0___boxed__const__1;
 x_4 = lean_alloc_closure((void*)(l_Lake_Toml_chAtom_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
@@ -7462,22 +7420,13 @@ lean_closure_set(x_4, 2, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_Toml_stdTable_parenthesizer___closed__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 91;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lake_Toml_stdTable_parenthesizer___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = ((lean_object*)(l___private_Lake_Toml_Grammar_0__Lake_Toml_decNumberTailAuxFn___closed__4));
 x_2 = l_Lake_Toml_stdTable___closed__8;
-x_3 = l_Lake_Toml_stdTable_parenthesizer___closed__1___boxed__const__1;
+x_3 = l_Lake_Toml_stdTable_formatter___closed__0___boxed__const__1;
 x_4 = lean_alloc_closure((void*)(l_Lake_Toml_chAtom_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
@@ -7507,22 +7456,13 @@ lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lake_Toml_stdTable_parenthesizer___closed__4___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 93;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lake_Toml_stdTable_parenthesizer___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = ((lean_object*)(l___private_Lake_Toml_Grammar_0__Lake_Toml_decNumberTailAuxFn___closed__4));
 x_2 = l_Lake_Toml_stdTable___closed__17;
-x_3 = l_Lake_Toml_stdTable_parenthesizer___closed__4___boxed__const__1;
+x_3 = l_Lake_Toml_stdTable_formatter___closed__5___boxed__const__1;
 x_4 = lean_alloc_closure((void*)(l_Lake_Toml_chAtom_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
@@ -8213,8 +8153,6 @@ l_Lake_Toml_stdTable_formatter___closed__0___boxed__const__1 = _init_l_Lake_Toml
 lean_mark_persistent(l_Lake_Toml_stdTable_formatter___closed__0___boxed__const__1);
 l_Lake_Toml_stdTable_formatter___closed__0 = _init_l_Lake_Toml_stdTable_formatter___closed__0();
 lean_mark_persistent(l_Lake_Toml_stdTable_formatter___closed__0);
-l_Lake_Toml_stdTable_formatter___closed__1___boxed__const__1 = _init_l_Lake_Toml_stdTable_formatter___closed__1___boxed__const__1();
-lean_mark_persistent(l_Lake_Toml_stdTable_formatter___closed__1___boxed__const__1);
 l_Lake_Toml_stdTable_formatter___closed__1 = _init_l_Lake_Toml_stdTable_formatter___closed__1();
 lean_mark_persistent(l_Lake_Toml_stdTable_formatter___closed__1);
 l_Lake_Toml_stdTable_formatter___closed__2 = _init_l_Lake_Toml_stdTable_formatter___closed__2();
@@ -8253,8 +8191,6 @@ l___private_Lake_Toml_Grammar_0__Lake_Toml_expressionCore_formatter___closed__0
 lean_mark_persistent(l___private_Lake_Toml_Grammar_0__Lake_Toml_expressionCore_formatter___closed__0);
 l_Lake_Toml_simpleKey_parenthesizer___closed__0 = _init_l_Lake_Toml_simpleKey_parenthesizer___closed__0();
 lean_mark_persistent(l_Lake_Toml_simpleKey_parenthesizer___closed__0);
-l_Lake_Toml_key_parenthesizer___closed__0___boxed__const__1 = _init_l_Lake_Toml_key_parenthesizer___closed__0___boxed__const__1();
-lean_mark_persistent(l_Lake_Toml_key_parenthesizer___closed__0___boxed__const__1);
 l_Lake_Toml_key_parenthesizer___closed__0 = _init_l_Lake_Toml_key_parenthesizer___closed__0();
 lean_mark_persistent(l_Lake_Toml_key_parenthesizer___closed__0);
 l_Lake_Toml_key_parenthesizer___closed__1 = _init_l_Lake_Toml_key_parenthesizer___closed__1();
@@ -8265,24 +8201,16 @@ l_Lake_Toml_key_parenthesizer___closed__3 = _init_l_Lake_Toml_key_parenthesizer_
 lean_mark_persistent(l_Lake_Toml_key_parenthesizer___closed__3);
 l_Lake_Toml_key_parenthesizer___closed__4 = _init_l_Lake_Toml_key_parenthesizer___closed__4();
 lean_mark_persistent(l_Lake_Toml_key_parenthesizer___closed__4);
-l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0___boxed__const__1 = _init_l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0___boxed__const__1();
-lean_mark_persistent(l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0___boxed__const__1);
 l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0 = _init_l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0();
 lean_mark_persistent(l___private_Lake_Toml_Grammar_0__Lake_Toml_keyvalCore_parenthesizer___closed__0);
-l_Lake_Toml_stdTable_parenthesizer___closed__0___boxed__const__1 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__0___boxed__const__1();
-lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__0___boxed__const__1);
 l_Lake_Toml_stdTable_parenthesizer___closed__0 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__0();
 lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__0);
-l_Lake_Toml_stdTable_parenthesizer___closed__1___boxed__const__1 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__1___boxed__const__1();
-lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__1___boxed__const__1);
 l_Lake_Toml_stdTable_parenthesizer___closed__1 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__1();
 lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__1);
 l_Lake_Toml_stdTable_parenthesizer___closed__2 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__2();
 lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__2);
 l_Lake_Toml_stdTable_parenthesizer___closed__3 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__3();
 lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__3);
-l_Lake_Toml_stdTable_parenthesizer___closed__4___boxed__const__1 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__4___boxed__const__1();
-lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__4___boxed__const__1);
 l_Lake_Toml_stdTable_parenthesizer___closed__4 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__4();
 lean_mark_persistent(l_Lake_Toml_stdTable_parenthesizer___closed__4);
 l_Lake_Toml_stdTable_parenthesizer___closed__5 = _init_l_Lake_Toml_stdTable_parenthesizer___closed__5();
diff --git a/stage0/stdlib/Lake/Util/Cli.c b/stage0/stdlib/Lake/Util/Cli.c
index fc9b888f96..bc5cdcc809 100644
--- a/stage0/stdlib/Lake/Util/Cli.c
+++ b/stage0/stdlib/Lake/Util/Cli.c
@@ -64,12 +64,12 @@ LEAN_EXPORT lean_object* l_Lake_shortOptionWithSpace___redArg(lean_object*, lean
 LEAN_EXPORT lean_object* l_Lake_shortOptionWithSpace(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_shortOptionWithArg___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_shortOptionWithArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_utf8_at_end(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint32_t lean_string_utf8_get_fast(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_next_fast(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_multiShortOption___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_multiShortOption(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -84,24 +84,17 @@ LEAN_EXPORT lean_object* l_Lake_longOptionOrSpace___redArg___lam__2___boxed(lean
 LEAN_EXPORT lean_object* l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_object* l_WellFounded_opaqueFix_u2083___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOptionOrSpace___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_longOptionOrSpace___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_longOptionOrSpace(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOptionOrEq___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_longOptionOrEq___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_longOptionOrEq___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_longOptionOrEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__1(lean_object*, lean_object*, uint32_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__0___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_longOption___redArg___boxed__const__1;
-LEAN_EXPORT lean_object* l_Lake_longOption___redArg___boxed__const__2;
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_longOption___boxed__const__1;
-LEAN_EXPORT lean_object* l_Lake_longOption___boxed__const__2;
 LEAN_EXPORT lean_object* l_Lake_longOption(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_shortOption___redArg___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_shortOption___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*);
@@ -114,14 +107,9 @@ LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__4(lean_object*, lean_obje
 LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__5___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_option___redArg___boxed__const__1;
-LEAN_EXPORT lean_object* l_Lake_option___redArg___boxed__const__2;
 LEAN_EXPORT lean_object* l_Lake_option___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_option___boxed__const__1;
-LEAN_EXPORT lean_object* l_Lake_option___boxed__const__2;
 LEAN_EXPORT lean_object* l_Lake_option(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_processLeadingOption___redArg___lam__0(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -902,15 +890,6 @@ return x_30;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0___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___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_2);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -924,7 +903,7 @@ lean_inc(x_6);
 lean_inc(x_2);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_7 = lean_alloc_closure((void*)(l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0___boxed), 5, 4);
+x_7 = lean_alloc_closure((void*)(l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0), 5, 4);
 lean_closure_set(x_7, 0, x_3);
 lean_closure_set(x_7, 1, x_4);
 lean_closure_set(x_7, 2, x_1);
@@ -964,6 +943,15 @@ x_7 = l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg(x_3, x_4,
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0___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___private_Lake_Util_Cli_0__Lake_multiShortOption_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_2);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lake_Util_Cli_0__Lake_multiShortOption_loop(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1141,15 +1129,6 @@ return x_16;
 }
 }
 }
-static lean_object* _init_l_Lake_longOptionOrSpace___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_longOptionOrSpace(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:
 {
@@ -1157,7 +1136,7 @@ lean_object* x_7; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_
 x_20 = lean_unsigned_to_nat(0u);
 x_21 = lean_string_utf8_byte_size(x_6);
 x_22 = lean_box(0);
-x_23 = l_Lake_longOptionOrSpace___boxed__const__1;
+x_23 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_6);
 x_24 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_24, 0, x_21);
@@ -1301,15 +1280,6 @@ return x_16;
 }
 }
 }
-static lean_object* _init_l_Lake_longOptionOrEq___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 61;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_longOptionOrEq(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:
 {
@@ -1317,7 +1287,7 @@ lean_object* x_7; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_
 x_20 = lean_unsigned_to_nat(0u);
 x_21 = lean_string_utf8_byte_size(x_6);
 x_22 = lean_box(0);
-x_23 = l_Lake_longOptionOrEq___boxed__const__1;
+x_23 = l_Lake_longOptionOrEq___redArg___boxed__const__1;
 lean_inc_ref(x_6);
 x_24 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_24, 0, x_21);
@@ -1452,15 +1422,6 @@ lean_dec(x_1);
 return x_10;
 }
 }
-static lean_object* _init_l_Lake_longOption___redArg___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg___lam__0(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:
 {
@@ -1469,7 +1430,7 @@ x_7 = lean_unsigned_to_nat(0u);
 x_8 = lean_string_utf8_extract(x_1, x_7, x_2);
 x_20 = lean_string_utf8_byte_size(x_8);
 x_21 = lean_box(0);
-x_22 = l_Lake_longOption___redArg___lam__0___boxed__const__1;
+x_22 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_8);
 x_23 = lean_alloc_closure((void*)(l_Lake_longOption___redArg___lam__1___boxed), 8, 4);
 lean_closure_set(x_23, 0, x_20);
@@ -1538,24 +1499,6 @@ lean_dec_ref(x_1);
 return x_7;
 }
 }
-static lean_object* _init_l_Lake_longOption___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lake_longOption___redArg___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 61;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_longOption___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -1563,7 +1506,7 @@ lean_object* x_5; lean_object* x_18; lean_object* x_36; lean_object* x_37; lean_
 x_36 = lean_unsigned_to_nat(0u);
 x_37 = lean_string_utf8_byte_size(x_4);
 x_38 = lean_box(0);
-x_39 = l_Lake_longOption___redArg___boxed__const__2;
+x_39 = l_Lake_longOptionOrEq___redArg___boxed__const__1;
 lean_inc_ref(x_4);
 x_40 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_40, 0, x_37);
@@ -1665,7 +1608,7 @@ lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean
 lean_dec(x_18);
 x_29 = lean_unsigned_to_nat(0u);
 x_30 = lean_box(0);
-x_31 = l_Lake_longOption___redArg___boxed__const__1;
+x_31 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_4);
 x_32 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_32, 0, x_19);
@@ -1691,24 +1634,6 @@ goto block_17;
 }
 }
 }
-static lean_object* _init_l_Lake_longOption___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lake_longOption___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 61;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_longOption(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:
 {
@@ -1716,7 +1641,7 @@ lean_object* x_7; lean_object* x_20; lean_object* x_38; lean_object* x_39; lean_
 x_38 = lean_unsigned_to_nat(0u);
 x_39 = lean_string_utf8_byte_size(x_6);
 x_40 = lean_box(0);
-x_41 = l_Lake_longOption___boxed__const__2;
+x_41 = l_Lake_longOptionOrEq___redArg___boxed__const__1;
 lean_inc_ref(x_6);
 x_42 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_42, 0, x_39);
@@ -1818,7 +1743,7 @@ lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean
 lean_dec(x_20);
 x_31 = lean_unsigned_to_nat(0u);
 x_32 = lean_box(0);
-x_33 = l_Lake_longOption___boxed__const__1;
+x_33 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_6);
 x_34 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_34, 0, x_21);
@@ -2241,15 +2166,6 @@ lean_dec_ref(x_1);
 return x_6;
 }
 }
-static lean_object* _init_l_Lake_option___redArg___lam__5___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_option___redArg___lam__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -2258,7 +2174,7 @@ x_7 = lean_unsigned_to_nat(0u);
 x_8 = lean_string_utf8_extract(x_1, x_7, x_2);
 x_20 = lean_string_utf8_byte_size(x_8);
 x_21 = lean_box(0);
-x_22 = l_Lake_option___redArg___lam__5___boxed__const__1;
+x_22 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_8);
 x_23 = lean_alloc_closure((void*)(l_Lake_longOption___redArg___lam__1___boxed), 8, 4);
 lean_closure_set(x_23, 0, x_20);
@@ -2327,24 +2243,6 @@ lean_dec_ref(x_1);
 return x_7;
 }
 }
-static lean_object* _init_l_Lake_option___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lake_option___redArg___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 61;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_option___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -2666,7 +2564,7 @@ lean_dec_ref(x_3);
 x_146 = lean_unsigned_to_nat(0u);
 x_147 = lean_string_utf8_byte_size(x_4);
 x_148 = lean_box(0);
-x_149 = l_Lake_option___redArg___boxed__const__2;
+x_149 = l_Lake_longOptionOrEq___redArg___boxed__const__1;
 lean_inc_ref(x_4);
 x_150 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_150, 0, x_147);
@@ -2768,7 +2666,7 @@ lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142;
 lean_dec(x_128);
 x_139 = lean_unsigned_to_nat(0u);
 x_140 = lean_box(0);
-x_141 = l_Lake_option___redArg___boxed__const__1;
+x_141 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_4);
 x_142 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_142, 0, x_129);
@@ -2795,24 +2693,6 @@ goto block_127;
 }
 }
 }
-static lean_object* _init_l_Lake_option___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lake_option___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 61;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_option(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:
 {
@@ -3134,7 +3014,7 @@ lean_dec_ref(x_5);
 x_148 = lean_unsigned_to_nat(0u);
 x_149 = lean_string_utf8_byte_size(x_6);
 x_150 = lean_box(0);
-x_151 = l_Lake_option___boxed__const__2;
+x_151 = l_Lake_longOptionOrEq___redArg___boxed__const__1;
 lean_inc_ref(x_6);
 x_152 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_152, 0, x_149);
@@ -3236,7 +3116,7 @@ lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144;
 lean_dec(x_130);
 x_141 = lean_unsigned_to_nat(0u);
 x_142 = lean_box(0);
-x_143 = l_Lake_option___boxed__const__1;
+x_143 = l_Lake_longOptionOrSpace___redArg___boxed__const__1;
 lean_inc_ref(x_6);
 x_144 = lean_alloc_closure((void*)(l_Lake_longOptionOrSpace___redArg___lam__2___boxed), 8, 4);
 lean_closure_set(x_144, 0, x_131);
@@ -3765,32 +3645,8 @@ l_Lake_shortOptionWithSpace___redArg___closed__1 = _init_l_Lake_shortOptionWithS
 lean_mark_persistent(l_Lake_shortOptionWithSpace___redArg___closed__1);
 l_Lake_longOptionOrSpace___redArg___boxed__const__1 = _init_l_Lake_longOptionOrSpace___redArg___boxed__const__1();
 lean_mark_persistent(l_Lake_longOptionOrSpace___redArg___boxed__const__1);
-l_Lake_longOptionOrSpace___boxed__const__1 = _init_l_Lake_longOptionOrSpace___boxed__const__1();
-lean_mark_persistent(l_Lake_longOptionOrSpace___boxed__const__1);
 l_Lake_longOptionOrEq___redArg___boxed__const__1 = _init_l_Lake_longOptionOrEq___redArg___boxed__const__1();
 lean_mark_persistent(l_Lake_longOptionOrEq___redArg___boxed__const__1);
-l_Lake_longOptionOrEq___boxed__const__1 = _init_l_Lake_longOptionOrEq___boxed__const__1();
-lean_mark_persistent(l_Lake_longOptionOrEq___boxed__const__1);
-l_Lake_longOption___redArg___lam__0___boxed__const__1 = _init_l_Lake_longOption___redArg___lam__0___boxed__const__1();
-lean_mark_persistent(l_Lake_longOption___redArg___lam__0___boxed__const__1);
-l_Lake_longOption___redArg___boxed__const__1 = _init_l_Lake_longOption___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_longOption___redArg___boxed__const__1);
-l_Lake_longOption___redArg___boxed__const__2 = _init_l_Lake_longOption___redArg___boxed__const__2();
-lean_mark_persistent(l_Lake_longOption___redArg___boxed__const__2);
-l_Lake_longOption___boxed__const__1 = _init_l_Lake_longOption___boxed__const__1();
-lean_mark_persistent(l_Lake_longOption___boxed__const__1);
-l_Lake_longOption___boxed__const__2 = _init_l_Lake_longOption___boxed__const__2();
-lean_mark_persistent(l_Lake_longOption___boxed__const__2);
-l_Lake_option___redArg___lam__5___boxed__const__1 = _init_l_Lake_option___redArg___lam__5___boxed__const__1();
-lean_mark_persistent(l_Lake_option___redArg___lam__5___boxed__const__1);
-l_Lake_option___redArg___boxed__const__1 = _init_l_Lake_option___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_option___redArg___boxed__const__1);
-l_Lake_option___redArg___boxed__const__2 = _init_l_Lake_option___redArg___boxed__const__2();
-lean_mark_persistent(l_Lake_option___redArg___boxed__const__2);
-l_Lake_option___boxed__const__1 = _init_l_Lake_option___boxed__const__1();
-lean_mark_persistent(l_Lake_option___boxed__const__1);
-l_Lake_option___boxed__const__2 = _init_l_Lake_option___boxed__const__2();
-lean_mark_persistent(l_Lake_option___boxed__const__2);
 l_Lake_processOptions___redArg___closed__0 = _init_l_Lake_processOptions___redArg___closed__0();
 lean_mark_persistent(l_Lake_processOptions___redArg___closed__0);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lake/Util/MainM.c b/stage0/stdlib/Lake/Util/MainM.c
index 0cd9dd6efd..9e2759a329 100644
--- a/stage0/stdlib/Lake/Util/MainM.c
+++ b/stage0/stdlib/Lake/Util/MainM.c
@@ -55,19 +55,15 @@ LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 uint8_t lean_uint32_dec_eq(uint32_t, uint32_t);
 LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_failure___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_failure___redArg();
 LEAN_EXPORT lean_object* l_Lake_MainM_failure___redArg___boxed(lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_failure___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_failure(lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_failure___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_orElse___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_orElse___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_orElse___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_orElse___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_orElse(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_orElse___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_closure_object l___private_Lake_Util_MainM_0__Lake_MainM_instAlternative___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lake_MainM_failure___boxed, .m_arity = 2, .m_num_fixed = 0, .m_objs = {} };
@@ -84,13 +80,11 @@ LEAN_EXPORT lean_object* l_Lake_MainM_error___redArg(lean_object*, uint32_t);
 LEAN_EXPORT lean_object* l_Lake_MainM_error___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_error(lean_object*, lean_object*, uint32_t);
 LEAN_EXPORT lean_object* l_Lake_MainM_error___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_instMonadError___lam__0___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_instMonadError___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_instMonadError___lam__0___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_closure_object l_Lake_MainM_instMonadError___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lake_MainM_instMonadError___lam__0___boxed, .m_arity = 3, .m_num_fixed = 0, .m_objs = {} };
 static const lean_object* l_Lake_MainM_instMonadError___closed__0 = (const lean_object*)&l_Lake_MainM_instMonadError___closed__0_value;
 LEAN_EXPORT const lean_object* l_Lake_MainM_instMonadError = (const lean_object*)&l_Lake_MainM_instMonadError___closed__0_value;
-LEAN_EXPORT lean_object* l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1;
 lean_object* lean_io_error_to_string(lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_instMonadLiftIO___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_instMonadLiftIO___lam__0___boxed(lean_object*, lean_object*, lean_object*);
@@ -104,7 +98,6 @@ lean_object* l_instMonadST(lean_object*);
 static lean_object* l_Lake_MainM_runLogIO___redArg___closed__0;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 static lean_object* l_Lake_MainM_runLogIO___redArg___closed__1;
-LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO___redArg___boxed__const__1;
 lean_object* l_Lake_OutStream_get(lean_object*);
 uint8_t l_Lake_AnsiMode_isEnabled(lean_object*, uint8_t);
 lean_object* lean_array_get_size(lean_object*);
@@ -116,7 +109,6 @@ uint8_t l_Lake_Log_maxLv(lean_object*);
 uint8_t l_Lake_instOrdLogLevel_ord(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -124,7 +116,6 @@ lean_object* lean_array_uget(lean_object*, size_t);
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lake_MainM_liftLogIO_spec__0(lean_object*, uint8_t, uint8_t, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lake_MainM_liftLogIO_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_liftLogIO___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLogIO___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLogIO___redArg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLogIO(lean_object*, lean_object*);
@@ -134,15 +125,12 @@ static const lean_object* l_Lake_MainM_instMonadLiftLogIO___closed__0 = (const l
 LEAN_EXPORT const lean_object* l_Lake_MainM_instMonadLiftLogIO = (const lean_object*)&l_Lake_MainM_instMonadLiftLogIO___closed__0_value;
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___redArg___lam__0(lean_object*, uint8_t, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO___redArg___lam__0(lean_object*, uint8_t, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO___redArg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO(lean_object*, lean_object*);
@@ -588,15 +576,6 @@ x_4 = l_Lake_MainM_tryCatchError___redArg(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_MainM_tryCatchError___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_tryCatchError(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -630,7 +609,7 @@ else
 lean_object* x_12; 
 lean_dec(x_7);
 lean_dec_ref(x_2);
-x_12 = l_Lake_MainM_tryCatchError___boxed__const__1;
+x_12 = l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 lean_ctor_set(x_5, 0, x_12);
 return x_5;
 }
@@ -655,7 +634,7 @@ else
 lean_object* x_18; lean_object* x_19; 
 lean_dec(x_13);
 lean_dec_ref(x_2);
-x_18 = l_Lake_MainM_tryCatchError___boxed__const__1;
+x_18 = l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 x_19 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_19, 0, x_18);
 return x_19;
@@ -699,20 +678,11 @@ x_2 = l_Lake_MainM_failure___redArg();
 return x_2;
 }
 }
-static lean_object* _init_l_Lake_MainM_failure___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_failure(lean_object* x_1) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
-x_3 = l_Lake_MainM_failure___boxed__const__1;
+x_3 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_4 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_4, 0, x_3);
 return x_4;
@@ -726,15 +696,6 @@ x_3 = l_Lake_MainM_failure(x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lake_MainM_orElse___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_orElse___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -769,7 +730,7 @@ else
 {
 lean_object* x_12; 
 lean_dec_ref(x_2);
-x_12 = l_Lake_MainM_orElse___redArg___boxed__const__1;
+x_12 = l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 lean_ctor_set(x_4, 0, x_12);
 return x_4;
 }
@@ -795,7 +756,7 @@ else
 {
 lean_object* x_19; lean_object* x_20; 
 lean_dec_ref(x_2);
-x_19 = l_Lake_MainM_orElse___redArg___boxed__const__1;
+x_19 = l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 x_20 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_20, 0, x_19);
 return x_20;
@@ -812,15 +773,6 @@ x_4 = l_Lake_MainM_orElse___redArg(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_MainM_orElse___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_orElse(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -855,7 +807,7 @@ else
 {
 lean_object* x_13; 
 lean_dec_ref(x_3);
-x_13 = l_Lake_MainM_orElse___boxed__const__1;
+x_13 = l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 lean_ctor_set(x_5, 0, x_13);
 return x_5;
 }
@@ -881,7 +833,7 @@ else
 {
 lean_object* x_20; lean_object* x_21; 
 lean_dec_ref(x_3);
-x_20 = l_Lake_MainM_orElse___boxed__const__1;
+x_20 = l_Lake_MainM_tryCatchError___redArg___boxed__const__1;
 x_21 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_21, 0, x_20);
 return x_21;
@@ -1018,15 +970,6 @@ x_6 = l_Lake_MainM_error(x_1, x_2, x_5);
 return x_6;
 }
 }
-static lean_object* _init_l_Lake_MainM_instMonadError___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_instMonadError___lam__0(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -1040,7 +983,7 @@ lean_ctor_set(x_8, 0, x_2);
 lean_ctor_set_uint8(x_8, sizeof(void*)*1, x_7);
 x_9 = l_Lake_OutStream_logEntry(x_6, x_8, x_4, x_5);
 lean_dec_ref(x_8);
-x_10 = l_Lake_MainM_instMonadError___lam__0___boxed__const__1;
+x_10 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_11 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_11, 0, x_10);
 return x_11;
@@ -1054,15 +997,6 @@ x_4 = l_Lake_MainM_instMonadError___lam__0(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_instMonadLiftIO___lam__0(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -1105,7 +1039,7 @@ lean_ctor_set(x_15, 0, x_10);
 lean_ctor_set_uint8(x_15, sizeof(void*)*1, x_14);
 x_16 = l_Lake_OutStream_logEntry(x_13, x_15, x_11, x_12);
 lean_dec_ref(x_15);
-x_17 = l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1;
+x_17 = l_Lake_MainM_failure___redArg___boxed__const__1;
 lean_ctor_set(x_4, 0, x_17);
 return x_4;
 }
@@ -1125,7 +1059,7 @@ lean_ctor_set(x_24, 0, x_19);
 lean_ctor_set_uint8(x_24, sizeof(void*)*1, x_23);
 x_25 = l_Lake_OutStream_logEntry(x_22, x_24, x_20, x_21);
 lean_dec_ref(x_24);
-x_26 = l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1;
+x_26 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_27 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_27, 0, x_26);
 return x_27;
@@ -1177,15 +1111,6 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lake_MainM_runLogIO___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -1246,7 +1171,7 @@ goto block_51;
 block_7:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l_Lake_MainM_runLogIO___redArg___boxed__const__1;
+x_5 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_6 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_6, 0, x_5);
 return x_6;
@@ -1386,15 +1311,6 @@ lean_dec_ref(x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_MainM_runLogIO___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_runLogIO(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -1455,7 +1371,7 @@ goto block_52;
 block_8:
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lake_MainM_runLogIO___boxed__const__1;
+x_6 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_7 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_7, 0, x_6);
 return x_7;
@@ -1635,15 +1551,6 @@ lean_dec_ref(x_4);
 return x_13;
 }
 }
-static lean_object* _init_l_Lake_MainM_liftLogIO___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLogIO___redArg(lean_object* x_1) {
 _start:
 {
@@ -1706,7 +1613,7 @@ goto block_46;
 block_6:
 {
 lean_object* x_4; lean_object* x_5; 
-x_4 = l_Lake_MainM_liftLogIO___redArg___boxed__const__1;
+x_4 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_5 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_5, 0, x_4);
 return x_5;
@@ -1871,15 +1778,6 @@ lean_dec_ref(x_4);
 return x_8;
 }
 }
-static lean_object* _init_l_Lake_MainM_runLoggerIO___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -1925,7 +1823,7 @@ if (x_16 == 0)
 lean_object* x_17; lean_object* x_18; 
 x_17 = lean_ctor_get(x_12, 0);
 lean_dec(x_17);
-x_18 = l_Lake_MainM_runLoggerIO___redArg___boxed__const__1;
+x_18 = l_Lake_MainM_failure___redArg___boxed__const__1;
 lean_ctor_set(x_12, 0, x_18);
 return x_12;
 }
@@ -1933,7 +1831,7 @@ else
 {
 lean_object* x_19; lean_object* x_20; 
 lean_dec(x_12);
-x_19 = l_Lake_MainM_runLoggerIO___redArg___boxed__const__1;
+x_19 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_20 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_20, 0, x_19);
 return x_20;
@@ -1950,15 +1848,6 @@ lean_dec_ref(x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lake_MainM_runLoggerIO___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_runLoggerIO(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -2004,7 +1893,7 @@ if (x_17 == 0)
 lean_object* x_18; lean_object* x_19; 
 x_18 = lean_ctor_get(x_13, 0);
 lean_dec(x_18);
-x_19 = l_Lake_MainM_runLoggerIO___boxed__const__1;
+x_19 = l_Lake_MainM_failure___redArg___boxed__const__1;
 lean_ctor_set(x_13, 0, x_19);
 return x_13;
 }
@@ -2012,7 +1901,7 @@ else
 {
 lean_object* x_20; lean_object* x_21; 
 lean_dec(x_13);
-x_20 = l_Lake_MainM_runLoggerIO___boxed__const__1;
+x_20 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_21 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_21, 0, x_20);
 return x_21;
@@ -2048,15 +1937,6 @@ lean_dec_ref(x_4);
 return x_8;
 }
 }
-static lean_object* _init_l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lake_MainM_liftLoggerIO___redArg(lean_object* x_1) {
 _start:
 {
@@ -2102,7 +1982,7 @@ if (x_15 == 0)
 lean_object* x_16; lean_object* x_17; 
 x_16 = lean_ctor_get(x_11, 0);
 lean_dec(x_16);
-x_17 = l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1;
+x_17 = l_Lake_MainM_failure___redArg___boxed__const__1;
 lean_ctor_set(x_11, 0, x_17);
 return x_11;
 }
@@ -2110,7 +1990,7 @@ else
 {
 lean_object* x_18; lean_object* x_19; 
 lean_dec(x_11);
-x_18 = l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1;
+x_18 = l_Lake_MainM_failure___redArg___boxed__const__1;
 x_19 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_19, 0, x_18);
 return x_19;
@@ -2161,42 +2041,18 @@ l_Lake_instMonadMainM = _init_l_Lake_instMonadMainM();
 lean_mark_persistent(l_Lake_instMonadMainM);
 l_Lake_MainM_tryCatchError___redArg___boxed__const__1 = _init_l_Lake_MainM_tryCatchError___redArg___boxed__const__1();
 lean_mark_persistent(l_Lake_MainM_tryCatchError___redArg___boxed__const__1);
-l_Lake_MainM_tryCatchError___boxed__const__1 = _init_l_Lake_MainM_tryCatchError___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_tryCatchError___boxed__const__1);
 l_Lake_MainM_failure___redArg___boxed__const__1 = _init_l_Lake_MainM_failure___redArg___boxed__const__1();
 lean_mark_persistent(l_Lake_MainM_failure___redArg___boxed__const__1);
-l_Lake_MainM_failure___boxed__const__1 = _init_l_Lake_MainM_failure___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_failure___boxed__const__1);
-l_Lake_MainM_orElse___redArg___boxed__const__1 = _init_l_Lake_MainM_orElse___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_orElse___redArg___boxed__const__1);
-l_Lake_MainM_orElse___boxed__const__1 = _init_l_Lake_MainM_orElse___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_orElse___boxed__const__1);
 l___private_Lake_Util_MainM_0__Lake_MainM_instAlternative = _init_l___private_Lake_Util_MainM_0__Lake_MainM_instAlternative();
 lean_mark_persistent(l___private_Lake_Util_MainM_0__Lake_MainM_instAlternative);
 l_Lake_MainM_instMonadLog___closed__0 = _init_l_Lake_MainM_instMonadLog___closed__0();
 lean_mark_persistent(l_Lake_MainM_instMonadLog___closed__0);
 l_Lake_MainM_instMonadLog = _init_l_Lake_MainM_instMonadLog();
 lean_mark_persistent(l_Lake_MainM_instMonadLog);
-l_Lake_MainM_instMonadError___lam__0___boxed__const__1 = _init_l_Lake_MainM_instMonadError___lam__0___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_instMonadError___lam__0___boxed__const__1);
-l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1 = _init_l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_instMonadLiftIO___lam__0___boxed__const__1);
 l_Lake_MainM_runLogIO___redArg___closed__0 = _init_l_Lake_MainM_runLogIO___redArg___closed__0();
 lean_mark_persistent(l_Lake_MainM_runLogIO___redArg___closed__0);
 l_Lake_MainM_runLogIO___redArg___closed__1 = _init_l_Lake_MainM_runLogIO___redArg___closed__1();
 lean_mark_persistent(l_Lake_MainM_runLogIO___redArg___closed__1);
-l_Lake_MainM_runLogIO___redArg___boxed__const__1 = _init_l_Lake_MainM_runLogIO___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_runLogIO___redArg___boxed__const__1);
-l_Lake_MainM_runLogIO___boxed__const__1 = _init_l_Lake_MainM_runLogIO___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_runLogIO___boxed__const__1);
-l_Lake_MainM_liftLogIO___redArg___boxed__const__1 = _init_l_Lake_MainM_liftLogIO___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_liftLogIO___redArg___boxed__const__1);
-l_Lake_MainM_runLoggerIO___redArg___boxed__const__1 = _init_l_Lake_MainM_runLoggerIO___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_runLoggerIO___redArg___boxed__const__1);
-l_Lake_MainM_runLoggerIO___boxed__const__1 = _init_l_Lake_MainM_runLoggerIO___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_runLoggerIO___boxed__const__1);
-l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1 = _init_l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1();
-lean_mark_persistent(l_Lake_MainM_liftLoggerIO___redArg___boxed__const__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Compiler/ExternAttr.c b/stage0/stdlib/Lean/Compiler/ExternAttr.c
index e908219367..f8a9278e80 100644
--- a/stage0/stdlib/Lean/Compiler/ExternAttr.c
+++ b/stage0/stdlib/Lean/Compiler/ExternAttr.c
@@ -630,7 +630,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_List_foldl___at___00Lean_instHashableExternAttrData_hash_spec__0(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Lean/Compiler/IR/LLVMBindings.c b/stage0/stdlib/Lean/Compiler/IR/LLVMBindings.c
index 3415e760b0..9383442d57 100644
--- a/stage0/stdlib/Lean/Compiler/IR/LLVMBindings.c
+++ b/stage0/stdlib/Lean/Compiler/IR/LLVMBindings.c
@@ -591,7 +591,7 @@ size_t x_4; uint64_t x_5; size_t x_6; lean_object* x_7;
 x_4 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = lean_llvm_int_type_in_context(x_4, x_5);
 x_7 = lean_box_usize(x_6);
 return x_7;
@@ -604,7 +604,7 @@ size_t x_4; uint64_t x_5; size_t x_6; lean_object* x_7;
 x_4 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = lean_llvm_opaque_pointer_type_in_context(x_4, x_5);
 x_7 = lean_box_usize(x_6);
 return x_7;
@@ -654,7 +654,7 @@ lean_dec(x_1);
 x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = lean_llvm_array_type(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
 return x_9;
@@ -1042,7 +1042,7 @@ lean_dec(x_3);
 x_10 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_11 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_12 = lean_llvm_build_switch(x_7, x_8, x_9, x_10, x_11);
 x_13 = lean_box_usize(x_12);
 return x_13;
@@ -1140,7 +1140,7 @@ lean_dec(x_1);
 x_9 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_10 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_11 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_12 = lean_unbox_usize(x_5);
@@ -1222,7 +1222,7 @@ lean_dec(x_1);
 x_7 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_8 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_9 = lean_unbox(x_4);
 x_10 = lean_llvm_const_int(x_6, x_7, x_8, x_9);
 x_11 = lean_box_usize(x_10);
@@ -1276,7 +1276,7 @@ lean_dec(x_1);
 x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = llvm_get_param(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
 return x_9;
@@ -1368,7 +1368,7 @@ lean_dec(x_2);
 x_9 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_10 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_11 = lean_llvm_target_machine_emit_to_file(x_7, x_8, x_9, x_4, x_10);
 lean_dec_ref(x_4);
 return x_11;
@@ -1430,7 +1430,7 @@ lean_dec(x_1);
 x_7 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_8 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_9 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_10 = lean_llvm_add_attribute_at_index(x_6, x_7, x_8, x_9);
@@ -1470,7 +1470,7 @@ lean_dec(x_1);
 x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = lean_llvm_set_visibility(x_5, x_6, x_7);
 return x_8;
 }
@@ -1508,7 +1508,7 @@ lean_dec(x_1);
 x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = lean_llvm_set_dll_storage_class(x_5, x_6, x_7);
 return x_8;
 }
@@ -1658,7 +1658,7 @@ lean_dec(x_1);
 x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = lean_llvm_set_linkage(x_5, x_6, x_7);
 return x_8;
 }
@@ -1863,9 +1863,9 @@ size_t x_6; uint64_t x_7; uint64_t x_8; uint8_t x_9; size_t x_10; lean_object* x
 x_6 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_7 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_8 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_9 = lean_unbox(x_4);
 x_10 = l_LLVM_constInt_x27(x_6, x_7, x_8, x_9);
 x_11 = lean_box_usize(x_10);
@@ -1888,7 +1888,7 @@ size_t x_5; uint64_t x_6; uint8_t x_7; size_t x_8; lean_object* x_9;
 x_5 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = lean_unbox(x_3);
 x_8 = l_LLVM_constInt1(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
@@ -1911,7 +1911,7 @@ size_t x_5; uint64_t x_6; uint8_t x_7; size_t x_8; lean_object* x_9;
 x_5 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = lean_unbox(x_3);
 x_8 = l_LLVM_constInt8(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
@@ -1934,7 +1934,7 @@ size_t x_5; uint64_t x_6; uint8_t x_7; size_t x_8; lean_object* x_9;
 x_5 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = lean_unbox(x_3);
 x_8 = l_LLVM_constInt32(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
@@ -1957,7 +1957,7 @@ size_t x_5; uint64_t x_6; uint8_t x_7; size_t x_8; lean_object* x_9;
 x_5 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = lean_unbox(x_3);
 x_8 = l_LLVM_constInt64(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
@@ -1980,7 +1980,7 @@ size_t x_5; uint64_t x_6; uint8_t x_7; size_t x_8; lean_object* x_9;
 x_5 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = lean_unbox(x_3);
 x_8 = l_LLVM_constIntSizeT(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
@@ -2003,7 +2003,7 @@ size_t x_5; uint64_t x_6; uint8_t x_7; size_t x_8; lean_object* x_9;
 x_5 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = lean_unbox(x_3);
 x_8 = l_LLVM_constIntUnsigned(x_5, x_6, x_7);
 x_9 = lean_box_usize(x_8);
diff --git a/stage0/stdlib/Lean/Compiler/IR/SimpleGroundExpr.c b/stage0/stdlib/Lean/Compiler/IR/SimpleGroundExpr.c
index 07be5121f9..3f95d5973a 100644
--- a/stage0/stdlib/Lean/Compiler/IR/SimpleGroundExpr.c
+++ b/stage0/stdlib/Lean/Compiler/IR/SimpleGroundExpr.c
@@ -2309,7 +2309,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_IR_uint64ToByteArrayLE(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Basic.c b/stage0/stdlib/Lean/Compiler/LCNF/Basic.c
index a83114c33a..0940df17d1 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Basic.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Basic.c
@@ -6076,7 +6076,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_List_foldl___at___00Lean_Compiler_LCNF_instHashableLetValue_hash_spec__0(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
@@ -6116,7 +6116,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_instHashableLetValue_hash_spec__1___redArg(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -6642,7 +6642,7 @@ lean_dec(x_3);
 x_8 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_instHashableLetValue_hash_spec__1(x_6, x_2, x_7, x_8, x_9);
 lean_dec_ref(x_2);
 x_11 = lean_box_uint64(x_10);
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/DeclHash.c b/stage0/stdlib/Lean/Compiler/LCNF/DeclHash.c
index 5a2a3d9917..9c1b38192c 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/DeclHash.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/DeclHash.c
@@ -154,7 +154,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_hashParams_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -265,7 +265,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_hashCode_spec__1___redArg(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -626,7 +626,7 @@ lean_dec(x_3);
 x_8 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_hashAlts_spec__3(x_6, x_2, x_7, x_8, x_9);
 lean_dec_ref(x_2);
 x_11 = lean_box_uint64(x_10);
@@ -684,7 +684,7 @@ lean_dec(x_3);
 x_8 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_hashCode_spec__1(x_6, x_2, x_7, x_8, x_9);
 lean_dec_ref(x_2);
 x_11 = lean_box_uint64(x_10);
@@ -807,7 +807,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_List_foldl___at___00Lean_Compiler_LCNF_instHashableSignature_hash_spec__0(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/FixedParams.c b/stage0/stdlib/Lean/Compiler/LCNF/FixedParams.c
index 64513b4d1f..dfce328a4b 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/FixedParams.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/FixedParams.c
@@ -157,13 +157,13 @@ LEAN_EXPORT uint8_t l_Array_contains___at___00Lean_Compiler_LCNF_FixedParams_eva
 LEAN_EXPORT lean_object* l_Array_contains___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__6___boxed(lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 static lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___closed__0;
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FixedParams_evalApp(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FixedParams_evalLetValue(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FixedParams_evalCode(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_FixedParams_evalCode_spec__9(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_FixedParams_evalCode_spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FixedParams_evalApp___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2106,7 +2106,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__1_spec__2(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -2739,15 +2739,6 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0___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___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec_ref(x_1);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
@@ -2825,7 +2816,7 @@ x_35 = lean_ctor_get(x_28, 1);
 lean_dec(x_35);
 x_36 = lean_ctor_get(x_28, 0);
 lean_dec(x_36);
-x_37 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0___boxed), 5, 2);
+x_37 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0), 5, 2);
 lean_closure_set(x_37, 0, x_17);
 lean_closure_set(x_37, 1, x_29);
 x_38 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__2___redArg(x_30, x_32, x_22);
@@ -2853,7 +2844,7 @@ else
 {
 lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
 lean_dec(x_28);
-x_41 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0___boxed), 5, 2);
+x_41 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0), 5, 2);
 lean_closure_set(x_41, 0, x_17);
 lean_closure_set(x_41, 1, x_29);
 x_42 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__2___redArg(x_30, x_32, x_22);
@@ -3525,6 +3516,15 @@ return x_14;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0___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___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Compiler_LCNF_FixedParams_evalApp_spec__5___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec_ref(x_1);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Compiler_LCNF_FixedParams_evalCode_spec__9___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Simp/ConstantFold.c b/stage0/stdlib/Lean/Compiler/LCNF/Simp/ConstantFold.c
index 739d989e37..836b5b03fa 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Simp/ConstantFold.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Simp/ConstantFold.c
@@ -760,9 +760,7 @@ static const lean_closure_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmet
 static const lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__49 = (const lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__49_value;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__53;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__54;
@@ -777,9 +775,7 @@ static const lean_closure_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmet
 static const lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__59 = (const lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__59_value;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__63;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__64;
@@ -917,9 +913,7 @@ static const lean_closure_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmet
 static const lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__146 = (const lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__146_value;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149;
 static const lean_ctor_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__150_value_aux_0 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__47_value),LEAN_SCALAR_PTR_LITERAL(98, 192, 58, 241, 186, 14, 255, 186)}};
 static const lean_ctor_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__150_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__150_value_aux_0),((lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__120_value),LEAN_SCALAR_PTR_LITERAL(152, 158, 253, 104, 151, 68, 86, 194)}};
@@ -941,9 +935,7 @@ static const lean_closure_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmet
 static const lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__160 = (const lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__160_value;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163___boxed__const__1;
 static lean_object* l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163;
 static const lean_ctor_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__164_value_aux_0 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__57_value),LEAN_SCALAR_PTR_LITERAL(58, 113, 45, 150, 103, 228, 0, 41)}};
 static const lean_ctor_object l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__164_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__164_value_aux_0),((lean_object*)&l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__120_value),LEAN_SCALAR_PTR_LITERAL(224, 226, 94, 119, 1, 215, 11, 200)}};
@@ -3738,7 +3730,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Compiler_LCNF_Simp_ConstantFold_instLiteralUInt64___lam__1(x_2);
 return x_3;
 }
@@ -15548,7 +15540,7 @@ x_41 = lean_box_uint64(x_28);
 x_42 = lean_box_uint64(x_40);
 x_43 = lean_apply_2(x_1, x_41, x_42);
 x_44 = lean_unbox_uint64(x_43);
-lean_dec(x_43);
+lean_dec_ref(x_43);
 lean_ctor_set_uint64(x_38, 0, x_44);
 lean_ctor_set(x_25, 0, x_30);
 return x_25;
@@ -15563,7 +15555,7 @@ x_47 = lean_box_uint64(x_45);
 x_48 = lean_apply_2(x_1, x_46, x_47);
 x_49 = lean_alloc_ctor(5, 0, 8);
 x_50 = lean_unbox_uint64(x_48);
-lean_dec(x_48);
+lean_dec_ref(x_48);
 lean_ctor_set_uint64(x_49, 0, x_50);
 lean_ctor_set(x_36, 0, x_49);
 lean_ctor_set(x_25, 0, x_30);
@@ -15606,7 +15598,7 @@ if (lean_is_scalar(x_53)) {
  x_57 = x_53;
 }
 x_58 = lean_unbox_uint64(x_56);
-lean_dec(x_56);
+lean_dec_ref(x_56);
 lean_ctor_set_uint64(x_57, 0, x_58);
 x_59 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_59, 0, x_57);
@@ -15671,7 +15663,7 @@ if (lean_is_scalar(x_64)) {
  x_68 = x_64;
 }
 x_69 = lean_unbox_uint64(x_67);
-lean_dec(x_67);
+lean_dec_ref(x_67);
 lean_ctor_set_uint64(x_68, 0, x_69);
 if (lean_is_scalar(x_62)) {
  x_70 = lean_alloc_ctor(0, 1, 0);
@@ -15806,7 +15798,7 @@ if (lean_is_scalar(x_85)) {
  x_89 = x_85;
 }
 x_90 = lean_unbox_uint64(x_88);
-lean_dec(x_88);
+lean_dec_ref(x_88);
 lean_ctor_set_uint64(x_89, 0, x_90);
 if (lean_is_scalar(x_83)) {
  x_91 = lean_alloc_ctor(0, 1, 0);
@@ -17623,7 +17615,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_rightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__16___redArg(x_5, x_2, x_3);
 lean_dec(x_3);
 lean_dec_ref(x_2);
@@ -17643,7 +17635,7 @@ _start:
 {
 uint64_t x_11; lean_object* x_12; 
 x_11 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_12 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_rightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__16(x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -23104,9 +23096,9 @@ _start:
 {
 uint64_t x_6; uint64_t x_7; lean_object* x_8; 
 x_6 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_7 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_8 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24_spec__42___redArg(x_6, x_7, x_3, x_4);
 lean_dec(x_4);
 lean_dec_ref(x_3);
@@ -23126,9 +23118,9 @@ _start:
 {
 uint64_t x_10; uint64_t x_11; lean_object* x_12; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_12 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24___redArg___lam__0(x_10, x_11, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_8);
 lean_dec_ref(x_7);
@@ -23581,9 +23573,9 @@ _start:
 {
 uint64_t x_6; uint64_t x_7; lean_object* x_8; 
 x_6 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_7 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_8 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_rightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24_spec__43___redArg(x_6, x_7, x_3, x_4);
 lean_dec(x_4);
 lean_dec_ref(x_3);
@@ -23603,9 +23595,9 @@ _start:
 {
 uint64_t x_10; uint64_t x_11; lean_object* x_12; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_12 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24___redArg___lam__1(x_10, x_11, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_8);
 lean_dec_ref(x_7);
@@ -23643,9 +23635,9 @@ _start:
 {
 uint64_t x_11; uint64_t x_12; lean_object* x_13; 
 x_11 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_12 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_13 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24___redArg(x_11, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec_ref(x_3);
 return x_13;
@@ -23664,7 +23656,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__20(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec_ref(x_2);
 return x_11;
@@ -23683,7 +23675,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_10 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__21(x_9, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_7);
 lean_dec_ref(x_6);
@@ -23958,7 +23950,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__10_spec__14___redArg(x_5, x_2, x_3);
 lean_dec(x_3);
 lean_dec_ref(x_2);
@@ -23978,7 +23970,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_10 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__10___redArg___lam__0(x_9, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_7);
 lean_dec_ref(x_6);
@@ -24002,7 +23994,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_10 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__10___redArg___lam__1(x_9, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_7);
 lean_dec_ref(x_6);
@@ -24036,7 +24028,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__10___redArg(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec_ref(x_2);
 return x_11;
@@ -24055,7 +24047,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__22(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec_ref(x_2);
 return x_11;
@@ -29053,9 +29045,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__31(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -29078,7 +29070,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_10 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_9, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_3);
 return x_10;
@@ -29180,15 +29172,15 @@ x_39 = lean_ctor_get_uint64(x_38, 0);
 lean_dec_ref(x_38);
 x_40 = lean_box_uint64(x_39);
 x_41 = lean_apply_1(x_3, x_40);
-lean_inc(x_41);
+lean_inc_ref(x_41);
 x_42 = lean_apply_1(x_2, x_41);
 x_43 = lean_unbox_uint64(x_42);
-lean_dec(x_42);
+lean_dec_ref(x_42);
 x_44 = lean_uint64_dec_eq(x_43, x_39);
 if (x_44 == 0)
 {
 lean_object* x_45; 
-lean_dec(x_41);
+lean_dec_ref(x_41);
 lean_free_object(x_30);
 lean_free_object(x_25);
 lean_dec(x_9);
@@ -29206,7 +29198,7 @@ lean_object* x_46; uint64_t x_47; lean_object* x_48;
 lean_free_object(x_36);
 x_46 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_47 = lean_unbox_uint64(x_41);
-lean_dec(x_41);
+lean_dec_ref(x_41);
 x_48 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_47, x_46, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_48) == 0)
 {
@@ -29310,15 +29302,15 @@ x_71 = lean_ctor_get_uint64(x_70, 0);
 lean_dec_ref(x_70);
 x_72 = lean_box_uint64(x_71);
 x_73 = lean_apply_1(x_3, x_72);
-lean_inc(x_73);
+lean_inc_ref(x_73);
 x_74 = lean_apply_1(x_2, x_73);
 x_75 = lean_unbox_uint64(x_74);
-lean_dec(x_74);
+lean_dec_ref(x_74);
 x_76 = lean_uint64_dec_eq(x_75, x_71);
 if (x_76 == 0)
 {
 lean_object* x_77; lean_object* x_78; 
-lean_dec(x_73);
+lean_dec_ref(x_73);
 lean_free_object(x_30);
 lean_free_object(x_25);
 lean_dec(x_9);
@@ -29336,7 +29328,7 @@ else
 lean_object* x_79; uint64_t x_80; lean_object* x_81; 
 x_79 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_80 = lean_unbox_uint64(x_73);
-lean_dec(x_73);
+lean_dec_ref(x_73);
 x_81 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_80, x_79, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_81) == 0)
 {
@@ -29453,15 +29445,15 @@ x_98 = lean_ctor_get_uint64(x_96, 0);
 lean_dec_ref(x_96);
 x_99 = lean_box_uint64(x_98);
 x_100 = lean_apply_1(x_3, x_99);
-lean_inc(x_100);
+lean_inc_ref(x_100);
 x_101 = lean_apply_1(x_2, x_100);
 x_102 = lean_unbox_uint64(x_101);
-lean_dec(x_101);
+lean_dec_ref(x_101);
 x_103 = lean_uint64_dec_eq(x_102, x_98);
 if (x_103 == 0)
 {
 lean_object* x_104; lean_object* x_105; 
-lean_dec(x_100);
+lean_dec_ref(x_100);
 lean_free_object(x_25);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -29483,7 +29475,7 @@ lean_object* x_106; uint64_t x_107; lean_object* x_108;
 lean_dec(x_97);
 x_106 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_107 = lean_unbox_uint64(x_100);
-lean_dec(x_100);
+lean_dec_ref(x_100);
 x_108 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_107, x_106, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_108) == 0)
 {
@@ -29665,15 +29657,15 @@ x_135 = lean_ctor_get_uint64(x_133, 0);
 lean_dec_ref(x_133);
 x_136 = lean_box_uint64(x_135);
 x_137 = lean_apply_1(x_3, x_136);
-lean_inc(x_137);
+lean_inc_ref(x_137);
 x_138 = lean_apply_1(x_2, x_137);
 x_139 = lean_unbox_uint64(x_138);
-lean_dec(x_138);
+lean_dec_ref(x_138);
 x_140 = lean_uint64_dec_eq(x_139, x_135);
 if (x_140 == 0)
 {
 lean_object* x_141; lean_object* x_142; 
-lean_dec(x_137);
+lean_dec_ref(x_137);
 lean_dec(x_132);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -29695,7 +29687,7 @@ lean_object* x_143; uint64_t x_144; lean_object* x_145;
 lean_dec(x_134);
 x_143 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_144 = lean_unbox_uint64(x_137);
-lean_dec(x_137);
+lean_dec_ref(x_137);
 x_145 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_144, x_143, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_145) == 0)
 {
@@ -29976,15 +29968,15 @@ x_39 = lean_ctor_get_uint64(x_38, 0);
 lean_dec_ref(x_38);
 x_40 = lean_box_uint64(x_39);
 x_41 = lean_apply_1(x_3, x_40);
-lean_inc(x_41);
+lean_inc_ref(x_41);
 x_42 = lean_apply_1(x_2, x_41);
 x_43 = lean_unbox_uint64(x_42);
-lean_dec(x_42);
+lean_dec_ref(x_42);
 x_44 = lean_uint64_dec_eq(x_43, x_39);
 if (x_44 == 0)
 {
 lean_object* x_45; 
-lean_dec(x_41);
+lean_dec_ref(x_41);
 lean_free_object(x_30);
 lean_free_object(x_25);
 lean_dec(x_9);
@@ -30002,7 +29994,7 @@ lean_object* x_46; uint64_t x_47; lean_object* x_48;
 lean_free_object(x_36);
 x_46 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_47 = lean_unbox_uint64(x_41);
-lean_dec(x_41);
+lean_dec_ref(x_41);
 x_48 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_47, x_46, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_48) == 0)
 {
@@ -30106,15 +30098,15 @@ x_71 = lean_ctor_get_uint64(x_70, 0);
 lean_dec_ref(x_70);
 x_72 = lean_box_uint64(x_71);
 x_73 = lean_apply_1(x_3, x_72);
-lean_inc(x_73);
+lean_inc_ref(x_73);
 x_74 = lean_apply_1(x_2, x_73);
 x_75 = lean_unbox_uint64(x_74);
-lean_dec(x_74);
+lean_dec_ref(x_74);
 x_76 = lean_uint64_dec_eq(x_75, x_71);
 if (x_76 == 0)
 {
 lean_object* x_77; lean_object* x_78; 
-lean_dec(x_73);
+lean_dec_ref(x_73);
 lean_free_object(x_30);
 lean_free_object(x_25);
 lean_dec(x_9);
@@ -30132,7 +30124,7 @@ else
 lean_object* x_79; uint64_t x_80; lean_object* x_81; 
 x_79 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_80 = lean_unbox_uint64(x_73);
-lean_dec(x_73);
+lean_dec_ref(x_73);
 x_81 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_80, x_79, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_81) == 0)
 {
@@ -30249,15 +30241,15 @@ x_98 = lean_ctor_get_uint64(x_96, 0);
 lean_dec_ref(x_96);
 x_99 = lean_box_uint64(x_98);
 x_100 = lean_apply_1(x_3, x_99);
-lean_inc(x_100);
+lean_inc_ref(x_100);
 x_101 = lean_apply_1(x_2, x_100);
 x_102 = lean_unbox_uint64(x_101);
-lean_dec(x_101);
+lean_dec_ref(x_101);
 x_103 = lean_uint64_dec_eq(x_102, x_98);
 if (x_103 == 0)
 {
 lean_object* x_104; lean_object* x_105; 
-lean_dec(x_100);
+lean_dec_ref(x_100);
 lean_free_object(x_25);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -30279,7 +30271,7 @@ lean_object* x_106; uint64_t x_107; lean_object* x_108;
 lean_dec(x_97);
 x_106 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_107 = lean_unbox_uint64(x_100);
-lean_dec(x_100);
+lean_dec_ref(x_100);
 x_108 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_107, x_106, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_108) == 0)
 {
@@ -30461,15 +30453,15 @@ x_135 = lean_ctor_get_uint64(x_133, 0);
 lean_dec_ref(x_133);
 x_136 = lean_box_uint64(x_135);
 x_137 = lean_apply_1(x_3, x_136);
-lean_inc(x_137);
+lean_inc_ref(x_137);
 x_138 = lean_apply_1(x_2, x_137);
 x_139 = lean_unbox_uint64(x_138);
-lean_dec(x_138);
+lean_dec_ref(x_138);
 x_140 = lean_uint64_dec_eq(x_139, x_135);
 if (x_140 == 0)
 {
 lean_object* x_141; lean_object* x_142; 
-lean_dec(x_137);
+lean_dec_ref(x_137);
 lean_dec(x_132);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -30491,7 +30483,7 @@ lean_object* x_143; uint64_t x_144; lean_object* x_145;
 lean_dec(x_134);
 x_143 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_144 = lean_unbox_uint64(x_137);
-lean_dec(x_137);
+lean_dec_ref(x_137);
 x_145 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_144, x_143, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_145) == 0)
 {
@@ -33845,15 +33837,15 @@ x_39 = lean_ctor_get_uint64(x_38, 0);
 lean_dec_ref(x_38);
 x_40 = lean_box_uint64(x_39);
 x_41 = lean_apply_1(x_3, x_40);
-lean_inc(x_41);
+lean_inc_ref(x_41);
 x_42 = lean_apply_1(x_2, x_41);
 x_43 = lean_unbox_uint64(x_42);
-lean_dec(x_42);
+lean_dec_ref(x_42);
 x_44 = lean_uint64_dec_eq(x_43, x_39);
 if (x_44 == 0)
 {
 lean_object* x_45; 
-lean_dec(x_41);
+lean_dec_ref(x_41);
 lean_free_object(x_30);
 lean_free_object(x_25);
 lean_dec(x_9);
@@ -33871,7 +33863,7 @@ lean_object* x_46; uint64_t x_47; lean_object* x_48;
 lean_free_object(x_36);
 x_46 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_47 = lean_unbox_uint64(x_41);
-lean_dec(x_41);
+lean_dec_ref(x_41);
 x_48 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_47, x_46, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_48) == 0)
 {
@@ -33975,15 +33967,15 @@ x_71 = lean_ctor_get_uint64(x_70, 0);
 lean_dec_ref(x_70);
 x_72 = lean_box_uint64(x_71);
 x_73 = lean_apply_1(x_3, x_72);
-lean_inc(x_73);
+lean_inc_ref(x_73);
 x_74 = lean_apply_1(x_2, x_73);
 x_75 = lean_unbox_uint64(x_74);
-lean_dec(x_74);
+lean_dec_ref(x_74);
 x_76 = lean_uint64_dec_eq(x_75, x_71);
 if (x_76 == 0)
 {
 lean_object* x_77; lean_object* x_78; 
-lean_dec(x_73);
+lean_dec_ref(x_73);
 lean_free_object(x_30);
 lean_free_object(x_25);
 lean_dec(x_9);
@@ -34001,7 +33993,7 @@ else
 lean_object* x_79; uint64_t x_80; lean_object* x_81; 
 x_79 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_80 = lean_unbox_uint64(x_73);
-lean_dec(x_73);
+lean_dec_ref(x_73);
 x_81 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_80, x_79, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_81) == 0)
 {
@@ -34118,15 +34110,15 @@ x_98 = lean_ctor_get_uint64(x_96, 0);
 lean_dec_ref(x_96);
 x_99 = lean_box_uint64(x_98);
 x_100 = lean_apply_1(x_3, x_99);
-lean_inc(x_100);
+lean_inc_ref(x_100);
 x_101 = lean_apply_1(x_2, x_100);
 x_102 = lean_unbox_uint64(x_101);
-lean_dec(x_101);
+lean_dec_ref(x_101);
 x_103 = lean_uint64_dec_eq(x_102, x_98);
 if (x_103 == 0)
 {
 lean_object* x_104; lean_object* x_105; 
-lean_dec(x_100);
+lean_dec_ref(x_100);
 lean_free_object(x_25);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -34148,7 +34140,7 @@ lean_object* x_106; uint64_t x_107; lean_object* x_108;
 lean_dec(x_97);
 x_106 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_107 = lean_unbox_uint64(x_100);
-lean_dec(x_100);
+lean_dec_ref(x_100);
 x_108 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_107, x_106, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_108) == 0)
 {
@@ -34330,15 +34322,15 @@ x_135 = lean_ctor_get_uint64(x_133, 0);
 lean_dec_ref(x_133);
 x_136 = lean_box_uint64(x_135);
 x_137 = lean_apply_1(x_3, x_136);
-lean_inc(x_137);
+lean_inc_ref(x_137);
 x_138 = lean_apply_1(x_2, x_137);
 x_139 = lean_unbox_uint64(x_138);
-lean_dec(x_138);
+lean_dec_ref(x_138);
 x_140 = lean_uint64_dec_eq(x_139, x_135);
 if (x_140 == 0)
 {
 lean_object* x_141; lean_object* x_142; 
-lean_dec(x_137);
+lean_dec_ref(x_137);
 lean_dec(x_132);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -34360,7 +34352,7 @@ lean_object* x_143; uint64_t x_144; lean_object* x_145;
 lean_dec(x_134);
 x_143 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_mkNatWrapperInstance___redArg___lam__1___closed__1));
 x_144 = lean_unbox_uint64(x_137);
-lean_dec(x_137);
+lean_dec_ref(x_137);
 x_145 = l_Lean_Compiler_LCNF_Simp_ConstantFold_mkAuxLit___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_divShift___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__30_spec__55(x_144, x_143, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_145) == 0)
 {
@@ -34788,40 +34780,22 @@ lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51___boxed__const__1;
+x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__17___boxed), 8, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__4));
-x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52___boxed__const__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50___boxed__const__1;
 x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__18___boxed), 9, 2);
 lean_closure_set(x_3, 0, x_2);
 lean_closure_set(x_3, 1, x_1);
@@ -34891,40 +34865,22 @@ lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61___boxed__const__1() {
-_start:
-{
-uint64_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint64(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61___boxed__const__1;
+x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__21___boxed), 8, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62___boxed__const__1() {
-_start:
-{
-uint64_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint64(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__5));
-x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62___boxed__const__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60___boxed__const__1;
 x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__22___boxed), 9, 2);
 lean_closure_set(x_3, 0, x_2);
 lean_closure_set(x_3, 1, x_1);
@@ -35504,41 +35460,23 @@ lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__9));
-x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148___boxed__const__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147___boxed__const__1;
 x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__18___boxed), 9, 2);
 lean_closure_set(x_3, 0, x_2);
 lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149___boxed__const__1;
+x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__17___boxed), 8, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -35639,41 +35577,23 @@ lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162___boxed__const__1() {
-_start:
-{
-uint64_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint64(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = ((lean_object*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__10));
-x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162___boxed__const__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161___boxed__const__1;
 x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__22___boxed), 9, 2);
 lean_closure_set(x_3, 0, x_2);
 lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163___boxed__const__1() {
-_start:
-{
-uint64_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint64(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163___boxed__const__1;
+x_1 = l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___lam__31___boxed), 2, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -36513,7 +36433,7 @@ _start:
 {
 uint64_t x_11; lean_object* x_12; 
 x_11 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_12 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__10_spec__14(x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_9);
 lean_dec_ref(x_8);
@@ -36538,7 +36458,7 @@ _start:
 {
 uint64_t x_12; lean_object* x_13; 
 x_12 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_13 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightNeutral___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__10(x_12, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec_ref(x_2);
 return x_13;
@@ -36811,9 +36731,9 @@ _start:
 {
 uint64_t x_12; uint64_t x_13; lean_object* x_14; 
 x_12 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_13 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_14 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24_spec__42(x_12, x_13, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_10);
 lean_dec_ref(x_9);
@@ -36838,9 +36758,9 @@ _start:
 {
 uint64_t x_12; uint64_t x_13; lean_object* x_14; 
 x_12 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_13 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_14 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_rightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24_spec__43(x_12, x_13, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_10);
 lean_dec_ref(x_9);
@@ -36865,9 +36785,9 @@ _start:
 {
 uint64_t x_13; uint64_t x_14; lean_object* x_15; 
 x_13 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_14 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_15 = l_Lean_Compiler_LCNF_Simp_ConstantFold_Folder_leftRightAnnihilator___at___00Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders_spec__24(x_13, x_14, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec_ref(x_3);
 return x_15;
@@ -53210,12 +53130,8 @@ l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50___boxed__c
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__50);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__51);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__52);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__53 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__53();
@@ -53230,12 +53146,8 @@ l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60___boxed__c
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__60);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__61);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__62);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__63 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__63();
@@ -53346,12 +53258,8 @@ l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147___boxed__
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__147);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__148);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__149);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__152 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__152();
@@ -53372,12 +53280,8 @@ l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161___boxed__
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__161);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__162);
-l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163___boxed__const__1 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163___boxed__const__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163___boxed__const__1);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__163);
 l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__166 = _init_l_Lean_Compiler_LCNF_Simp_ConstantFold_arithmeticFolders___closed__166();
diff --git a/stage0/stdlib/Lean/Compiler/NameMangling.c b/stage0/stdlib/Lean/Compiler/NameMangling.c
index 56e410efa0..f17aca1c6b 100644
--- a/stage0/stdlib/Lean/Compiler/NameMangling.c
+++ b/stage0/stdlib/Lean/Compiler/NameMangling.c
@@ -116,19 +116,16 @@ LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_dem
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg(uint32_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter(lean_object*, lean_object*, uint32_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg(uint32_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter(lean_object*, lean_object*, uint32_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg(uint32_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter(lean_object*, lean_object*, uint32_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Name_demangle(lean_object*);
@@ -1792,15 +1789,6 @@ x_6 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_s
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 120;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter(lean_object* x_1, lean_object* x_2, uint32_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -1836,7 +1824,7 @@ else
 {
 lean_object* x_15; lean_object* x_16; 
 lean_dec(x_5);
-x_15 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed__const__1;
+x_15 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg___boxed__const__1;
 x_16 = lean_apply_4(x_6, x_15, x_4, lean_box(0), lean_box(0));
 return x_16;
 }
@@ -1915,15 +1903,6 @@ x_6 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_s
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 117;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter(lean_object* x_1, lean_object* x_2, uint32_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -1959,7 +1938,7 @@ else
 {
 lean_object* x_15; lean_object* x_16; 
 lean_dec(x_5);
-x_15 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed__const__1;
+x_15 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg___boxed__const__1;
 x_16 = lean_apply_4(x_6, x_15, x_4, lean_box(0), lean_box(0));
 return x_16;
 }
@@ -2038,15 +2017,6 @@ x_6 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_s
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 85;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter(lean_object* x_1, lean_object* x_2, uint32_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -2082,7 +2052,7 @@ else
 {
 lean_object* x_15; lean_object* x_16; 
 lean_dec(x_5);
-x_15 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed__const__1;
+x_15 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg___boxed__const__1;
 x_16 = lean_apply_4(x_6, x_15, x_4, lean_box(0), lean_box(0));
 return x_16;
 }
@@ -2182,16 +2152,10 @@ l_Lean_mkMangledBoxedName___closed__1 = _init_l_Lean_mkMangledBoxedName___closed
 lean_mark_persistent(l_Lean_mkMangledBoxedName___closed__1);
 l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg___boxed__const__1 = _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___redArg___boxed__const__1);
-l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed__const__1 = _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__6_splitter___boxed__const__1);
 l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg___boxed__const__1 = _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___redArg___boxed__const__1);
-l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed__const__1 = _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__4_splitter___boxed__const__1);
 l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg___boxed__const__1 = _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___redArg___boxed__const__1);
-l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed__const__1 = _init_l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Compiler_NameMangling_0__Lean_Name_demangleAux_match__1_splitter___boxed__const__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Data/Json/Basic.c b/stage0/stdlib/Lean/Data/Json/Basic.c
index c3fb306cda..e20c4ac345 100644
--- a/stage0/stdlib/Lean/Data/Json/Basic.c
+++ b/stage0/stdlib/Lean/Data/Json/Basic.c
@@ -2776,7 +2776,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_foldlM___at___00Std_DTreeMap_Internal_Impl_foldl___at___00__private_Lean_Data_Json_Basic_0__Lean_Json_hash_x27_spec__1_spec__1(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
@@ -2792,7 +2792,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Data_Json_Basic_0__Lean_Json_hash_x27_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -2822,7 +2822,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_foldl___at___00__private_Lean_Data_Json_Basic_0__Lean_Json_hash_x27_spec__1(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Lean/Data/Json/FromToJson/Basic.c b/stage0/stdlib/Lean/Data/Json/FromToJson/Basic.c
index 75594246c0..2fb81cec2c 100644
--- a/stage0/stdlib/Lean/Data/Json/FromToJson/Basic.c
+++ b/stage0/stdlib/Lean/Data/Json/FromToJson/Basic.c
@@ -1906,7 +1906,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_instToJsonUInt64___lam__0(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Lean/Data/Lsp/Extra.c b/stage0/stdlib/Lean/Data/Lsp/Extra.c
index f0922e2896..0388296ae2 100644
--- a/stage0/stdlib/Lean/Data/Lsp/Extra.c
+++ b/stage0/stdlib/Lean/Data/Lsp/Extra.c
@@ -7834,7 +7834,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Lsp_instToJsonRpcConnected_toJson(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Lean/Data/Lsp/LanguageFeatures.c b/stage0/stdlib/Lean/Data/Lsp/LanguageFeatures.c
index 071bfb772e..96bdbce01e 100644
--- a/stage0/stdlib/Lean/Data/Lsp/LanguageFeatures.c
+++ b/stage0/stdlib/Lean/Data/Lsp/LanguageFeatures.c
@@ -9176,7 +9176,7 @@ lean_dec(x_1);
 x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_7 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Lsp_instHashableCompletionItem_hash_spec__0___redArg(x_4, x_5, x_6);
 x_8 = lean_box_uint64(x_7);
 return x_8;
@@ -9433,7 +9433,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Lsp_instHashableCompletionItem_hash_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -29272,7 +29272,7 @@ lean_dec(x_1);
 x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_7 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Lsp_instHashableCallHierarchyItem_hash_spec__0___redArg(x_4, x_5, x_6);
 x_8 = lean_box_uint64(x_7);
 return x_8;
@@ -29436,7 +29436,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Lsp_instHashableCallHierarchyItem_hash_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lean/Data/PersistentArray.c b/stage0/stdlib/Lean/Data/PersistentArray.c
index a55c051782..eaf70b53e2 100644
--- a/stage0/stdlib/Lean/Data/PersistentArray.c
+++ b/stage0/stdlib/Lean/Data/PersistentArray.c
@@ -192,8 +192,8 @@ LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___lam__9__
 static const lean_ctor_object l_Lean_PersistentArray_findSomeMAux___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1))}};
 static const lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___closed__0 = (const lean_object*)&l_Lean_PersistentArray_findSomeMAux___redArg___closed__0_value;
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeM_x3f___redArg___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeM_x3f___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -3849,15 +3849,6 @@ lean_dec_ref(x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___lam__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; 
-x_8 = l_Lean_PersistentArray_findSomeMAux___redArg___lam__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec_ref(x_7);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -3896,7 +3887,7 @@ lean_closure_set(x_13, 2, x_6);
 lean_closure_set(x_13, 3, x_12);
 lean_inc(x_6);
 lean_inc_ref(x_1);
-x_14 = lean_alloc_closure((void*)(l_Lean_PersistentArray_findSomeMAux___redArg___lam__4___boxed), 7, 4);
+x_14 = lean_alloc_closure((void*)(l_Lean_PersistentArray_findSomeMAux___redArg___lam__4), 7, 4);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_2);
 lean_closure_set(x_14, 2, x_6);
@@ -3962,6 +3953,15 @@ x_9 = lean_apply_4(x_3, lean_box(0), lean_box(0), x_8, x_4);
 return x_9;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux___redArg___lam__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_Lean_PersistentArray_findSomeMAux___redArg___lam__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec_ref(x_7);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_findSomeMAux(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:
 {
diff --git a/stage0/stdlib/Lean/Data/PersistentHashMap.c b/stage0/stdlib/Lean/Data/PersistentHashMap.c
index 9aff2130ad..bb1ece10e7 100644
--- a/stage0/stdlib/Lean/Data/PersistentHashMap.c
+++ b/stage0/stdlib/Lean/Data/PersistentHashMap.c
@@ -197,8 +197,8 @@ LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_eraseAux___boxed(lean_object*,
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_erase___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_erase(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlMAux___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
@@ -1544,7 +1544,7 @@ lean_inc_ref(x_2);
 lean_inc(x_10);
 x_12 = lean_apply_1(x_2, x_10);
 x_13 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_14 = lean_uint64_to_usize(x_13);
 x_15 = 5;
 x_16 = lean_unsigned_to_nat(1u);
@@ -1637,7 +1637,7 @@ lean_inc_ref(x_2);
 lean_inc(x_4);
 x_6 = lean_apply_1(x_2, x_4);
 x_7 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = 1;
 x_10 = l_Lean_PersistentHashMap_insertAux___redArg(x_1, x_2, x_3, x_8, x_9, x_4, x_5);
@@ -1909,7 +1909,7 @@ lean_object* x_5; uint64_t x_6; size_t x_7; lean_object* x_8;
 lean_inc(x_4);
 x_5 = lean_apply_1(x_2, x_4);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_to_usize(x_6);
 x_8 = l_Lean_PersistentHashMap_findAux___redArg(x_1, x_3, x_7, x_4);
 return x_8;
@@ -2382,7 +2382,7 @@ lean_object* x_5; uint64_t x_6; size_t x_7; lean_object* x_8;
 lean_inc(x_4);
 x_5 = lean_apply_1(x_2, x_4);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_to_usize(x_6);
 x_8 = l_Lean_PersistentHashMap_findEntryAux___redArg(x_1, x_3, x_7, x_4);
 return x_8;
@@ -2576,7 +2576,7 @@ lean_object* x_6; uint64_t x_7; size_t x_8; lean_object* x_9;
 lean_inc(x_4);
 x_6 = lean_apply_1(x_2, x_4);
 x_7 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = l_Lean_PersistentHashMap_findKeyDAux___redArg(x_1, x_3, x_8, x_4, x_5);
 return x_9;
@@ -2598,7 +2598,7 @@ lean_object* x_8; uint64_t x_9; size_t x_10; lean_object* x_11;
 lean_inc(x_6);
 x_8 = lean_apply_1(x_4, x_6);
 x_9 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_10 = lean_uint64_to_usize(x_9);
 x_11 = l_Lean_PersistentHashMap_findKeyDAux___redArg(x_3, x_5, x_10, x_6, x_7);
 return x_11;
@@ -2784,7 +2784,7 @@ lean_object* x_5; uint64_t x_6; size_t x_7; uint8_t x_8;
 lean_inc(x_4);
 x_5 = lean_apply_1(x_2, x_4);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_to_usize(x_6);
 x_8 = l_Lean_PersistentHashMap_containsAux___redArg(x_1, x_3, x_7, x_4);
 return x_8;
@@ -3374,7 +3374,7 @@ lean_object* x_5; uint64_t x_6; size_t x_7; lean_object* x_8;
 lean_inc(x_4);
 x_5 = lean_apply_1(x_2, x_4);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_to_usize(x_6);
 x_8 = l_Lean_PersistentHashMap_eraseAux___redArg(x_1, x_3, x_7, x_4);
 return x_8;
@@ -3388,15 +3388,6 @@ x_7 = l_Lean_PersistentHashMap_erase___redArg(x_3, x_4, x_5, x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0___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_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg(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:
 {
@@ -3428,7 +3419,7 @@ lean_inc_ref(x_4);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_5);
-x_13 = lean_alloc_closure((void*)(l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0___boxed), 6, 5);
+x_13 = lean_alloc_closure((void*)(l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0), 6, 5);
 lean_closure_set(x_13, 0, x_5);
 lean_closure_set(x_13, 1, x_1);
 lean_closure_set(x_13, 2, x_2);
@@ -3455,6 +3446,15 @@ x_9 = l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAu
 return x_9;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0___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_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_foldlMAux_traverse(lean_object* x_1, lean_object* x_2, 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/Data/PersistentHashSet.c b/stage0/stdlib/Lean/Data/PersistentHashSet.c
index 7b2e47b576..58b0a5da64 100644
--- a/stage0/stdlib/Lean/Data/PersistentHashSet.c
+++ b/stage0/stdlib/Lean/Data/PersistentHashSet.c
@@ -373,7 +373,7 @@ lean_object* x_6; uint64_t x_7; size_t x_8; lean_object* x_9;
 lean_inc(x_4);
 x_6 = lean_apply_1(x_2, x_4);
 x_7 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = l_Lean_PersistentHashMap_findKeyDAux___redArg(x_1, x_3, x_8, x_4, x_5);
 return x_9;
@@ -395,7 +395,7 @@ lean_object* x_7; uint64_t x_8; size_t x_9; lean_object* x_10;
 lean_inc(x_5);
 x_7 = lean_apply_1(x_3, x_5);
 x_8 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_9 = lean_uint64_to_usize(x_8);
 x_10 = l_Lean_PersistentHashMap_findKeyDAux___redArg(x_2, x_4, x_9, x_5, x_6);
 return x_10;
diff --git a/stage0/stdlib/Lean/Data/PrefixTree.c b/stage0/stdlib/Lean/Data/PrefixTree.c
index c4e9ab94e3..04479f8fa6 100644
--- a/stage0/stdlib/Lean/Data/PrefixTree.c
+++ b/stage0/stdlib/Lean/Data/PrefixTree.c
@@ -38,8 +38,8 @@ LEAN_EXPORT lean_object* l_Lean_PrefixTreeNode_findLongestPrefix_x3f(lean_object
 lean_object* l_Std_DTreeMap_Internal_Impl_foldlM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold(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_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___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_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_find___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -459,15 +459,6 @@ x_5 = l_Std_DTreeMap_Internal_Impl_foldlM___redArg(x_1, x_2, x_4, x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0___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___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_4);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -483,7 +474,7 @@ lean_inc(x_9);
 lean_dec_ref(x_3);
 lean_inc(x_2);
 lean_inc_ref(x_1);
-x_10 = lean_alloc_closure((void*)(l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0___boxed), 5, 2);
+x_10 = lean_alloc_closure((void*)(l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0), 5, 2);
 lean_closure_set(x_10, 0, x_1);
 lean_closure_set(x_10, 1, x_2);
 if (lean_obj_tag(x_8) == 0)
@@ -523,6 +514,15 @@ x_6 = l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0___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___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Data_PrefixTree_0__Lean_PrefixTreeNode_foldMatchingM_fold(lean_object* x_1, lean_object* x_2, 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/DocString/Markdown.c b/stage0/stdlib/Lean/DocString/Markdown.c
index c2dc517c6d..5e4e0035b6 100644
--- a/stage0/stdlib/Lean/DocString/Markdown.c
+++ b/stage0/stdlib/Lean/DocString/Markdown.c
@@ -265,17 +265,17 @@ static const lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockM
 lean_object* l_Nat_reprFast(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3(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_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = ": "};
 static const lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__0 = (const lean_object*)&l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__0_value;
 static const lean_ctor_object l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 0, .m_other = 1, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__0_value)}};
 static const lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__1 = (const lean_object*)&l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___closed__1_value;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = "> "};
 static const lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___closed__0 = (const lean_object*)&l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___closed__0_value;
 lean_object* l_Int_toNat(lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3___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_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__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_DocString_Markdown_0__Lean_Doc_blockMarkdown(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instToMarkdownBlockOfMarkdownInlineOfMarkdownBlock___private__1___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instToMarkdownBlockOfMarkdownInlineOfMarkdownBlock___private__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -286,10 +286,10 @@ LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMar
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___closed__0___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___closed__0;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3(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_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Nat_Basic_0__Nat_repeatTR_loop(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3(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_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3___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_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown(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_DocString_Markdown_0__Lean_Doc_partMarkdown___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -4526,15 +4526,6 @@ return x_57;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec(x_4);
-return x_10;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
@@ -4693,15 +4684,6 @@ return x_67;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec_ref(x_4);
-return x_9;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -4841,7 +4823,7 @@ x_51 = lean_ctor_get(x_3, 1);
 lean_inc_ref(x_51);
 lean_dec_ref(x_3);
 x_52 = lean_unsigned_to_nat(1u);
-x_53 = lean_alloc_closure((void*)(l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3___boxed), 9, 4);
+x_53 = lean_alloc_closure((void*)(l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3), 9, 4);
 lean_closure_set(x_53, 0, x_1);
 lean_closure_set(x_53, 1, x_2);
 lean_closure_set(x_53, 2, x_6);
@@ -4881,7 +4863,7 @@ x_64 = lean_ctor_get(x_3, 0);
 lean_inc_ref(x_64);
 lean_dec_ref(x_3);
 x_65 = lean_box(0);
-x_66 = lean_alloc_closure((void*)(l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___boxed), 8, 3);
+x_66 = lean_alloc_closure((void*)(l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2), 8, 3);
 lean_closure_set(x_66, 0, x_1);
 lean_closure_set(x_66, 1, x_2);
 lean_closure_set(x_66, 2, x_65);
@@ -5045,6 +5027,24 @@ return x_15;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_4);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown___redArg___lam__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec_ref(x_4);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_blockMarkdown(lean_object* x_1, 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:
 {
@@ -5134,15 +5134,6 @@ lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec(x_3);
-return x_10;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg(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:
 {
@@ -5205,7 +5196,7 @@ x_35 = l_Lean_Doc_MarkdownM_endBlock___redArg(x_34);
 x_36 = lean_ctor_get(x_35, 1);
 lean_inc(x_36);
 lean_dec_ref(x_35);
-x_37 = lean_alloc_closure((void*)(l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3___boxed), 9, 4);
+x_37 = lean_alloc_closure((void*)(l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3), 9, 4);
 lean_closure_set(x_37, 0, x_1);
 lean_closure_set(x_37, 1, x_2);
 lean_closure_set(x_37, 2, x_11);
@@ -5266,6 +5257,15 @@ return x_16;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___lam__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_3);
+return x_10;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Markdown_0__Lean_Doc_partMarkdown___redArg___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:
 {
diff --git a/stage0/stdlib/Lean/DocString/Parser.c b/stage0/stdlib/Lean/DocString/Parser.c
index 8f3835ab83..f735768a54 100644
--- a/stage0/stdlib/Lean/DocString/Parser.c
+++ b/stage0/stdlib/Lean/DocString/Parser.c
@@ -52,9 +52,9 @@ lean_object* l_Lean_Parser_takeWhileFn(lean_object*, lean_object*, lean_object*)
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_eatSpaces(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_eatSpaces___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_andthenFn(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Parser_InputContext_atEnd(lean_object*, lean_object*);
 uint32_t lean_string_utf8_get_fast(lean_object*, lean_object*);
@@ -461,7 +461,6 @@ static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlo
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__2___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__2;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__3;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__5;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine(lean_object*, lean_object*);
@@ -905,7 +904,6 @@ static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Pa
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__2 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__2_value;
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 23, .m_capacity = 23, .m_length = 22, .m_data = "' to close inline code"};
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__3 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__3_value;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___boxed__const__1;
 lean_object* l_List_replicateTR___redArg(lean_object*, lean_object*);
 lean_object* lean_string_mk(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer(lean_object*, lean_object*, lean_object*);
@@ -934,7 +932,6 @@ LEAN_EXPORT uint8_t l_WellFounded_opaqueFix_u2083___at___00String_Slice_contains
 LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00String_Slice_contains___at___00__private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__1(lean_object*, uint32_t);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__1___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0;
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 9, .m_capacity = 9, .m_length = 8, .m_data = "at most "};
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__1 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__1_value;
@@ -1073,7 +1070,6 @@ LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_em
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 30, .m_capacity = 30, .m_length = 29, .m_data = "space or newline after opener"};
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___closed__0 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4(uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__5(uint32_t, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1188,14 +1184,12 @@ LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_co
 static const lean_closure_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__0___boxed, .m_arity = 1, .m_num_fixed = 0, .m_objs = {} };
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___closed__0 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed__const__1;
 lean_object* l_Lean_Parser_optionalFn(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1;
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 26, .m_capacity = 26, .m_length = 25, .m_data = "expected 'n', '\\', or '`'"};
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__2 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__2_value;
@@ -1450,7 +1444,6 @@ static const lean_ctor_object l_Lean_Doc_Parser_lookaheadOrderedListIndicator___
 static const lean_object* l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__4 = (const lean_object*)&l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__4_value;
 static const lean_ctor_object l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__5_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__2_value),((lean_object*)&l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__4_value)}};
 static const lean_object* l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__5 = (const lean_object*)&l_Lean_Doc_Parser_lookaheadOrderedListIndicator___closed__5_value;
-LEAN_EXPORT lean_object* l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1;
 lean_object* l_String_Slice_toNat_x3f(lean_object*);
 lean_object* l_Lean_Syntax_mkNumLit(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_lookaheadOrderedListIndicator(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1460,7 +1453,6 @@ static const lean_ctor_object l_Lean_Doc_Parser_lookaheadUnorderedListIndicator_
 static const lean_object* l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___closed__1 = (const lean_object*)&l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___closed__1_value;
 static const lean_ctor_object l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Doc_Parser_metadataContents___closed__3_value),((lean_object*)&l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___closed__1_value)}};
 static const lean_object* l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___closed__2 = (const lean_object*)&l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___closed__2_value;
-LEAN_EXPORT lean_object* l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_lookaheadUnorderedListIndicator(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__0___boxed(lean_object*, lean_object*);
@@ -1469,9 +1461,7 @@ static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_s
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__2(uint32_t, uint32_t);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__2___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent(lean_object*, lean_object*, lean_object*);
@@ -1562,7 +1552,6 @@ static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Pa
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__2 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__2_value;
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 27, .m_capacity = 27, .m_length = 26, .m_data = "' for directive from line "};
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__3 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__3_value;
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_withIndentColumn___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 36, .m_capacity = 36, .m_length = 35, .m_data = "Internal error - not a column node "};
@@ -1589,7 +1578,6 @@ lean_object* l_String_Slice_Pos_get_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_deIndent(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_deIndent_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_deIndent_spec__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___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0___boxed__const__1;
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0;
 static const lean_string_object l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 13, .m_capacity = 13, .m_length = 12, .m_data = "ending fence"};
 static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__1 = (const lean_object*)&l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__1_value;
@@ -1624,7 +1612,6 @@ static const lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_h
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_header_checkNonIndented(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__1___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2(uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__0___closed__0;
@@ -1790,7 +1777,6 @@ LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__4(lean_object*, lean_ob
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__5(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__6(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__9___closed__0___boxed__const__1;
 static lean_object* l_Lean_Doc_Parser_header___lam__9___closed__0;
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_header___lam__7(lean_object*, lean_object*, lean_object*);
@@ -1881,10 +1867,8 @@ static const lean_string_object l_Lean_Doc_Parser_directive___lam__1___closed__1
 static const lean_object* l_Lean_Doc_Parser_directive___lam__1___closed__1 = (const lean_object*)&l_Lean_Doc_Parser_directive___lam__1___closed__1_value;
 static const lean_string_object l_Lean_Doc_Parser_directive___lam__1___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 22, .m_capacity = 22, .m_length = 21, .m_data = ", but it's at column "};
 static const lean_object* l_Lean_Doc_Parser_directive___lam__1___closed__2 = (const lean_object*)&l_Lean_Doc_Parser_directive___lam__1___closed__2_value;
-LEAN_EXPORT lean_object* l_Lean_Doc_Parser_directive___lam__1___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_directive___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_directive___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Doc_Parser_directive___lam__9___closed__0___boxed__const__1;
 static lean_object* l_Lean_Doc_Parser_directive___lam__9___closed__0;
 static lean_object* l_Lean_Doc_Parser_directive___lam__9___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_directive___lam__9(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1902,7 +1886,6 @@ LEAN_EXPORT lean_object* l_Lean_Doc_Parser_block___lam__6(lean_object*, lean_obj
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_block___lam__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_block___lam__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_block___lam__5(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Doc_Parser_blockquote___lam__3___closed__0___boxed__const__1;
 static lean_object* l_Lean_Doc_Parser_blockquote___lam__3___closed__0;
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_blockquote___lam__3(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_orderedList___lam__4(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2390,15 +2373,6 @@ lean_dec_ref(x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0(x_1, x_2, x_3, x_4);
-lean_dec(x_1);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -2417,7 +2391,7 @@ lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10;
 x_7 = lean_unsigned_to_nat(1u);
 x_8 = lean_nat_sub(x_1, x_7);
 lean_inc_ref(x_2);
-x_9 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0___boxed), 4, 2);
+x_9 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0), 4, 2);
 lean_closure_set(x_9, 0, x_8);
 lean_closure_set(x_9, 1, x_2);
 x_10 = l_Lean_Parser_andthenFn(x_2, x_9, x_3, x_4);
@@ -2433,6 +2407,15 @@ x_5 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn(x_1, x_2, x_3,
 return x_5;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___lam__0(x_1, x_2, x_3, x_4);
+lean_dec(x_1);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_repFn___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -6434,21 +6417,12 @@ lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 10;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 0;
-x_2 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4___boxed__const__1;
+x_2 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__2___boxed__const__1;
 x_3 = lean_box(x_1);
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_4, 0, x_2);
@@ -9633,15 +9607,6 @@ x_7 = l_Lean_Parser_notFollowedByFn(x_5, x_6, x_2, x_3);
 return x_7;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 96;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -9650,7 +9615,7 @@ x_4 = ((lean_object*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_
 x_5 = ((lean_object*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__1));
 x_6 = ((lean_object*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_strFn___closed__0));
 x_7 = ((lean_object*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___closed__2));
-x_8 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___boxed__const__1;
+x_8 = l_Lean_Doc_Parser_blockOpener___lam__3___boxed__const__1;
 lean_inc(x_1);
 x_9 = l_List_replicateTR___redArg(x_1, x_8);
 x_10 = lean_string_mk(x_9);
@@ -10259,21 +10224,12 @@ x_5 = lean_box(x_4);
 return x_5;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 96;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 0;
-x_2 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0___boxed__const__1;
+x_2 = l_Lean_Doc_Parser_blockOpener___lam__3___boxed__const__1;
 x_3 = lean_box(x_1);
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_4, 0, x_2);
@@ -11136,20 +11092,11 @@ x_5 = l_Lean_Parser_orelseFn(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_5 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed__const__1;
+x_5 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_6 = lean_box(x_1);
 x_7 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_7, 0, x_5);
@@ -11925,24 +11872,6 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1(x_1, x_2, x_3);
-lean_dec(x_1);
-return x_4;
-}
-}
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 96;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -11963,9 +11892,9 @@ else
 lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 x_9 = lean_unsigned_to_nat(1u);
 x_10 = lean_nat_sub(x_1, x_9);
-x_11 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1___boxed), 3, 1);
+x_11 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1), 3, 1);
 lean_closure_set(x_11, 0, x_10);
-x_12 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed__const__1;
+x_12 = l_Lean_Doc_Parser_blockOpener___lam__3___boxed__const__1;
 x_13 = lean_box(x_5);
 x_14 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_14, 0, x_12);
@@ -11986,6 +11915,15 @@ x_4 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn(
 return x_4;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___lam__1(x_1, x_2, x_3);
+lean_dec(x_1);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -12016,21 +11954,12 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 96;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0;
-x_2 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1___boxed__const__1;
+x_2 = l_Lean_Doc_Parser_blockOpener___lam__3___boxed__const__1;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -14070,15 +13999,6 @@ x_5 = l_Lean_Doc_Parser_lookaheadOrderedListIndicator___lam__1(x_4, x_2, x_3);
 return x_5;
 }
 }
-static lean_object* _init_l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_lookaheadOrderedListIndicator(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -14389,7 +14309,7 @@ x_143 = lean_box(x_60);
 x_144 = lean_alloc_closure((void*)(l_Lean_Doc_Parser_lookaheadOrderedListIndicator___lam__1___boxed), 3, 1);
 lean_closure_set(x_144, 0, x_143);
 x_145 = l_Lean_Parser_ParserState_next_x27___redArg(x_20, x_3, x_23);
-x_146 = l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1;
+x_146 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_147 = lean_box(x_60);
 x_148 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_148, 0, x_146);
@@ -14416,7 +14336,7 @@ x_151 = lean_box(x_60);
 x_152 = lean_alloc_closure((void*)(l_Lean_Doc_Parser_lookaheadOrderedListIndicator___lam__1___boxed), 3, 1);
 lean_closure_set(x_152, 0, x_151);
 x_153 = l_Lean_Parser_ParserState_next_x27___redArg(x_20, x_3, x_23);
-x_154 = l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1;
+x_154 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_155 = lean_box(x_60);
 x_156 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_156, 0, x_154);
@@ -14759,7 +14679,7 @@ x_231 = lean_box(x_170);
 x_232 = lean_alloc_closure((void*)(l_Lean_Doc_Parser_lookaheadOrderedListIndicator___lam__1___boxed), 3, 1);
 lean_closure_set(x_232, 0, x_231);
 x_233 = l_Lean_Parser_ParserState_next_x27___redArg(x_20, x_3, x_23);
-x_234 = l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1;
+x_234 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_235 = lean_box(x_170);
 x_236 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_236, 0, x_234);
@@ -14785,7 +14705,7 @@ x_239 = lean_box(x_170);
 x_240 = lean_alloc_closure((void*)(l_Lean_Doc_Parser_lookaheadOrderedListIndicator___lam__1___boxed), 3, 1);
 lean_closure_set(x_240, 0, x_239);
 x_241 = l_Lean_Parser_ParserState_next_x27___redArg(x_20, x_3, x_23);
-x_242 = l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1;
+x_242 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_243 = lean_box(x_170);
 x_244 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_244, 0, x_242);
@@ -15027,15 +14947,6 @@ goto block_202;
 }
 }
 }
-static lean_object* _init_l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_lookaheadUnorderedListIndicator(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -15246,7 +15157,7 @@ else
 if (x_24 == 0)
 {
 lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___boxed__const__1;
+x_33 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_34 = lean_box(x_24);
 x_35 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_35, 0, x_33);
@@ -15377,40 +15288,22 @@ x_6 = lean_box(x_5);
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0___boxed__const__1;
+x_1 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__2___boxed), 2, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 0;
-x_2 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1___boxed__const__1;
+x_2 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_3 = lean_box(x_1);
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_4, 0, x_2);
@@ -16212,26 +16105,17 @@ lean_closure_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 58;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 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; 
 x_6 = ((lean_object*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_strFn___closed__0));
-x_7 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1;
+x_7 = l_Lean_Doc_Parser_blockOpener___lam__4___closed__3___boxed__const__1;
 x_8 = l_List_replicateTR___redArg(x_3, x_7);
 x_9 = lean_string_mk(x_8);
 x_10 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_eatSpaces___boxed), 2, 0);
 x_11 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__1;
-x_12 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1;
+x_12 = l_Lean_Doc_Parser_blockOpener___lam__4___closed__3___boxed__const__1;
 lean_inc_ref(x_9);
 x_13 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___lam__0___boxed), 6, 4);
 lean_closure_set(x_13, 0, x_9);
@@ -16868,20 +16752,11 @@ lean_dec_ref(x_3);
 return x_10;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 96;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0___boxed__const__1;
+x_1 = l_Lean_Doc_Parser_blockOpener___lam__3___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipChFn___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -17200,20 +17075,11 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2(uint8_t x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_4 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed__const__1;
+x_4 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_5 = lean_box(x_1);
 x_6 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_6, 0, x_4);
@@ -18206,20 +18072,11 @@ x_8 = l_Lean_Parser_andthenFn(x_7, x_2, x_3, x_4);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_Doc_Parser_header___lam__9___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 32;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Doc_Parser_header___lam__9___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Doc_Parser_header___lam__9___closed__0___boxed__const__1;
+x_1 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_linebreak___lam__3___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipChFn___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -18794,15 +18651,6 @@ x_5 = l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_withFence(x
 return x_5;
 }
 }
-static lean_object* _init_l_Lean_Doc_Parser_directive___lam__1___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 58;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Doc_Parser_directive___lam__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:
 {
@@ -18844,7 +18692,7 @@ if (x_13 == 0)
 {
 lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_14 = ((lean_object*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__2));
-x_15 = l_Lean_Doc_Parser_directive___lam__1___boxed__const__1;
+x_15 = l_Lean_Doc_Parser_blockOpener___lam__4___closed__3___boxed__const__1;
 x_16 = l_List_replicateTR___redArg(x_2, x_15);
 x_17 = lean_string_mk(x_16);
 x_18 = lean_string_append(x_14, x_17);
@@ -18890,20 +18738,11 @@ lean_dec(x_4);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_Doc_Parser_directive___lam__9___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 58;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Doc_Parser_directive___lam__9___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Doc_Parser_directive___lam__9___closed__0___boxed__const__1;
+x_1 = l_Lean_Doc_Parser_blockOpener___lam__4___closed__3___boxed__const__1;
 x_2 = lean_alloc_closure((void*)(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipChFn___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -19078,21 +18917,12 @@ x_6 = l_Lean_Parser_orelseFn(x_5, x_2, x_3, x_4);
 return x_6;
 }
 }
-static lean_object* _init_l_Lean_Doc_Parser_blockquote___lam__3___closed__0___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 62;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_Doc_Parser_blockquote___lam__3___closed__0() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 0;
-x_2 = l_Lean_Doc_Parser_blockquote___lam__3___closed__0___boxed__const__1;
+x_2 = l_Lean_Doc_Parser_blockOpener___lam__0___boxed__const__1;
 x_3 = lean_box(x_1);
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_chFn___boxed), 4, 2);
 lean_closure_set(x_4, 0, x_2);
@@ -21062,8 +20892,6 @@ l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___cl
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__2);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__3 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__3();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__3);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__4);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__5 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipBlock_nonEmptyLine___closed__5();
@@ -21132,14 +20960,10 @@ l_Lean_Doc_Parser_image___closed__1 = _init_l_Lean_Doc_Parser_image___closed__1(
 lean_mark_persistent(l_Lean_Doc_Parser_image___closed__1);
 l_Lean_Doc_Parser_image___closed__6 = _init_l_Lean_Doc_Parser_image___closed__6();
 lean_mark_persistent(l_Lean_Doc_Parser_image___closed__6);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_closer___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn___redArg___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn___redArg___closed__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn___redArg___closed__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn___redArg___closed__3 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn___redArg___closed__3();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_normFn___redArg___closed__3);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_codeContentsFn___lam__0___closed__0);
 l_Lean_Doc_Parser_code___lam__3___closed__0 = _init_l_Lean_Doc_Parser_code___lam__3___closed__0();
@@ -21158,8 +20982,6 @@ l_Lean_Doc_Parser_text___closed__2 = _init_l_Lean_Doc_Parser_text___closed__2();
 lean_mark_persistent(l_Lean_Doc_Parser_text___closed__2);
 l_Lean_Doc_Parser_text___closed__3 = _init_l_Lean_Doc_Parser_text___closed__3();
 lean_mark_persistent(l_Lean_Doc_Parser_text___closed__3);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__4___boxed__const__1);
 l_Lean_Doc_Parser_delimitedInline___lam__5___closed__1 = _init_l_Lean_Doc_Parser_delimitedInline___lam__5___closed__1();
 lean_mark_persistent(l_Lean_Doc_Parser_delimitedInline___lam__5___closed__1);
 l_Lean_Doc_Parser_link___lam__0___closed__0___boxed__const__1 = _init_l_Lean_Doc_Parser_link___lam__0___closed__0___boxed__const__1();
@@ -21180,14 +21002,10 @@ l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__10___closed
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__10___closed__0);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__10___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__10___closed__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_emphLike___lam__10___closed__1);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeBackticksFn___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0___boxed__const__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__0);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_code_takeContentsFn___closed__1);
 l_Lean_Doc_Parser_metadataContents_parenthesizer___closed__2 = _init_l_Lean_Doc_Parser_metadataContents_parenthesizer___closed__2();
@@ -21254,16 +21072,8 @@ l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_metadataBlock_opener___clos
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_metadataBlock_opener___closed__3);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_metadataBlock_closer___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_metadataBlock_closer___closed__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_metadataBlock_closer___closed__1);
-l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1 = _init_l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1();
-lean_mark_persistent(l_Lean_Doc_Parser_lookaheadOrderedListIndicator___boxed__const__1);
-l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___boxed__const__1 = _init_l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___boxed__const__1();
-lean_mark_persistent(l_Lean_Doc_Parser_lookaheadUnorderedListIndicator___boxed__const__1);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__0);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_skipUntilDedent___lam__5___closed__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_blockSep___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_blockSep___closed__1();
@@ -21278,16 +21088,10 @@ l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_withFencePos___la
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_withFencePos___lam__0___closed__3);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__1();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___closed__1);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_directive_closeFence___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_withIndentColumn___closed__2 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_withIndentColumn___closed__2();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_withIndentColumn___closed__2);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_codeBlock_codeFrom___lam__1___closed__0);
-l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed__const__1 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed__const__1();
-lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__2___boxed__const__1);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__0___closed__0 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__0___closed__0();
 lean_mark_persistent(l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_descItem_colonFn___lam__0___closed__0);
 l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_listItem_bulletFn___lam__3___closed__0 = _init_l___private_Lean_DocString_Parser_0__Lean_Doc_Parser_listItem_bulletFn___lam__3___closed__0();
@@ -21306,8 +21110,6 @@ l_Lean_Doc_Parser_codeBlock___lam__6___closed__0 = _init_l_Lean_Doc_Parser_codeB
 lean_mark_persistent(l_Lean_Doc_Parser_codeBlock___lam__6___closed__0);
 l_Lean_Doc_Parser_header___lam__2___closed__0 = _init_l_Lean_Doc_Parser_header___lam__2___closed__0();
 lean_mark_persistent(l_Lean_Doc_Parser_header___lam__2___closed__0);
-l_Lean_Doc_Parser_header___lam__9___closed__0___boxed__const__1 = _init_l_Lean_Doc_Parser_header___lam__9___closed__0___boxed__const__1();
-lean_mark_persistent(l_Lean_Doc_Parser_header___lam__9___closed__0___boxed__const__1);
 l_Lean_Doc_Parser_header___lam__9___closed__0 = _init_l_Lean_Doc_Parser_header___lam__9___closed__0();
 lean_mark_persistent(l_Lean_Doc_Parser_header___lam__9___closed__0);
 l_Lean_Doc_Parser_header___lam__8___closed__0___boxed__const__1 = _init_l_Lean_Doc_Parser_header___lam__8___closed__0___boxed__const__1();
@@ -21330,10 +21132,6 @@ l_Lean_Doc_Parser_definitionList___lam__3___closed__3 = _init_l_Lean_Doc_Parser_
 lean_mark_persistent(l_Lean_Doc_Parser_definitionList___lam__3___closed__3);
 l_Lean_Doc_Parser_directive___lam__3___closed__0 = _init_l_Lean_Doc_Parser_directive___lam__3___closed__0();
 lean_mark_persistent(l_Lean_Doc_Parser_directive___lam__3___closed__0);
-l_Lean_Doc_Parser_directive___lam__1___boxed__const__1 = _init_l_Lean_Doc_Parser_directive___lam__1___boxed__const__1();
-lean_mark_persistent(l_Lean_Doc_Parser_directive___lam__1___boxed__const__1);
-l_Lean_Doc_Parser_directive___lam__9___closed__0___boxed__const__1 = _init_l_Lean_Doc_Parser_directive___lam__9___closed__0___boxed__const__1();
-lean_mark_persistent(l_Lean_Doc_Parser_directive___lam__9___closed__0___boxed__const__1);
 l_Lean_Doc_Parser_directive___lam__9___closed__0 = _init_l_Lean_Doc_Parser_directive___lam__9___closed__0();
 lean_mark_persistent(l_Lean_Doc_Parser_directive___lam__9___closed__0);
 l_Lean_Doc_Parser_directive___lam__9___closed__1 = _init_l_Lean_Doc_Parser_directive___lam__9___closed__1();
@@ -21348,8 +21146,6 @@ l_Lean_Doc_Parser_directive___lam__10___closed__3 = _init_l_Lean_Doc_Parser_dire
 lean_mark_persistent(l_Lean_Doc_Parser_directive___lam__10___closed__3);
 l_Lean_Doc_Parser_directive___lam__10___closed__4 = _init_l_Lean_Doc_Parser_directive___lam__10___closed__4();
 lean_mark_persistent(l_Lean_Doc_Parser_directive___lam__10___closed__4);
-l_Lean_Doc_Parser_blockquote___lam__3___closed__0___boxed__const__1 = _init_l_Lean_Doc_Parser_blockquote___lam__3___closed__0___boxed__const__1();
-lean_mark_persistent(l_Lean_Doc_Parser_blockquote___lam__3___closed__0___boxed__const__1);
 l_Lean_Doc_Parser_blockquote___lam__3___closed__0 = _init_l_Lean_Doc_Parser_blockquote___lam__3___closed__0();
 lean_mark_persistent(l_Lean_Doc_Parser_blockquote___lam__3___closed__0);
 l_Lean_Doc_Parser_directive___closed__4 = _init_l_Lean_Doc_Parser_directive___closed__4();
diff --git a/stage0/stdlib/Lean/DocString/Types.c b/stage0/stdlib/Lean/DocString/Types.c
index f341a8ebad..c0e4bc6b81 100644
--- a/stage0/stdlib/Lean/DocString/Types.c
+++ b/stage0/stdlib/Lean/DocString/Types.c
@@ -229,9 +229,9 @@ static const lean_object* l_Lean_Doc_instReprInline_repr___redArg___closed__31 =
 static const lean_ctor_object l_Lean_Doc_instReprInline_repr___redArg___closed__32_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 5}, .m_objs = {((lean_object*)&l_Lean_Doc_instReprInline_repr___redArg___closed__31_value),((lean_object*)(((size_t)(1) << 1) | 1))}};
 static const lean_object* l_Lean_Doc_instReprInline_repr___redArg___closed__32 = (const lean_object*)&l_Lean_Doc_instReprInline_repr___redArg___closed__32_value;
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___redArg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_quote(lean_object*);
 lean_object* l_Array_repr___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline___redArg(lean_object*);
@@ -430,8 +430,8 @@ static const lean_object* l_Lean_Doc_instReprBlock_repr___redArg___closed__23 =
 static const lean_ctor_object l_Lean_Doc_instReprBlock_repr___redArg___closed__24_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 5}, .m_objs = {((lean_object*)&l_Lean_Doc_instReprBlock_repr___redArg___closed__23_value),((lean_object*)(((size_t)(1) << 1) | 1))}};
 static const lean_object* l_Lean_Doc_instReprBlock_repr___redArg___closed__24 = (const lean_object*)&l_Lean_Doc_instReprBlock_repr___redArg___closed__24_value;
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Int_repr(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock___redArg(lean_object*, lean_object*);
@@ -489,8 +489,8 @@ static const lean_object* l_Lean_Doc_instReprPart_repr___redArg___closed__13 = (
 static const lean_ctor_object l_Lean_Doc_instReprPart_repr___redArg___closed__14_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 0, .m_other = 1, .m_tag = 3}, .m_objs = {((lean_object*)&l_Lean_Doc_instReprPart_repr___redArg___closed__13_value)}};
 static const lean_object* l_Lean_Doc_instReprPart_repr___redArg___closed__14 = (const lean_object*)&l_Lean_Doc_instReprPart_repr___redArg___closed__14_value;
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Option_repr___redArg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart___redArg(lean_object*, lean_object*, lean_object*);
@@ -2582,21 +2582,12 @@ lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Doc_instReprInline_repr___redArg(x_1, x_2, x_3);
-lean_dec(x_3);
-return x_4;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
 lean_inc_ref(x_1);
-x_4 = lean_alloc_closure((void*)(l_Lean_Doc_instReprInline_repr___redArg___boxed), 3, 1);
+x_4 = lean_alloc_closure((void*)(l_Lean_Doc_instReprInline_repr___redArg), 3, 1);
 lean_closure_set(x_4, 0, x_1);
 switch (lean_obj_tag(x_2)) {
 case 0:
@@ -3226,6 +3217,15 @@ return x_196;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Doc_instReprInline_repr___redArg(x_1, x_2, x_3);
+lean_dec(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprInline_repr(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -5734,22 +5734,13 @@ x_2 = lean_nat_to_int(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Doc_instReprBlock_repr___redArg(x_1, x_2, x_3, x_4);
-lean_dec(x_4);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_5 = lean_alloc_closure((void*)(l_Lean_Doc_instReprBlock_repr___redArg___boxed), 4, 2);
+x_5 = lean_alloc_closure((void*)(l_Lean_Doc_instReprBlock_repr___redArg), 4, 2);
 lean_closure_set(x_5, 0, x_1);
 lean_closure_set(x_5, 1, x_2);
 x_6 = lean_alloc_closure((void*)(l_Lean_Doc_instReprInline_repr___boxed), 4, 2);
@@ -6210,6 +6201,15 @@ return x_142;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Lean_Doc_instReprBlock_repr___redArg(x_1, x_2, x_3, x_4);
+lean_dec(x_4);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprBlock_repr(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:
 {
@@ -6876,15 +6876,6 @@ x_2 = lean_nat_to_int(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-lean_object* x_6; 
-x_6 = l_Lean_Doc_instReprPart_repr___redArg(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_5);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -6903,7 +6894,7 @@ lean_dec_ref(x_4);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_11 = lean_alloc_closure((void*)(l_Lean_Doc_instReprPart_repr___redArg___boxed), 5, 3);
+x_11 = lean_alloc_closure((void*)(l_Lean_Doc_instReprPart_repr___redArg), 5, 3);
 lean_closure_set(x_11, 0, x_1);
 lean_closure_set(x_11, 1, x_2);
 lean_closure_set(x_11, 2, x_3);
@@ -7048,6 +7039,15 @@ lean_ctor_set_uint8(x_71, sizeof(void*)*1, x_18);
 return x_71;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Lean_Doc_instReprPart_repr___redArg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Doc_instReprPart_repr(lean_object* x_1, lean_object* x_2, 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:
 {
diff --git a/stage0/stdlib/Lean/Elab/Coinductive.c b/stage0/stdlib/Lean/Elab/Coinductive.c
index 2de63b261a..1630708917 100644
--- a/stage0/stdlib/Lean/Elab/Coinductive.c
+++ b/stage0/stdlib/Lean/Elab/Coinductive.c
@@ -583,7 +583,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_m
 static const lean_string_object l_Lean_Elab_Command_elabCoinductive___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 14, .m_capacity = 14, .m_length = 13, .m_data = "Elaborating: "};
 static const lean_object* l_Lean_Elab_Command_elabCoinductive___closed__0 = (const lean_object*)&l_Lean_Elab_Command_elabCoinductive___closed__0_value;
 static lean_object* l_Lean_Elab_Command_elabCoinductive___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabCoinductive___boxed__const__1;
 lean_object* l_Lean_Meta_getLocalInstances___redArg(lean_object*);
 lean_object* l_Lean_Elab_partialFixpoint(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_to_list(lean_object*);
@@ -10975,15 +10974,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabCoinductive___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabCoinductive(lean_object* x_1, 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:
 {
@@ -11100,7 +11090,7 @@ lean_inc(x_33);
 lean_inc(x_37);
 x_39 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabCoinductive_spec__3(x_37, x_38, x_22, x_33);
 x_40 = lean_box_usize(x_31);
-x_41 = l_Lean_Elab_Command_elabCoinductive___boxed__const__1;
+x_41 = l___private_Lean_Elab_Coinductive_0__Lean_Elab_Command_generateCoinductiveConstructor___boxed__const__1;
 lean_inc(x_24);
 x_42 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabCoinductive___lam__0___boxed), 14, 5);
 lean_closure_set(x_42, 0, x_37);
@@ -11510,8 +11500,6 @@ l_Array_mapFinIdxM_map___at___00Lean_Elab_Command_elabCoinductive_spec__5___redA
 lean_mark_persistent(l_Array_mapFinIdxM_map___at___00Lean_Elab_Command_elabCoinductive_spec__5___redArg___closed__0);
 l_Lean_Elab_Command_elabCoinductive___closed__1 = _init_l_Lean_Elab_Command_elabCoinductive___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_elabCoinductive___closed__1);
-l_Lean_Elab_Command_elabCoinductive___boxed__const__1 = _init_l_Lean_Elab_Command_elabCoinductive___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_Command_elabCoinductive___boxed__const__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Elab/ComputedFields.c b/stage0/stdlib/Lean/Elab/ComputedFields.c
index 48766ea771..f4eeab40d8 100644
--- a/stage0/stdlib/Lean/Elab/ComputedFields.c
+++ b/stage0/stdlib/Lean/Elab/ComputedFields.c
@@ -393,7 +393,6 @@ lean_object* lean_array_fget(lean_object*, lean_object*);
 uint8_t l_Lean_isExtern(lean_object*, lean_object*);
 lean_object* l_Lean_compileDecls(lean_object*, uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___boxed(lean_object**);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_Elab_ComputedFields_overrideComputedFields___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -11154,15 +11153,6 @@ lean_dec_ref(x_11);
 return x_23;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, size_t x_12, size_t x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19) {
 _start:
 {
@@ -11256,7 +11246,7 @@ x_46 = lean_array_size(x_45);
 x_47 = 0;
 x_48 = lean_box(x_44);
 x_49 = lean_box_usize(x_46);
-x_50 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1;
+x_50 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___boxed__const__1;
 lean_inc(x_41);
 lean_inc_ref(x_3);
 lean_inc(x_40);
@@ -11939,7 +11929,7 @@ x_143 = lean_array_size(x_142);
 x_144 = 0;
 x_145 = lean_box(x_141);
 x_146 = lean_box_usize(x_143);
-x_147 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1;
+x_147 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___boxed__const__1;
 lean_inc(x_137);
 lean_inc_ref(x_3);
 lean_inc(x_136);
@@ -15834,8 +15824,6 @@ l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__priva
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___closed__0);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___boxed__const__1();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2_spec__2___boxed__const__1);
-l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_overrideComputedFields_spec__2___boxed__const__1);
 l_Lean_Elab_ComputedFields_mkComputedFieldOverrides___closed__1 = _init_l_Lean_Elab_ComputedFields_mkComputedFieldOverrides___closed__1();
 lean_mark_persistent(l_Lean_Elab_ComputedFields_mkComputedFieldOverrides___closed__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_setComputedFields_spec__3___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_ComputedFields_setComputedFields_spec__3___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/DocString.c b/stage0/stdlib/Lean/Elab/DocString.c
index b6d8efa71b..686b310e8f 100644
--- a/stage0/stdlib/Lean/Elab/DocString.c
+++ b/stage0/stdlib/Lean/Elab/DocString.c
@@ -2759,7 +2759,6 @@ static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Un
 static lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__4;
 static const lean_string_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__5_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "#"};
 static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__5 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__5_value;
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2(lean_object*, size_t, size_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_VersoModuleDocs_Snippet_addBlock(lean_object*, lean_object*);
 lean_object* l_Lean_VersoModuleDocs_Snippet_addPart(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -67946,15 +67945,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
@@ -68061,7 +68051,7 @@ x_41 = l_Lean_Syntax_getArgs(x_40);
 lean_dec(x_40);
 x_42 = lean_array_size(x_41);
 x_43 = lean_box_usize(x_42);
-x_44 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1;
+x_44 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabBlocks_x27_spec__2___boxed__const__1;
 x_45 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Doc_elabInline_spec__8___boxed), 13, 3);
 lean_closure_set(x_45, 0, x_43);
 lean_closure_set(x_45, 1, x_44);
@@ -68455,7 +68445,7 @@ x_122 = l_Lean_Syntax_getArgs(x_121);
 lean_dec(x_121);
 x_123 = lean_array_size(x_122);
 x_124 = lean_box_usize(x_123);
-x_125 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1;
+x_125 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabBlocks_x27_spec__2___boxed__const__1;
 x_126 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Doc_elabInline_spec__8___boxed), 13, 3);
 lean_closure_set(x_126, 0, x_124);
 lean_closure_set(x_126, 1, x_125);
@@ -76282,8 +76272,6 @@ l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__priva
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__2);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__4 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__4();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___closed__4);
-l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_DocString_0__Lean_Doc_elabModSnippet_x27_spec__2___boxed__const__1);
 l___private_Lean_Elab_DocString_0__Lean_Doc_fixupInline___closed__0 = _init_l___private_Lean_Elab_DocString_0__Lean_Doc_fixupInline___closed__0();
 lean_mark_persistent(l___private_Lean_Elab_DocString_0__Lean_Doc_fixupInline___closed__0);
 l___private_Lean_Elab_DocString_0__Lean_Doc_fixupInline___closed__3 = _init_l___private_Lean_Elab_DocString_0__Lean_Doc_fixupInline___closed__3();
diff --git a/stage0/stdlib/Lean/Elab/Match.c b/stage0/stdlib/Lean/Elab/Match.c
index c607779fc3..fe813d2714 100644
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
@@ -1303,7 +1303,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_m
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_Match_0__Lean_Elab_Term_generalize_spec__3___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_Match_0__Lean_Elab_Term_generalize_spec__7(lean_object*, uint8_t, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_Match_0__Lean_Elab_Term_generalize_spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
 lean_object* l_Lean_Meta_getFVarsToGeneralize(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isTypeCorrect(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -35877,15 +35876,6 @@ lean_dec_ref(x_1);
 return x_16;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -36009,7 +35999,7 @@ lean_inc(x_19);
 x_22 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear_spec__5(x_21, x_14, x_19);
 x_23 = lean_box(x_20);
 x_24 = lean_box(x_12);
-x_25 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
+x_25 = l_Lean_Elab_Term_ToDepElimPattern_main___redArg___boxed__const__1;
 lean_inc_ref(x_22);
 x_26 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lam__0___boxed), 14, 5);
 lean_closure_set(x_26, 0, x_22);
@@ -36340,7 +36330,7 @@ lean_inc(x_79);
 x_82 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_Match_0__Lean_Elab_Term_withToClear_spec__5(x_81, x_14, x_79);
 x_83 = lean_box(x_80);
 x_84 = lean_box(x_12);
-x_85 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1;
+x_85 = l_Lean_Elab_Term_ToDepElimPattern_main___redArg___boxed__const__1;
 lean_inc_ref(x_82);
 x_86 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lam__0___boxed), 14, 5);
 lean_closure_set(x_86, 0, x_82);
@@ -49930,8 +49920,6 @@ l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lam__1___closed
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___lam__1___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lam__0___closed__0 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lam__0___closed__0();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___lam__0___closed__0);
-l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_generalize___boxed__const__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__0 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__0();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__0);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/MutualDef.c b/stage0/stdlib/Lean/Elab/MutualDef.c
index 27d0218728..36b698176e 100644
--- a/stage0/stdlib/Lean/Elab/MutualDef.c
+++ b/stage0/stdlib/Lean/Elab/MutualDef.c
@@ -1584,7 +1584,6 @@ static lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesF
 static const lean_ctor_object l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*7 + 0, .m_other = 7, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(1) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(1) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1))}};
 static const lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__1 = (const lean_object*)&l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__1_value;
 static lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__2;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___boxed__const__1;
 uint8_t l_Lean_Elab_WhereFinallyView_isNone(lean_object*);
 uint8_t l_Array_isEmpty___redArg(lean_object*);
 lean_object* l_Lean_Elab_Term_withDeclName___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2281,7 +2280,6 @@ uint8_t l_List_elem___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__4(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__4___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__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_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_closure_object l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__0___boxed, .m_arity = 8, .m_num_fixed = 0, .m_objs = {} };
@@ -2448,7 +2446,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_a
 lean_object* l_Lean_Elab_Term_expandDeclId(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go_spec__3(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go_spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go(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_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go_spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2524,7 +2521,6 @@ static const lean_string_object l___private_Lean_Elab_MutualDef_0__Lean_Elab_Ter
 static const lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___closed__0 = (const lean_object*)&l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___closed__0_value;
 static const lean_ctor_object l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabFunValues_spec__9___closed__0_value),((lean_object*)&l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___closed__0_value),LEAN_SCALAR_PTR_LITERAL(17, 175, 179, 133, 51, 156, 235, 147)}};
 static const lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___closed__1 = (const lean_object*)&l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___closed__1_value;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1;
 extern lean_object* l_Lean_Elab_inServer;
 lean_object* l_Lean_Core_getMessageLog___redArg(lean_object*);
 lean_object* l_Lean_Language_SnapshotTask_finished___redArg(lean_object*, lean_object*);
@@ -41398,15 +41394,6 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -41484,7 +41471,7 @@ x_34 = lean_box(x_33);
 x_35 = lean_box(x_18);
 x_36 = lean_box(x_21);
 x_37 = lean_box(x_11);
-x_38 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___boxed__const__1;
+x_38 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___boxed__const__1;
 x_39 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___lam__3___boxed), 16, 9);
 lean_closure_set(x_39, 0, x_34);
 lean_closure_set(x_39, 1, x_35);
@@ -61828,15 +61815,6 @@ x_6 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__priva
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__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:
 {
@@ -61940,7 +61918,7 @@ x_24 = lean_array_size(x_1);
 x_25 = 0;
 lean_inc_ref(x_1);
 x_26 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__4(x_24, x_25, x_1);
-x_27 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1;
+x_27 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___boxed__const__1;
 lean_inc(x_14);
 x_28 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__2___boxed), 14, 7);
 lean_closure_set(x_28, 0, x_6);
@@ -61950,7 +61928,7 @@ lean_closure_set(x_28, 3, x_27);
 lean_closure_set(x_28, 4, x_3);
 lean_closure_set(x_28, 5, x_4);
 lean_closure_set(x_28, 6, x_26);
-x_29 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1;
+x_29 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___boxed__const__1;
 x_30 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__3___boxed), 12, 5);
 lean_closure_set(x_30, 0, x_28);
 lean_closure_set(x_30, 1, x_14);
@@ -69533,15 +69511,6 @@ x_13 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__priv
 return x_13;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -69589,7 +69558,7 @@ if (lean_obj_tag(x_22) == 0)
 lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
 lean_dec_ref(x_22);
 x_23 = l_Lean_Elab_instInhabitedDefViewElabHeader_default;
-x_24 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed__const__1;
+x_24 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___boxed__const__1;
 x_25 = lean_box_usize(x_11);
 lean_inc(x_18);
 lean_inc_ref(x_3);
@@ -71300,15 +71269,6 @@ x_8 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__priva
 return x_8;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -71379,7 +71339,7 @@ lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_31);
 x_39 = lean_box(x_12);
 x_40 = lean_box_usize(x_24);
-x_41 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1;
+x_41 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___boxed__const__1;
 lean_inc_ref(x_38);
 x_42 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___lam__0___boxed), 16, 8);
 lean_closure_set(x_42, 0, x_23);
@@ -71473,7 +71433,7 @@ lean_ctor_set(x_74, 0, x_73);
 lean_ctor_set(x_74, 1, x_67);
 x_75 = lean_box(x_12);
 x_76 = lean_box_usize(x_59);
-x_77 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1;
+x_77 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___boxed__const__1;
 lean_inc_ref(x_74);
 x_78 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___lam__0___boxed), 16, 8);
 lean_closure_set(x_78, 0, x_58);
@@ -71983,7 +71943,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Elab_Command_elabMutualDef_spec__2(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -79336,8 +79296,6 @@ l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___cl
 lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__0);
 l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__2 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___closed__2);
-l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___boxed__const__1 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_fillHolesFromWhereFinally___boxed__const__1);
 l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkInitialUsedFVarsMap___redArg___lam__9___closed__0 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkInitialUsedFVarsMap___redArg___lam__9___closed__0();
 lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkInitialUsedFVarsMap___redArg___lam__9___closed__0);
 l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkFreeVarMap___redArg___lam__3___closed__3 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkFreeVarMap___redArg___lam__3___closed__3();
@@ -79413,8 +79371,6 @@ l_Std_DHashMap_Internal_AssocList_Const_alter___at___00Std_DHashMap_Internal_Raw
 lean_mark_persistent(l_Std_DHashMap_Internal_AssocList_Const_alter___at___00Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__2_spec__2___lam__0___closed__0);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__17___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__17___closed__1();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab_spec__17___closed__1);
-l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_finishElab___lam__4___boxed__const__1);
 l_panic___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync_spec__0___closed__0 = _init_l_panic___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync_spec__0___closed__0();
 lean_mark_persistent(l_panic___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync_spec__0___closed__0);
 l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync___lam__3___closed__0 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync___lam__3___closed__0();
@@ -79433,8 +79389,6 @@ l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync___clos
 lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_elabAsync___closed__8);
 l_Lean_Elab_addDeclarationRangesForBuiltin___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go_spec__0___closed__1 = _init_l_Lean_Elab_addDeclarationRangesForBuiltin___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go_spec__0___closed__1();
 lean_mark_persistent(l_Lean_Elab_addDeclarationRangesForBuiltin___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go_spec__0___closed__1);
-l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed__const__1 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabMutualDef_go___boxed__const__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__3___redArg___closed__3 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__3___redArg___closed__3();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__3___redArg___closed__3);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__3___redArg___closed__4 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__3___redArg___closed__4();
@@ -79443,8 +79397,6 @@ l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lea
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__2___lam__1___closed__0);
 l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__2___lam__1___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__2___lam__1___closed__1();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask_spec__2___lam__1___closed__1);
-l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1 = _init_l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_logGoalsAccomplishedSnapshotTask___boxed__const__1);
 l_Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualDef_spec__4_spec__5_spec__7_spec__11___lam__1___closed__1 = _init_l_Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualDef_spec__4_spec__5_spec__7_spec__11___lam__1___closed__1();
 lean_mark_persistent(l_Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualDef_spec__4_spec__5_spec__7_spec__11___lam__1___closed__1);
 l_Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualDef_spec__4_spec__5_spec__7_spec__11___lam__1___closed__3 = _init_l_Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualDef_spec__4_spec__5_spec__7_spec__11___lam__1___closed__3();
diff --git a/stage0/stdlib/Lean/Elab/MutualInductive.c b/stage0/stdlib/Lean/Elab/MutualInductive.c
index 18b4e9b2e0..7068bc488f 100644
--- a/stage0/stdlib/Lean/Elab/MutualInductive.c
+++ b/stage0/stdlib/Lean/Elab/MutualInductive.c
@@ -1593,7 +1593,6 @@ static const lean_closure_object l_Lean_Elab_withSaveInfoContext___at___00__priv
 static const lean_object* l_Lean_Elab_withSaveInfoContext___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__3___redArg___closed__0 = (const lean_object*)&l_Lean_Elab_withSaveInfoContext___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__3___redArg___closed__0_value;
 LEAN_EXPORT lean_object* l_Lean_Elab_withSaveInfoContext___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__3___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_withSaveInfoContext___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__3___redArg___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_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_withSaveInfoContext___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1652,7 +1651,6 @@ static const lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Com
 static const lean_string_object l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 60, .m_capacity = 60, .m_length = 59, .m_data = "`coinductive` keyword can only be used to define predicates"};
 static const lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__1 = (const lean_object*)&l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__1_value;
 static lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__2;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg(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_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___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_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1753,7 +1751,6 @@ lean_object* l_Lean_Meta_mkSizeOfInstances(lean_object*, lean_object*, lean_obje
 lean_object* l_Lean_Meta_IndPredBelow_mkBelow(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___lam__1(lean_object*, uint8_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2084,14 +2081,12 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Uns
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing_spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__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_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__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_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing_spec__4(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing_spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__3(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2137,7 +2132,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabInductives___lam__2(lean_object
 LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabInductives___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Lean_Elab_Command_elabInductives_spec__3(lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Lean_Elab_Command_elabInductives_spec__3___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabInductives___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabInductives(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabInductives___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5(uint8_t, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -38018,15 +38012,6 @@ x_9 = l_Lean_Elab_withSaveInfoContext___at___00__private_Lean_Elab_MutualInducti
 return x_9;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews(lean_object* x_1, 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:
 {
@@ -38034,7 +38019,7 @@ lean_object* x_9; size_t x_10; lean_object* x_11; lean_object* x_12; lean_object
 x_9 = lean_box(0);
 x_10 = lean_array_size(x_1);
 x_11 = lean_box_usize(x_10);
-x_12 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed__const__1;
+x_12 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 x_13 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___lam__0___boxed), 11, 4);
 lean_closure_set(x_13, 0, x_1);
 lean_closure_set(x_13, 1, x_11);
@@ -40759,15 +40744,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -40817,7 +40793,7 @@ x_33 = lean_ctor_get_uint8(x_30, sizeof(void*)*3 + 4);
 lean_dec_ref(x_30);
 x_34 = lean_box(x_33);
 x_35 = lean_box(x_21);
-x_36 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___boxed__const__1;
+x_36 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 lean_inc(x_31);
 lean_inc_ref(x_4);
 x_37 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___boxed), 22, 13);
@@ -43441,15 +43417,6 @@ lean_dec_ref(x_1);
 return x_17;
 }
 }
-static lean_object* _init_l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
@@ -43506,7 +43473,7 @@ lean_inc_ref(x_2);
 x_51 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__0(x_48, x_50, x_2);
 x_52 = lean_box(x_46);
 x_53 = lean_box_usize(x_48);
-x_54 = l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1;
+x_54 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 lean_inc_ref(x_2);
 x_55 = lean_alloc_closure((void*)(l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___lam__1___boxed), 13, 6);
 lean_closure_set(x_55, 0, x_51);
@@ -43722,7 +43689,7 @@ lean_inc_ref(x_2);
 x_97 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__0(x_94, x_96, x_2);
 x_98 = lean_box(x_92);
 x_99 = lean_box_usize(x_94);
-x_100 = l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1;
+x_100 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 lean_inc_ref(x_2);
 x_101 = lean_alloc_closure((void*)(l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___lam__1___boxed), 13, 6);
 lean_closure_set(x_101, 0, x_97);
@@ -43978,7 +43945,7 @@ lean_inc_ref(x_2);
 x_157 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__0(x_154, x_156, x_2);
 x_158 = lean_box(x_152);
 x_159 = lean_box_usize(x_154);
-x_160 = l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1;
+x_160 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 lean_inc_ref(x_2);
 x_161 = lean_alloc_closure((void*)(l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___lam__1___boxed), 13, 6);
 lean_closure_set(x_161, 0, x_157);
@@ -54293,15 +54260,6 @@ lean_dec(x_1);
 return x_15;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__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) {
 _start:
 {
@@ -54309,7 +54267,7 @@ lean_object* x_12; size_t x_13; lean_object* x_14; lean_object* x_15; lean_objec
 x_12 = lean_box(0);
 x_13 = lean_array_size(x_1);
 x_14 = lean_box_usize(x_13);
-x_15 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2___boxed__const__1;
+x_15 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 x_16 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__1___boxed), 12, 5);
 lean_closure_set(x_16, 0, x_2);
 lean_closure_set(x_16, 1, x_1);
@@ -54631,15 +54589,6 @@ lean_dec(x_1);
 return x_15;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__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) {
 _start:
 {
@@ -54647,7 +54596,7 @@ lean_object* x_12; size_t x_13; lean_object* x_14; lean_object* x_15; lean_objec
 x_12 = lean_box(0);
 x_13 = lean_array_size(x_1);
 x_14 = lean_box_usize(x_13);
-x_15 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed__const__1;
+x_15 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 x_16 = lean_alloc_closure((void*)(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__3___boxed), 12, 5);
 lean_closure_set(x_16, 0, x_2);
 lean_closure_set(x_16, 1, x_1);
@@ -55988,15 +55937,6 @@ x_7 = lean_box(x_6);
 return x_7;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabInductives___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Command_elabInductives(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -56041,7 +55981,7 @@ else
 {
 lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_27 = lean_box(x_26);
-x_28 = l_Lean_Elab_Command_elabInductives___boxed__const__1;
+x_28 = l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_fixedIndicesToParams___boxed__const__1;
 lean_inc(x_7);
 x_29 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabInductives___lam__2___boxed), 12, 4);
 lean_closure_set(x_29, 0, x_7);
@@ -61225,20 +61165,14 @@ l_Lean_mkUnknownIdentifierMessageCore___at___00Lean_mkUnknownIdentifierMessage__
 lean_mark_persistent(l_Lean_mkUnknownIdentifierMessageCore___at___00Lean_mkUnknownIdentifierMessage___at___00Lean_throwUnknownIdentifierAt___at___00Lean_throwUnknownConstantAt___at___00Lean_throwUnknownConstant___at___00Lean_getConstVal___at___00Lean_mkConstWithLevelParams___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__0_spec__0_spec__1_spec__5_spec__10_spec__12_spec__15___redArg___closed__20);
 l_Lean_throwUnknownConstantAt___at___00Lean_throwUnknownConstant___at___00Lean_getConstVal___at___00Lean_mkConstWithLevelParams___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__0_spec__0_spec__1_spec__5___redArg___closed__1 = _init_l_Lean_throwUnknownConstantAt___at___00Lean_throwUnknownConstant___at___00Lean_getConstVal___at___00Lean_mkConstWithLevelParams___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__0_spec__0_spec__1_spec__5___redArg___closed__1();
 lean_mark_persistent(l_Lean_throwUnknownConstantAt___at___00Lean_throwUnknownConstant___at___00Lean_getConstVal___at___00Lean_mkConstWithLevelParams___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews_spec__0_spec__0_spec__1_spec__5___redArg___closed__1);
-l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed__const__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_addTermInfoViews___boxed__const__1);
 l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___closed__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___closed__1);
 l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___closed__3 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___closed__3();
 lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___lam__2___closed__3);
 l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__2 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___closed__2);
-l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___boxed__const__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore___redArg___boxed__const__1);
 l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_withElaboratedHeaders___redArg___lam__0___closed__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_withElaboratedHeaders___redArg___lam__0___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_withElaboratedHeaders___redArg___lam__0___closed__1);
-l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1 = _init_l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1();
-lean_mark_persistent(l_Lean_withExporting___at___00Lean_withoutExporting___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_mkInductiveDeclCore_spec__2_spec__2___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViews_spec__5___boxed__const__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_checkNoInductiveNameConflicts_spec__3_spec__8___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_checkNoInductiveNameConflicts_spec__3_spec__8___closed__1();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_checkNoInductiveNameConflicts_spec__3_spec__8___closed__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_checkNoInductiveNameConflicts_spec__3_spec__8___closed__3 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_checkNoInductiveNameConflicts_spec__3_spec__8___closed__3();
@@ -61257,10 +61191,6 @@ l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_applyComputedFields__
 lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_applyComputedFields___closed__0);
 l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_applyComputedFields___closed__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_applyComputedFields___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_applyComputedFields___closed__1);
-l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2___boxed__const__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__2___boxed__const__1);
-l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed__const__1 = _init_l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_MutualInductive_0__Lean_Elab_Command_elabInductiveViewsPostprocessing___lam__4___boxed__const__1);
 l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__0 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__0();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__0);
 l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__1();
@@ -61277,8 +61207,6 @@ l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Com
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__6);
 l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__7 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__7();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Command_elabInductives_spec__5___redArg___closed__7);
-l_Lean_Elab_Command_elabInductives___boxed__const__1 = _init_l_Lean_Elab_Command_elabInductives___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_Command_elabInductives___boxed__const__1);
 l_Lean_Elab_Command_elabInductive___closed__0 = _init_l_Lean_Elab_Command_elabInductive___closed__0();
 lean_mark_persistent(l_Lean_Elab_Command_elabInductive___closed__0);
 l___private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualInductive_spec__0_spec__0_spec__1_spec__7_spec__12_spec__20___closed__2 = _init_l___private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00Lean_Elab_elabAttr___at___00Lean_Elab_elabAttrs___at___00Lean_Elab_elabDeclAttrs___at___00Lean_Elab_elabModifiers___at___00Lean_Elab_Command_elabMutualInductive_spec__0_spec__0_spec__1_spec__7_spec__12_spec__20___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/PreDefinition/PartialFixpoint/Induction.c b/stage0/stdlib/Lean/Elab/PreDefinition/PartialFixpoint/Induction.c
index eb5f8922be..f7dc77f3c1 100644
--- a/stage0/stdlib/Lean/Elab/PreDefinition/PartialFixpoint/Induction.c
+++ b/stage0/stdlib/Lean/Elab/PreDefinition/PartialFixpoint/Induction.c
@@ -610,7 +610,6 @@ static lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Inductio
 static const lean_string_object l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__6_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 36, .m_capacity = 36, .m_length = 35, .m_data = " is not defined by partial_fixpoint"};
 static const lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__6 = (const lean_object*)&l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__6_value;
 static lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__7;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___boxed__const__1;
 lean_object* l_Lean_Meta_elimOptParam(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_collectLevelParams(lean_object*, lean_object*);
 lean_object* l_Lean_addDecl(lean_object*, uint8_t, lean_object*, lean_object*);
@@ -851,7 +850,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLoca
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__0(lean_object*, lean_object*, lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__0___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_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1;
 lean_object* l_Lean_Core_betaReduce(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__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*);
@@ -13628,15 +13626,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, uint8_t x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
@@ -13700,7 +13689,7 @@ if (lean_is_exclusive(x_33)) {
  x_36 = lean_box(0);
 }
 x_37 = lean_array_get(x_4, x_30, x_31);
-x_38 = l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___boxed__const__1;
+x_38 = l_Array_mapFinIdxM_map___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__19___redArg___boxed__const__1;
 x_39 = lean_box(x_8);
 lean_inc_ref(x_7);
 lean_inc_ref(x_6);
@@ -19782,15 +19771,6 @@ lean_dec_ref(x_1);
 return x_14;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
@@ -19851,7 +19831,7 @@ x_33 = lean_ctor_get(x_31, 1);
 x_34 = lean_ctor_get(x_31, 2);
 x_35 = lean_ctor_get(x_31, 0);
 lean_dec(x_35);
-x_36 = l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1;
+x_36 = l_Array_mapFinIdxM_map___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__19___redArg___boxed__const__1;
 lean_inc_ref(x_28);
 x_37 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__0___boxed), 12, 6);
 lean_closure_set(x_37, 0, x_27);
@@ -20076,7 +20056,7 @@ x_78 = lean_ctor_get(x_31, 2);
 lean_inc(x_78);
 lean_inc(x_77);
 lean_dec(x_31);
-x_79 = l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1;
+x_79 = l_Array_mapFinIdxM_map___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__19___redArg___boxed__const__1;
 lean_inc_ref(x_28);
 x_80 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__0___boxed), 12, 6);
 lean_closure_set(x_80, 0, x_27);
@@ -20350,7 +20330,7 @@ if (lean_is_exclusive(x_126)) {
  lean_dec_ref(x_126);
  x_129 = lean_box(0);
 }
-x_130 = l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1;
+x_130 = l_Array_mapFinIdxM_map___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__19___redArg___boxed__const__1;
 lean_inc_ref(x_123);
 x_131 = lean_alloc_closure((void*)(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__0___boxed), 12, 6);
 lean_closure_set(x_131, 0, x_122);
@@ -21259,8 +21239,6 @@ l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_Parti
 lean_mark_persistent(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__5);
 l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__7 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__7();
 lean_mark_persistent(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___closed__7);
-l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___boxed__const__1 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__11___boxed__const__1);
 l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__13___closed__1 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__13___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__13___closed__1);
 l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__13___closed__2 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction___lam__13___closed__2();
@@ -21306,8 +21284,6 @@ l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lea
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness_spec__3___lam__1___closed__1);
 l___private_Lean_Meta_Basic_0__Lean_Meta_withLocalDecls_loop___at___00Lean_Meta_withLocalDecls___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11_spec__16_spec__35___at___00Lean_Meta_withLocalDecls___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11_spec__16___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness_spec__5_spec__5_spec__6___closed__1 = _init_l___private_Lean_Meta_Basic_0__Lean_Meta_withLocalDecls_loop___at___00Lean_Meta_withLocalDecls___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11_spec__16_spec__35___at___00Lean_Meta_withLocalDecls___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11_spec__16___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness_spec__5_spec__5_spec__6___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Basic_0__Lean_Meta_withLocalDecls_loop___at___00Lean_Meta_withLocalDecls___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11_spec__16_spec__35___at___00Lean_Meta_withLocalDecls___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11_spec__16___at___00Lean_Meta_withLocalDeclsD___at___00Lean_Meta_withLocalDeclsDND___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_deriveInduction_spec__8_spec__11___at___00__private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness_spec__5_spec__5_spec__6___closed__1);
-l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__1___boxed__const__1);
 l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__3___closed__1 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__3___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__3___closed__1);
 l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__3___closed__2 = _init_l___private_Lean_Elab_PreDefinition_PartialFixpoint_Induction_0__Lean_Elab_PartialFixpoint_derivePartialCorrectness___lam__3___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/PreDefinition/WF/GuessLex.c b/stage0/stdlib/Lean/Elab/PreDefinition/WF/GuessLex.c
index 2297494e7e..f4253eb254 100644
--- a/stage0/stdlib/Lean/Elab/PreDefinition/WF/GuessLex.c
+++ b/stage0/stdlib/Lean/Elab/PreDefinition/WF/GuessLex.c
@@ -1120,7 +1120,6 @@ static const lean_string_object l_Lean_Elab_WF_GuessLex_explainNonMutualFailure_
 static const lean_object* l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__1 = (const lean_object*)&l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__1_value;
 static const lean_ctor_object l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 0, .m_other = 1, .m_tag = 3}, .m_objs = {((lean_object*)&l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__1_value)}};
 static const lean_object* l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__2 = (const lean_object*)&l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__2_value;
-LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed__const__1;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainNonMutualFailure(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1160,7 +1159,6 @@ static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Un
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_spec__3(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, 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___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainMutualFailure(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_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*);
@@ -24396,22 +24394,13 @@ x_3 = lean_array_push(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainNonMutualFailure(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_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 x_8 = lean_array_size(x_1);
 x_9 = lean_box_usize(x_8);
-x_10 = l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed__const__1;
+x_10 = l_Array_mapFinIdxM_map___at___00Lean_Elab_WF_GuessLex_simpleMeasures_spec__1___redArg___lam__1___boxed__const__1;
 lean_inc_ref(x_1);
 x_11 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_explainNonMutualFailure_spec__0___boxed), 9, 3);
 lean_closure_set(x_11, 0, x_9);
@@ -25354,15 +25343,6 @@ lean_dec_ref(x_1);
 return x_15;
 }
 }
-static lean_object* _init_l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_WF_GuessLex_explainMutualFailure(lean_object* x_1, 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:
 {
@@ -25370,7 +25350,7 @@ size_t x_9; size_t x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13
 x_9 = lean_array_size(x_2);
 x_10 = 0;
 x_11 = lean_box_usize(x_9);
-x_12 = l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed__const__1;
+x_12 = l_Array_mapFinIdxM_map___at___00Lean_Elab_WF_GuessLex_simpleMeasures_spec__1___redArg___lam__1___boxed__const__1;
 lean_inc_ref(x_2);
 x_13 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_spec__0___boxed), 9, 3);
 lean_closure_set(x_13, 0, x_11);
@@ -29696,12 +29676,8 @@ l_WellFounded_opaqueFix_u2083___at___00Lean_Elab_WF_GuessLex_explainNonMutualFai
 lean_mark_persistent(l_WellFounded_opaqueFix_u2083___at___00Lean_Elab_WF_GuessLex_explainNonMutualFailure_spec__2___redArg___closed__1);
 l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__0 = _init_l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__0();
 lean_mark_persistent(l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___closed__0);
-l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed__const__1 = _init_l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_WF_GuessLex_explainNonMutualFailure___boxed__const__1);
 l_WellFounded_opaqueFix_u2083___at___00WellFounded_opaqueFix_u2083___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_spec__2_spec__2___redArg___closed__0 = _init_l_WellFounded_opaqueFix_u2083___at___00WellFounded_opaqueFix_u2083___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_spec__2_spec__2___redArg___closed__0();
 lean_mark_persistent(l_WellFounded_opaqueFix_u2083___at___00WellFounded_opaqueFix_u2083___at___00Lean_Elab_WF_GuessLex_explainMutualFailure_spec__2_spec__2___redArg___closed__0);
-l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed__const__1 = _init_l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_WF_GuessLex_explainMutualFailure___boxed__const__1);
 l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_toTerminationMeasures_spec__0___closed__0 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_toTerminationMeasures_spec__0___closed__0();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_toTerminationMeasures_spec__0___closed__0);
 l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_toTerminationMeasures_spec__0___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_WF_GuessLex_toTerminationMeasures_spec__0___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c b/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c
index 9f80b3df8a..50e724abb6 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c
@@ -2333,7 +2333,6 @@ static lean_object* l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__2;
 static const lean_string_object l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 50, .m_capacity = 50, .m_length = 49, .m_data = "Tactic `clear_value` failed to clear any values.\n"};
 static const lean_object* l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__3 = (const lean_object*)&l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__3_value;
 static lean_object* l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__4;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1;
 lean_object* l_Lean_Elab_Tactic_popMainGoal___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MVarId_assertHypotheses(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_pushGoal___redArg(lean_object*, lean_object*);
@@ -2658,7 +2657,6 @@ static const lean_ctor_object l_Lean_Elab_Tactic_evalCase___closed__1_value_aux_
 static const lean_ctor_object l_Lean_Elab_Tactic_evalCase___closed__1_value_aux_2 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Elab_Tactic_evalCase___closed__1_value_aux_1),((lean_object*)&l_Lean_Elab_Tactic_evalWithAnnotateState___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState__1___closed__2_value),LEAN_SCALAR_PTR_LITERAL(166, 58, 35, 182, 187, 130, 147, 254)}};
 static const lean_ctor_object l_Lean_Elab_Tactic_evalCase___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Elab_Tactic_evalCase___closed__1_value_aux_2),((lean_object*)&l_Lean_Elab_Tactic_evalCase___closed__0_value),LEAN_SCALAR_PTR_LITERAL(216, 244, 120, 128, 139, 198, 139, 51)}};
 static const lean_object* l_Lean_Elab_Tactic_evalCase___closed__1 = (const lean_object*)&l_Lean_Elab_Tactic_evalCase___closed__1_value;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l_Lean_Elab_Tactic_evalCase___regBuiltin_Lean_Elab_Tactic_evalCase__1___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 9, .m_capacity = 9, .m_length = 8, .m_data = "evalCase"};
@@ -37265,15 +37263,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalClearValue___lam__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -37349,7 +37338,7 @@ x_34 = lean_array_get_size(x_32);
 x_35 = l_Array_toSubarray___redArg(x_32, x_14, x_34);
 x_36 = lean_array_size(x_26);
 x_37 = lean_box_usize(x_36);
-x_38 = l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1;
+x_38 = l_Lean_Elab_Tactic_evalIntros___boxed__const__1;
 x_39 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalClearValue___lam__0___boxed), 13, 4);
 lean_closure_set(x_39, 0, x_26);
 lean_closure_set(x_39, 1, x_37);
@@ -37374,7 +37363,7 @@ if (x_41 == 0)
 lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
 x_42 = lean_ctor_get(x_40, 0);
 lean_dec(x_42);
-x_43 = l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1;
+x_43 = l_Lean_Elab_Tactic_evalIntros___boxed__const__1;
 lean_inc(x_23);
 x_44 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalClearValue___lam__1___boxed), 12, 3);
 lean_closure_set(x_44, 0, x_24);
@@ -37577,7 +37566,7 @@ else
 {
 lean_object* x_75; lean_object* x_76; lean_object* x_77; 
 lean_dec(x_40);
-x_75 = l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1;
+x_75 = l_Lean_Elab_Tactic_evalIntros___boxed__const__1;
 lean_inc(x_23);
 x_76 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalClearValue___lam__1___boxed), 12, 3);
 lean_closure_set(x_76, 0, x_24);
@@ -37866,7 +37855,7 @@ x_116 = lean_array_get_size(x_114);
 x_117 = l_Array_toSubarray___redArg(x_114, x_14, x_116);
 x_118 = lean_array_size(x_108);
 x_119 = lean_box_usize(x_118);
-x_120 = l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1;
+x_120 = l_Lean_Elab_Tactic_evalIntros___boxed__const__1;
 x_121 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalClearValue___lam__0___boxed), 13, 4);
 lean_closure_set(x_121, 0, x_108);
 lean_closure_set(x_121, 1, x_119);
@@ -37892,7 +37881,7 @@ if (lean_is_exclusive(x_122)) {
  lean_dec_ref(x_122);
  x_123 = lean_box(0);
 }
-x_124 = l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1;
+x_124 = l_Lean_Elab_Tactic_evalIntros___boxed__const__1;
 lean_inc(x_23);
 x_125 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalClearValue___lam__1___boxed), 12, 3);
 lean_closure_set(x_125, 0, x_24);
@@ -42951,15 +42940,6 @@ lean_dec_ref(x_2);
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_evalCase___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -43137,7 +43117,7 @@ x_39 = lean_array_get_size(x_33);
 x_40 = l_Array_toSubarray___redArg(x_33, x_14, x_39);
 x_41 = lean_array_size(x_34);
 x_42 = lean_box_usize(x_41);
-x_43 = l_Lean_Elab_Tactic_evalCase___boxed__const__1;
+x_43 = l_Lean_Elab_Tactic_evalIntros___boxed__const__1;
 x_44 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalCase___lam__0___boxed), 17, 8);
 lean_closure_set(x_44, 0, x_15);
 lean_closure_set(x_44, 1, x_36);
@@ -47342,8 +47322,6 @@ l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__2 = _init_l_Lean_Elab_Tacti
 lean_mark_persistent(l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__2);
 l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__4 = _init_l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__4();
 lean_mark_persistent(l_Lean_Elab_Tactic_evalClearValue___lam__2___closed__4);
-l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1 = _init_l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_Tactic_evalClearValue___lam__2___boxed__const__1);
 if (builtin) {res = l_Lean_Elab_Tactic_evalClearValue___regBuiltin_Lean_Elab_Tactic_evalClearValue__1();
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
@@ -47391,8 +47369,6 @@ l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals_notF
 lean_mark_persistent(l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals_notFound___closed__13);
 l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals_notFound___closed__15 = _init_l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals_notFound___closed__15();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals_notFound___closed__15);
-l_Lean_Elab_Tactic_evalCase___boxed__const__1 = _init_l_Lean_Elab_Tactic_evalCase___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_Tactic_evalCase___boxed__const__1);
 if (builtin) {res = l_Lean_Elab_Tactic_evalCase___regBuiltin_Lean_Elab_Tactic_evalCase__1();
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Do/ProofMode/Intro.c b/stage0/stdlib/Lean/Elab/Tactic/Do/ProofMode/Intro.c
index 6fd406a161..7e6ea9832a 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Do/ProofMode/Intro.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Do/ProofMode/Intro.c
@@ -201,11 +201,11 @@ lean_object* l_Lean_Syntax_node1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__0(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -3584,15 +3584,6 @@ x_7 = l_Lean_Elab_Tactic_Do_ProofMode_mIntroForall___redArg(x_1, x_2, x_3, x_4,
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg(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:
 {
@@ -3622,7 +3613,7 @@ x_14 = lean_nat_sub(x_5, x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_15 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1___boxed), 6, 5);
+x_15 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1), 6, 5);
 lean_closure_set(x_15, 0, x_1);
 lean_closure_set(x_15, 1, x_2);
 lean_closure_set(x_15, 2, x_3);
@@ -3649,6 +3640,15 @@ x_7 = l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg(x_1, x_2, x_3, x_6,
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mIntroForallN___redArg___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:
 {
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Do/VCGen.c b/stage0/stdlib/Lean/Elab/Tactic/Do/VCGen.c
index 4dd715b1ce..14ada64198 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Do/VCGen.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Do/VCGen.c
@@ -417,7 +417,6 @@ static lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__pr
 static const lean_string_object l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__9_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 7, .m_capacity = 7, .m_length = 6, .m_data = ", got "};
 static const lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__9 = (const lean_object*)&l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__9_value;
 static lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__10;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1;
 lean_object* l_Lean_Expr_consumeMData(lean_object*);
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppRevArgsAux(lean_object*, lean_object*);
 lean_object* l_Array_toSubarray___redArg(lean_object*, lean_object*, lean_object*);
@@ -959,7 +958,6 @@ static lean_object* l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_D
 static const lean_string_object l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__11_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 24, .m_capacity = 24, .m_length = 23, .m_data = " has no MatchInfo found"};
 static const lean_object* l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__11 = (const lean_object*)&l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__11_value;
 static lean_object* l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__12;
-LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___boxed__const__1;
 lean_object* l_Lean_indentExpr(lean_object*);
 lean_object* l_Lean_Meta_mapErrorImp___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MatcherApp_altNumParams(lean_object*);
@@ -10083,15 +10081,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -10523,7 +10512,7 @@ size_t x_105; size_t x_106; lean_object* x_107; lean_object* x_108; lean_object*
 x_105 = lean_array_size(x_28);
 x_106 = 0;
 x_107 = lean_box_usize(x_105);
-x_108 = l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1;
+x_108 = l___private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite___lam__15___boxed__const__1;
 lean_inc_ref(x_28);
 x_109 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___lam__4___boxed), 11, 3);
 lean_closure_set(x_109, 0, x_107);
@@ -10575,7 +10564,7 @@ x_120 = lean_ctor_get(x_118, 1);
 lean_inc(x_120);
 lean_dec(x_118);
 x_121 = lean_box_usize(x_105);
-x_122 = l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1;
+x_122 = l___private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite___lam__15___boxed__const__1;
 lean_inc_ref(x_28);
 x_123 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___lam__5___boxed), 11, 3);
 lean_closure_set(x_123, 0, x_121);
@@ -25933,15 +25922,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39(lean_object* x_1, uint8_t x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
@@ -29604,7 +29584,7 @@ x_624 = lean_ctor_get(x_623, 0);
 lean_inc(x_624);
 lean_dec_ref(x_623);
 x_625 = lean_box(x_3);
-x_626 = l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___boxed__const__1;
+x_626 = l___private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite___lam__15___boxed__const__1;
 lean_inc_ref(x_23);
 lean_inc(x_624);
 lean_inc_ref(x_18);
@@ -60254,8 +60234,6 @@ l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tact
 lean_mark_persistent(l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__8);
 l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__10 = _init_l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__10();
 lean_mark_persistent(l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___closed__10);
-l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1 = _init_l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_Tactic_Do_ProofMode_mRevertForallN___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__15___boxed__const__1);
 l_Lean_Elab_Tactic_Do_ProofMode_mFrameCore___at___00Lean_Elab_Tactic_Do_ProofMode_mTryFrame___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__16_spec__28___lam__4___closed__0 = _init_l_Lean_Elab_Tactic_Do_ProofMode_mFrameCore___at___00Lean_Elab_Tactic_Do_ProofMode_mTryFrame___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__16_spec__28___lam__4___closed__0();
 lean_mark_persistent(l_Lean_Elab_Tactic_Do_ProofMode_mFrameCore___at___00Lean_Elab_Tactic_Do_ProofMode_mTryFrame___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__16_spec__28___lam__4___closed__0);
 l_Lean_Elab_Tactic_Do_ProofMode_mFrameCore___at___00Lean_Elab_Tactic_Do_ProofMode_mTryFrame___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__16_spec__28___closed__0 = _init_l_Lean_Elab_Tactic_Do_ProofMode_mFrameCore___at___00Lean_Elab_Tactic_Do_ProofMode_mTryFrame___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJumpSite_spec__16_spec__28___closed__0();
@@ -60322,8 +60300,6 @@ l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWit
 lean_mark_persistent(l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__10);
 l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__12 = _init_l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__12();
 lean_mark_persistent(l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___closed__12);
-l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___boxed__const__1 = _init_l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___boxed__const__1();
-lean_mark_persistent(l_Lean_Meta_MatcherApp_transform___at___00Lean_Elab_Tactic_Do_SplitInfo_splitWith___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onJoinPoint_spec__21_spec__39___boxed__const__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_Do_mSpec___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onWPApp_spec__11_spec__20___lam__4___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_Do_mSpec___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onWPApp_spec__11_spec__20___lam__4___closed__1();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_Do_mSpec___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onWPApp_spec__11_spec__20___lam__4___closed__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_Do_mSpec___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onWPApp_spec__11_spec__20___lam__4___closed__3 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_Do_mSpec___at___00__private_Lean_Elab_Tactic_Do_VCGen_0__Lean_Elab_Tactic_Do_VCGen_genVCs_onWPApp_spec__11_spec__20___lam__4___closed__3();
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Grind/ShowState.c b/stage0/stdlib/Lean/Elab/Tactic/Grind/ShowState.c
index e9e393f04d..0075ff0bdd 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Grind/ShowState.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Grind/ShowState.c
@@ -5361,7 +5361,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00__private_Lean_Elab_Tactic_Grind_ShowState_0__Lean_Elab_Tactic_Grind_evalShowLocalThms_spec__0_spec__0_spec__1_spec__3___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -5396,7 +5396,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00__private_Lean_Elab_Tactic_Grind_ShowState_0__Lean_Elab_Tactic_Grind_evalShowLocalThms_spec__0_spec__0_spec__1___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
@@ -5638,7 +5638,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00__private_Lean_Elab_Tactic_Grind_ShowState_0__Lean_Elab_Tactic_Grind_evalShowLocalThms_spec__0_spec__0_spec__2___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -6107,7 +6107,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00__private_Lean_Elab_Tactic_Grind_ShowState_0__Lean_Elab_Tactic_Grind_evalShowLocalThms_spec__0_spec__0_spec__1(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 x_6 = lean_box(x_5);
@@ -6127,7 +6127,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00__private_Lean_Elab_Tactic_Grind_ShowState_0__Lean_Elab_Tactic_Grind_evalShowLocalThms_spec__0_spec__0_spec__2(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -6145,7 +6145,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00__private_Lean_Elab_Tactic_Grind_ShowState_0__Lean_Elab_Tactic_Grind_evalShowLocalThms_spec__0_spec__0_spec__1_spec__3(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Induction.c b/stage0/stdlib/Lean/Elab/Tactic/Induction.c
index 231f9623c2..14c6ccec09 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Induction.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Induction.c
@@ -806,7 +806,6 @@ static lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_E
 static const lean_string_object l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__8_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 10, .m_capacity = 10, .m_length = 9, .m_data = " expected"};
 static const lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__8 = (const lean_object*)&l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__8_value;
 static lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__9;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1;
 lean_object* l_Lean_Elab_Tactic_throwOrLogError(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_List_isEmpty___redArg(lean_object*);
 lean_object* l_Lean_Meta_introNCore(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -851,7 +850,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Uns
 static const lean_string_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 24, .m_capacity = 24, .m_length = 23, .m_data = "` has not been provided"};
 static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__0_value;
 static lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__1;
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_appendGoals___redArg(lean_object*, lean_object*);
 lean_object* l_List_appendTR___redArg(lean_object*, lean_object*);
@@ -1305,7 +1303,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_m
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Tactic_elabElimTargets_spec__1(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Elab_Tactic_elabElimTargets_spec__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Tactic_elabElimTargets___lam__1___closed__0;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_elabElimTargets___lam__1___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_elabElimTargets___lam__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_Elab_Tactic_elabElimTargets___lam__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_Tactic_elabElimTargets(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -20042,15 +20039,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx(lean_object* x_1, lean_object* x_2, 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) {
 _start:
 {
@@ -20294,7 +20282,7 @@ x_314 = lean_array_get_size(x_311);
 x_315 = l_Array_toSubarray___redArg(x_311, x_313, x_314);
 x_316 = lean_array_size(x_4);
 x_317 = lean_box_usize(x_316);
-x_318 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1;
+x_318 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_saveAltVarsInfo___boxed__const__1;
 x_319 = lean_alloc_closure((void*)(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___lam__6___boxed), 14, 5);
 lean_closure_set(x_319, 0, x_4);
 lean_closure_set(x_319, 1, x_317);
@@ -21064,7 +21052,7 @@ x_454 = lean_array_get_size(x_451);
 x_455 = l_Array_toSubarray___redArg(x_451, x_453, x_454);
 x_456 = lean_array_size(x_4);
 x_457 = lean_box_usize(x_456);
-x_458 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1;
+x_458 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_saveAltVarsInfo___boxed__const__1;
 x_459 = lean_alloc_closure((void*)(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___lam__6___boxed), 14, 5);
 lean_closure_set(x_459, 0, x_4);
 lean_closure_set(x_459, 1, x_457);
@@ -21783,7 +21771,7 @@ lean_inc(x_139);
 lean_dec_ref(x_138);
 x_140 = lean_array_size(x_6);
 x_141 = lean_box_usize(x_140);
-x_142 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1;
+x_142 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_saveAltVarsInfo___boxed__const__1;
 x_143 = lean_alloc_closure((void*)(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___lam__1___boxed), 14, 5);
 lean_closure_set(x_143, 0, x_118);
 lean_closure_set(x_143, 1, x_6);
@@ -23265,15 +23253,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, size_t x_10, size_t x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19, lean_object* x_20) {
 _start:
 {
@@ -23443,7 +23422,7 @@ x_109 = lean_array_get_size(x_106);
 x_110 = l_Array_toSubarray___redArg(x_106, x_108, x_109);
 x_111 = lean_array_size(x_8);
 x_112 = lean_box_usize(x_111);
-x_113 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1;
+x_113 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_saveAltVarsInfo___boxed__const__1;
 lean_inc_ref(x_8);
 x_114 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___lam__2___boxed), 14, 5);
 lean_closure_set(x_114, 0, x_8);
@@ -23614,7 +23593,7 @@ lean_inc(x_66);
 lean_dec_ref(x_65);
 x_67 = lean_array_size(x_4);
 x_68 = lean_box_usize(x_67);
-x_69 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1;
+x_69 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_saveAltVarsInfo___boxed__const__1;
 lean_inc_ref(x_4);
 x_70 = lean_alloc_closure((void*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___lam__1___boxed), 14, 5);
 lean_closure_set(x_70, 0, x_48);
@@ -34082,15 +34061,6 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Tactic_elabElimTargets___lam__1___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_elabElimTargets___lam__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -34168,7 +34138,7 @@ else
 {
 lean_object* x_27; lean_object* x_28; lean_object* x_29; 
 lean_dec(x_15);
-x_27 = l_Lean_Elab_Tactic_elabElimTargets___lam__1___boxed__const__1;
+x_27 = l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_saveAltVarsInfo___boxed__const__1;
 x_28 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_elabElimTargets___lam__0___boxed), 13, 4);
 lean_closure_set(x_28, 0, x_14);
 lean_closure_set(x_28, 1, x_22);
@@ -41706,12 +41676,8 @@ l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_appl
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__7);
 l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__9 = _init_l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__9();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___closed__9);
-l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1 = _init_l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_applyAltStx___boxed__const__1);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__1();
 lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___closed__1);
-l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__0___boxed__const__1);
 l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__2___redArg___closed__1 = _init_l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__2___redArg___closed__1();
 lean_mark_persistent(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental_spec__2___redArg___closed__1);
 l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental___closed__0 = _init_l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_evalAlts_goWithIncremental___closed__0();
@@ -41800,8 +41766,6 @@ l_Lean_Elab_Tactic_elabElimTargets___lam__0___closed__2 = _init_l_Lean_Elab_Tact
 lean_mark_persistent(l_Lean_Elab_Tactic_elabElimTargets___lam__0___closed__2);
 l_Lean_Elab_Tactic_elabElimTargets___lam__1___closed__0 = _init_l_Lean_Elab_Tactic_elabElimTargets___lam__1___closed__0();
 lean_mark_persistent(l_Lean_Elab_Tactic_elabElimTargets___lam__1___closed__0);
-l_Lean_Elab_Tactic_elabElimTargets___lam__1___boxed__const__1 = _init_l_Lean_Elab_Tactic_elabElimTargets___lam__1___boxed__const__1();
-lean_mark_persistent(l_Lean_Elab_Tactic_elabElimTargets___lam__1___boxed__const__1);
 l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_generalizeTargets___lam__0___closed__2 = _init_l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_generalizeTargets___lam__0___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_generalizeTargets___lam__0___closed__2);
 l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_checkInductionTargets_spec__0___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Elab_Tactic_checkInductionTargets_spec__0___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Omega/Core.c b/stage0/stdlib/Lean/Elab/Tactic/Omega/Core.c
index aad07561b2..27d6615d0d 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Omega/Core.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Omega/Core.c
@@ -6564,7 +6564,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_List_foldl___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Elab_Tactic_Omega_Problem_insertConstraint_spec__0_spec__0(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Lean/Elab/Util.c b/stage0/stdlib/Lean/Elab/Util.c
index 85306c02b6..51f3673080 100644
--- a/stage0/stdlib/Lean/Elab/Util.c
+++ b/stage0/stdlib/Lean/Elab/Util.c
@@ -126,8 +126,8 @@ LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKind___redArg___lam__6(lean_
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKind___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKind(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 static lean_object* l_Lean_addMessageContextPartial___at___00Lean_throwError___at___00Lean_Elab_checkSyntaxNodeKindAtNamespaces___at___00Lean_Elab_checkSyntaxNodeKindAtCurrentNamespaces_spec__0_spec__1_spec__2___closed__0;
@@ -1728,15 +1728,6 @@ x_6 = l_Lean_Elab_checkSyntaxNodeKind___redArg(x_2, x_3, x_4, x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec_ref(x_6);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1753,7 +1744,7 @@ lean_inc(x_4);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_9 = lean_alloc_closure((void*)(l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0___boxed), 6, 5);
+x_9 = lean_alloc_closure((void*)(l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0), 6, 5);
 lean_closure_set(x_9, 0, x_1);
 lean_closure_set(x_9, 1, x_2);
 lean_closure_set(x_9, 2, x_3);
@@ -1791,6 +1782,15 @@ x_7 = l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg(x_1, x_2, x_3, x_4, x
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec_ref(x_6);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces(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:
 {
diff --git a/stage0/stdlib/Lean/Expr.c b/stage0/stdlib/Lean/Expr.c
index 9c0b2fdc10..8aec4e6062 100644
--- a/stage0/stdlib/Lean/Expr.c
+++ b/stage0/stdlib/Lean/Expr.c
@@ -2778,7 +2778,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_hash(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -2801,7 +2801,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_approxDepth(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -2822,7 +2822,7 @@ _start:
 {
 uint64_t x_2; uint32_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_looseBVarRange(x_2);
 x_4 = lean_box_uint32(x_3);
 return x_4;
@@ -2845,7 +2845,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_hasFVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -2868,7 +2868,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_hasExprMVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -2891,7 +2891,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_hasLevelMVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -2914,7 +2914,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Expr_Data_hasLevelParam(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -2935,7 +2935,7 @@ _start:
 {
 uint64_t x_8; uint32_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint64_t x_14; lean_object* x_15; 
 x_8 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_9 = lean_unbox_uint32(x_3);
 lean_dec(x_3);
 x_10 = lean_unbox(x_4);
@@ -2952,9 +2952,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_expr_mk_app_data(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -2973,7 +2973,7 @@ _start:
 {
 uint64_t x_8; uint32_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint64_t x_14; lean_object* x_15; 
 x_8 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_9 = lean_unbox_uint32(x_3);
 lean_dec(x_3);
 x_10 = lean_unbox(x_4);
@@ -2998,7 +2998,7 @@ _start:
 {
 uint64_t x_8; uint32_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint64_t x_14; lean_object* x_15; 
 x_8 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_9 = lean_unbox_uint32(x_3);
 lean_dec(x_3);
 x_10 = lean_unbox(x_4);
@@ -3209,7 +3209,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lean_instReprData__1___lam__0(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -7618,7 +7618,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_List_foldl___at___00Lean_Expr_const___override_spec__4(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Lean/Level.c b/stage0/stdlib/Lean/Level.c
index 24f8b43222..4496d49cd4 100644
--- a/stage0/stdlib/Lean/Level.c
+++ b/stage0/stdlib/Lean/Level.c
@@ -601,7 +601,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Level_Data_hash(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -622,7 +622,7 @@ _start:
 {
 uint64_t x_2; uint32_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Level_Data_depth(x_2);
 x_4 = lean_box_uint32(x_3);
 return x_4;
@@ -645,7 +645,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Level_Data_hasMVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -668,7 +668,7 @@ _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_Level_Data_hasParam(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -679,7 +679,7 @@ _start:
 {
 uint64_t x_5; uint8_t x_6; uint8_t x_7; uint64_t x_8; lean_object* x_9; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = lean_unbox(x_3);
 x_7 = lean_unbox(x_4);
 x_8 = lean_level_mk_data(x_5, x_2, x_6, x_7);
@@ -818,7 +818,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lean_instReprData___lam__0(x_3, x_2);
 lean_dec(x_2);
 return x_4;
diff --git a/stage0/stdlib/Lean/LibrarySuggestions/Basic.c b/stage0/stdlib/Lean/LibrarySuggestions/Basic.c
index b836e1ce0d..ba90deb7fa 100644
--- a/stage0/stdlib/Lean/LibrarySuggestions/Basic.c
+++ b/stage0/stdlib/Lean/LibrarySuggestions/Basic.c
@@ -252,7 +252,6 @@ static lean_object* l_Lean_LibrarySuggestions_Selector_intersperse___closed__1;
 static lean_object* l_Lean_LibrarySuggestions_Selector_intersperse___closed__2;
 LEAN_EXPORT lean_object* l_Lean_LibrarySuggestions_Selector_intersperse___closed__3___boxed__const__1;
 static lean_object* l_Lean_LibrarySuggestions_Selector_intersperse___closed__3;
-LEAN_EXPORT lean_object* l_Lean_LibrarySuggestions_Selector_intersperse___closed__4___boxed__const__1;
 static lean_object* l_Lean_LibrarySuggestions_Selector_intersperse___closed__4;
 double lean_float_mul(double, double);
 uint32_t lean_float_to_uint32(double);
@@ -7800,21 +7799,12 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_LibrarySuggestions_Selector_intersperse___closed__4___boxed__const__1() {
-_start:
-{
-double x_1; lean_object* x_2; 
-x_1 = l_Lean_LibrarySuggestions_Selector_intersperse___closed__0;
-x_2 = lean_box_float(x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_LibrarySuggestions_Selector_intersperse___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_LibrarySuggestions_Selector_intersperse___closed__3;
-x_2 = l_Lean_LibrarySuggestions_Selector_intersperse___closed__4___boxed__const__1;
+x_2 = l_Lean_LibrarySuggestions_Selector_intersperse___closed__3___boxed__const__1;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -17613,8 +17603,6 @@ l_Lean_LibrarySuggestions_Selector_intersperse___closed__3___boxed__const__1 = _
 lean_mark_persistent(l_Lean_LibrarySuggestions_Selector_intersperse___closed__3___boxed__const__1);
 l_Lean_LibrarySuggestions_Selector_intersperse___closed__3 = _init_l_Lean_LibrarySuggestions_Selector_intersperse___closed__3();
 lean_mark_persistent(l_Lean_LibrarySuggestions_Selector_intersperse___closed__3);
-l_Lean_LibrarySuggestions_Selector_intersperse___closed__4___boxed__const__1 = _init_l_Lean_LibrarySuggestions_Selector_intersperse___closed__4___boxed__const__1();
-lean_mark_persistent(l_Lean_LibrarySuggestions_Selector_intersperse___closed__4___boxed__const__1);
 l_Lean_LibrarySuggestions_Selector_intersperse___closed__4 = _init_l_Lean_LibrarySuggestions_Selector_intersperse___closed__4();
 lean_mark_persistent(l_Lean_LibrarySuggestions_Selector_intersperse___closed__4);
 if (builtin) {res = l_Lean_LibrarySuggestions_initFn_00___x40_Lean_LibrarySuggestions_Basic_2108197918____hygCtx___hyg_2_();
diff --git a/stage0/stdlib/Lean/Meta/Basic.c b/stage0/stdlib/Lean/Meta/Basic.c
index 6a25d8ae8a..0fdee89060 100644
--- a/stage0/stdlib/Lean/Meta/Basic.c
+++ b/stage0/stdlib/Lean/Meta/Basic.c
@@ -4274,7 +4274,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Meta_instHashableSynthInstanceCacheKey_hash_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lean/Meta/Canonicalizer.c b/stage0/stdlib/Lean/Meta/Canonicalizer.c
index 7e3b89371c..728c4d73e6 100644
--- a/stage0/stdlib/Lean/Meta/Canonicalizer.c
+++ b/stage0/stdlib/Lean/Meta/Canonicalizer.c
@@ -1028,7 +1028,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l___private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_mkKey_unsafe__8___redArg(x_1, x_5, x_3);
 lean_dec(x_3);
 return x_6;
@@ -1047,7 +1047,7 @@ _start:
 {
 uint64_t x_10; uint8_t x_11; lean_object* x_12; 
 x_10 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_11 = lean_unbox(x_3);
 x_12 = l___private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_mkKey_unsafe__8(x_1, x_10, x_11, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_8);
@@ -2053,7 +2053,7 @@ _start:
 {
 uint64_t x_14; uint8_t x_15; lean_object* x_16; 
 x_14 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_15 = lean_unbox(x_7);
 x_16 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_mkKey_spec__1___redArg(x_1, x_2, x_3, x_4, x_5, x_14, x_15, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_8);
@@ -2087,7 +2087,7 @@ _start:
 {
 uint64_t x_17; uint8_t x_18; lean_object* x_19; 
 x_17 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_18 = lean_unbox(x_10);
 x_19 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_mkKey_spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_17, x_9, x_18, x_11, x_12, x_13, x_14, x_15);
 lean_dec(x_11);
@@ -2136,7 +2136,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_canon_unsafe__1_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -2170,7 +2170,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_canon_unsafe__1_spec__0___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -2190,7 +2190,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l___private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_canon_unsafe__1(x_3, x_2);
 lean_dec_ref(x_2);
 return x_4;
@@ -2209,7 +2209,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_canon_unsafe__1_spec__0(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 return x_5;
@@ -2228,7 +2228,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Canonicalizer_0__Lean_Meta_Canonicalizer_canon_unsafe__1_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
@@ -2315,7 +2315,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Canonicalizer_canon_spec__1_spec__3___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -2470,7 +2470,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Canonicalizer_canon_spec__1_spec__1___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -2627,7 +2627,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Canonicalizer_canon_spec__1___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -3921,7 +3921,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Canonicalizer_canon_spec__1(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -3939,7 +3939,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Canonicalizer_canon_spec__1_spec__1(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -3967,7 +3967,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Canonicalizer_canon_spec__1_spec__3(x_1, x_5, x_3, x_4);
 return x_6;
 }
diff --git a/stage0/stdlib/Lean/Meta/Constructions/SparseCasesOn.c b/stage0/stdlib/Lean/Meta/Constructions/SparseCasesOn.c
index c3f85a60d4..a14a84c2aa 100644
--- a/stage0/stdlib/Lean/Meta/Constructions/SparseCasesOn.c
+++ b/stage0/stdlib/Lean/Meta/Constructions/SparseCasesOn.c
@@ -597,7 +597,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Constructions_SparseCasesOn_0__Lean_Meta_instHashableSparseCasesOnKey_hash_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lean/Meta/DiscrTree/Basic.c b/stage0/stdlib/Lean/Meta/DiscrTree/Basic.c
index e538d09dcf..1e072c3a79 100644
--- a/stage0/stdlib/Lean/Meta/DiscrTree/Basic.c
+++ b/stage0/stdlib/Lean/Meta/DiscrTree/Basic.c
@@ -388,8 +388,6 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_Disc
 LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_closure_object l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__0___boxed, .m_arity = 2, .m_num_fixed = 0, .m_objs = {} };
 static const lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__0 = (const lean_object*)&l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Id_instMonad___lam__6(lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_closure_object l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__7_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Id_instMonad___lam__6, .m_arity = 4, .m_num_fixed = 0, .m_objs = {} };
 static const lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__7 = (const lean_object*)&l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__7_value;
@@ -418,8 +416,10 @@ static const lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_Dis
 static const lean_ctor_object l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__10_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__9_value),((lean_object*)&l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__7_value)}};
 static const lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__10 = (const lean_object*)&l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___closed__10_value;
 lean_object* lean_array_fget(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_binInsertM___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instBEqKey_beq___boxed(lean_object*, lean_object*);
 static const lean_closure_object l_Lean_Meta_DiscrTree_insertKeyValue___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Meta_DiscrTree_instBEqKey_beq___boxed, .m_arity = 2, .m_num_fixed = 0, .m_objs = {} };
@@ -3885,15 +3885,6 @@ lean_dec(x_1);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -3924,7 +3915,7 @@ lean_inc(x_13);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_4);
-x_14 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1___boxed), 6, 5);
+x_14 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1), 6, 5);
 lean_closure_set(x_14, 0, x_4);
 lean_closure_set(x_14, 1, x_1);
 lean_closure_set(x_14, 2, x_2);
@@ -3976,7 +3967,7 @@ lean_inc(x_27);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc(x_4);
-x_28 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1___boxed), 6, 5);
+x_28 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1), 6, 5);
 lean_closure_set(x_28, 0, x_4);
 lean_closure_set(x_28, 1, x_1);
 lean_closure_set(x_28, 2, x_2);
@@ -4036,6 +4027,15 @@ return x_17;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_DiscrTree_Basic_0__Lean_Meta_DiscrTree_insertAux(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:
 {
diff --git a/stage0/stdlib/Lean/Meta/ExprTraverse.c b/stage0/stdlib/Lean/Meta/ExprTraverse.c
index 7f5d16338d..74062a023b 100644
--- a/stage0/stdlib/Lean/Meta/ExprTraverse.c
+++ b/stage0/stdlib/Lean/Meta/ExprTraverse.c
@@ -24,12 +24,12 @@ lean_object* l_Lean_Meta_withLocalDecl___redArg(lean_object*, lean_object*, lean
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SubExpr_Pos_pushBindingDomain(lean_object*);
 lean_object* lean_expr_instantiate_rev(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l_Lean_SubExpr_Pos_pushBindingBody(lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 static lean_object* l_Lean_Meta_traverseLambdaWithPos___redArg___closed__0;
@@ -51,10 +51,10 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_travers
 lean_object* l_Lean_Meta_mkLetFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__3(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SubExpr_Pos_pushLetVarType(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SubExpr_Pos_pushLetBody(lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_traverseLetWithPos___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_traverseLetWithPos(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -150,15 +150,6 @@ x_8 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visi
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec(x_2);
-return x_9;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg(lean_object* x_1, 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:
 {
@@ -180,7 +171,7 @@ lean_inc_ref(x_3);
 lean_inc_ref(x_1);
 lean_inc(x_6);
 lean_inc_ref(x_5);
-x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0___boxed), 8, 7);
+x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0), 8, 7);
 lean_closure_set(x_13, 0, x_5);
 lean_closure_set(x_13, 1, x_6);
 lean_closure_set(x_13, 2, x_1);
@@ -234,6 +225,15 @@ x_11 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_vis
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_2);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLambdaWithPos_visit(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -457,15 +457,6 @@ x_11 = lean_apply_2(x_2, lean_box(0), x_10);
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec(x_2);
-return x_9;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg(lean_object* x_1, 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:
 {
@@ -488,7 +479,7 @@ lean_inc_ref(x_3);
 lean_inc_ref(x_1);
 lean_inc(x_6);
 lean_inc_ref(x_5);
-x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0___boxed), 8, 7);
+x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0), 8, 7);
 lean_closure_set(x_13, 0, x_5);
 lean_closure_set(x_13, 1, x_6);
 lean_closure_set(x_13, 2, x_1);
@@ -549,6 +540,15 @@ x_11 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit_
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_2);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_ExprTraverse_0__Lean_Meta_traverseLetWithPos_visit(lean_object* x_1, lean_object* x_2, 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:
 {
diff --git a/stage0/stdlib/Lean/Meta/FunInfo.c b/stage0/stdlib/Lean/Meta/FunInfo.c
index eaefbcf6e1..07fa5166e9 100644
--- a/stage0/stdlib/Lean/Meta/FunInfo.c
+++ b/stage0/stdlib/Lean/Meta/FunInfo.c
@@ -543,7 +543,7 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_List_foldl___at___00__private_Lean_Meta_FunInfo_0__Lean_Meta_instHashableFunInfoEnvCacheKey_hash_spec__0(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box_uint64(x_4);
diff --git a/stage0/stdlib/Lean/Meta/Sym/AbstractS.c b/stage0/stdlib/Lean/Meta/Sym/AbstractS.c
index 638bd94619..71f08a49c7 100644
--- a/stage0/stdlib/Lean/Meta/Sym/AbstractS.c
+++ b/stage0/stdlib/Lean/Meta/Sym/AbstractS.c
@@ -2916,42 +2916,42 @@ x_13 = lean_st_ref_take(x_4);
 x_14 = !lean_is_exclusive(x_13);
 if (x_14 == 0)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_63; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+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_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_64; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
 x_15 = lean_ctor_get(x_13, 0);
 x_16 = l_Lean_Meta_Sym_abstractFVarsRange___redArg___closed__0;
 lean_ctor_set(x_13, 0, x_16);
 x_17 = lean_st_ref_set(x_4, x_13);
 x_18 = lean_st_ref_get(x_4);
-x_36 = lean_ctor_get(x_5, 2);
-lean_inc_ref(x_36);
-lean_dec_ref(x_5);
-x_37 = lean_ctor_get(x_12, 1);
+x_37 = lean_ctor_get(x_5, 2);
 lean_inc_ref(x_37);
+lean_dec_ref(x_5);
+x_38 = lean_ctor_get(x_12, 1);
+lean_inc_ref(x_38);
 lean_dec(x_12);
-x_38 = lean_ctor_get_uint8(x_18, sizeof(void*)*6);
+x_39 = lean_ctor_get_uint8(x_18, sizeof(void*)*7);
 lean_dec(x_18);
-x_80 = lean_array_fget_borrowed(x_3, x_2);
-x_81 = l_Lean_Expr_fvarId_x21(x_80);
-lean_inc_ref(x_36);
-x_82 = lean_local_ctx_find(x_36, x_81);
-if (lean_obj_tag(x_82) == 0)
+x_81 = lean_array_fget_borrowed(x_3, x_2);
+x_82 = l_Lean_Expr_fvarId_x21(x_81);
+lean_inc_ref(x_37);
+x_83 = lean_local_ctx_find(x_37, x_82);
+if (lean_obj_tag(x_83) == 0)
 {
-lean_object* x_83; lean_object* x_84; 
-x_83 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
-x_84 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_83);
-x_63 = x_84;
-goto block_79;
+lean_object* x_84; lean_object* x_85; 
+x_84 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
+x_85 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_84);
+x_64 = x_85;
+goto block_80;
 }
 else
 {
-lean_object* x_85; 
-x_85 = lean_ctor_get(x_82, 0);
-lean_inc(x_85);
-lean_dec_ref(x_82);
-x_63 = x_85;
-goto block_79;
+lean_object* x_86; 
+x_86 = lean_ctor_get(x_83, 0);
+lean_inc(x_86);
+lean_dec_ref(x_83);
+x_64 = x_86;
+goto block_80;
 }
-block_35:
+block_36:
 {
 lean_object* x_21; uint8_t x_22; 
 x_21 = lean_st_ref_take(x_4);
@@ -2969,310 +2969,313 @@ return x_25;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
 x_26 = lean_ctor_get(x_21, 1);
 x_27 = lean_ctor_get(x_21, 2);
 x_28 = lean_ctor_get(x_21, 3);
 x_29 = lean_ctor_get(x_21, 4);
 x_30 = lean_ctor_get(x_21, 5);
-x_31 = lean_ctor_get_uint8(x_21, sizeof(void*)*6);
+x_31 = lean_ctor_get(x_21, 6);
+x_32 = lean_ctor_get_uint8(x_21, sizeof(void*)*7);
+lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_21);
-x_32 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_32, 0, x_20);
-lean_ctor_set(x_32, 1, x_26);
-lean_ctor_set(x_32, 2, x_27);
-lean_ctor_set(x_32, 3, x_28);
-lean_ctor_set(x_32, 4, x_29);
-lean_ctor_set(x_32, 5, x_30);
-lean_ctor_set_uint8(x_32, sizeof(void*)*6, x_31);
-x_33 = lean_st_ref_set(x_4, x_32);
-x_34 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_34, 0, x_19);
-return x_34;
+x_33 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_33, 0, x_20);
+lean_ctor_set(x_33, 1, x_26);
+lean_ctor_set(x_33, 2, x_27);
+lean_ctor_set(x_33, 3, x_28);
+lean_ctor_set(x_33, 4, x_29);
+lean_ctor_set(x_33, 5, x_30);
+lean_ctor_set(x_33, 6, x_31);
+lean_ctor_set_uint8(x_33, sizeof(void*)*7, x_32);
+x_34 = lean_st_ref_set(x_4, x_33);
+x_35 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_35, 0, x_19);
+return x_35;
 }
 }
-block_48:
+block_49:
 {
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
+lean_dec(x_41);
 lean_dec(x_40);
-lean_dec(x_39);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
-x_20 = x_41;
-goto block_35;
+x_20 = x_42;
+goto block_36;
 }
 case 2:
 {
+lean_dec(x_41);
 lean_dec(x_40);
-lean_dec(x_39);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
-x_20 = x_41;
-goto block_35;
+x_20 = x_42;
+goto block_36;
 }
 case 0:
 {
+lean_dec(x_41);
 lean_dec(x_40);
-lean_dec(x_39);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
-x_20 = x_41;
-goto block_35;
+x_20 = x_42;
+goto block_36;
 }
 case 1:
 {
+lean_dec(x_41);
 lean_dec(x_40);
-lean_dec(x_39);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
-x_20 = x_41;
-goto block_35;
+x_20 = x_42;
+goto block_36;
 }
 case 4:
 {
+lean_dec(x_41);
 lean_dec(x_40);
-lean_dec(x_39);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
-x_20 = x_41;
-goto block_35;
+x_20 = x_42;
+goto block_36;
 }
 case 3:
 {
+lean_dec(x_41);
 lean_dec(x_40);
-lean_dec(x_39);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
-x_20 = x_41;
-goto block_35;
+x_20 = x_42;
+goto block_36;
 }
 default: 
 {
-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_42 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___closed__2;
-lean_inc(x_39);
-x_43 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_43, 0, x_39);
-lean_ctor_set(x_43, 1, x_42);
-x_44 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_abstractFVarsRange_spec__5(x_40, x_36, x_9, x_2, x_3, x_37, x_1, x_39, x_43, x_38, x_41);
-lean_dec(x_40);
-x_45 = lean_ctor_get(x_44, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_44, 1);
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_43 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___closed__2;
+lean_inc(x_40);
+x_44 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_44, 0, x_40);
+lean_ctor_set(x_44, 1, x_43);
+x_45 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_abstractFVarsRange_spec__5(x_41, x_37, x_9, x_2, x_3, x_38, x_1, x_40, x_44, x_39, x_42);
+lean_dec(x_41);
+x_46 = lean_ctor_get(x_45, 0);
 lean_inc(x_46);
-lean_dec_ref(x_44);
-x_47 = lean_ctor_get(x_45, 0);
+x_47 = lean_ctor_get(x_45, 1);
 lean_inc(x_47);
-lean_dec(x_45);
-x_19 = x_47;
-x_20 = x_46;
-goto block_35;
+lean_dec_ref(x_45);
+x_48 = lean_ctor_get(x_46, 0);
+lean_inc(x_48);
+lean_dec(x_46);
+x_19 = x_48;
+x_20 = x_47;
+goto block_36;
 }
 }
 }
-block_54:
+block_55:
 {
-lean_object* x_52; uint8_t x_53; 
-x_52 = l_Lean_LocalDecl_index(x_51);
-lean_dec_ref(x_51);
-x_53 = lean_nat_dec_lt(x_52, x_50);
-lean_dec(x_52);
-if (x_53 == 0)
+lean_object* x_53; uint8_t x_54; 
+x_53 = l_Lean_LocalDecl_index(x_52);
+lean_dec_ref(x_52);
+x_54 = lean_nat_dec_lt(x_53, x_51);
+lean_dec(x_53);
+if (x_54 == 0)
 {
-x_39 = x_49;
 x_40 = x_50;
-x_41 = x_15;
-goto block_48;
+x_41 = x_51;
+x_42 = x_15;
+goto block_49;
 }
 else
 {
+lean_dec(x_51);
 lean_dec(x_50);
-lean_dec(x_49);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 }
-block_62:
+block_63:
 {
-lean_object* x_58; 
-lean_inc_ref(x_36);
-x_58 = lean_local_ctx_find(x_36, x_57);
-if (lean_obj_tag(x_58) == 0)
+lean_object* x_59; 
+lean_inc_ref(x_37);
+x_59 = lean_local_ctx_find(x_37, x_58);
+if (lean_obj_tag(x_59) == 0)
 {
-lean_object* x_59; lean_object* x_60; 
-x_59 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
-x_60 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_59);
-x_49 = x_55;
+lean_object* x_60; lean_object* x_61; 
+x_60 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
+x_61 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_60);
 x_50 = x_56;
-x_51 = x_60;
-goto block_54;
+x_51 = x_57;
+x_52 = x_61;
+goto block_55;
 }
 else
 {
-lean_object* x_61; 
-x_61 = lean_ctor_get(x_58, 0);
-lean_inc(x_61);
-lean_dec_ref(x_58);
-x_49 = x_55;
+lean_object* x_62; 
+x_62 = lean_ctor_get(x_59, 0);
+lean_inc(x_62);
+lean_dec_ref(x_59);
 x_50 = x_56;
-x_51 = x_61;
-goto block_54;
+x_51 = x_57;
+x_52 = x_62;
+goto block_55;
 }
 }
-block_79:
+block_80:
 {
-lean_object* x_64; 
-x_64 = lean_unsigned_to_nat(0u);
+lean_object* x_65; 
+x_65 = lean_unsigned_to_nat(0u);
 switch (lean_obj_tag(x_1)) {
 case 1:
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-lean_dec_ref(x_63);
+lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
-x_65 = lean_ctor_get(x_1, 0);
-x_66 = lean_unsigned_to_nat(1u);
-x_67 = lean_nat_sub(x_9, x_66);
-x_68 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsRange_go___redArg(x_2, x_3, x_65, x_64, x_67);
-if (lean_obj_tag(x_68) == 1)
+x_66 = lean_ctor_get(x_1, 0);
+x_67 = lean_unsigned_to_nat(1u);
+x_68 = lean_nat_sub(x_9, x_67);
+x_69 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsRange_go___redArg(x_2, x_3, x_66, x_65, x_68);
+if (lean_obj_tag(x_69) == 1)
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
 lean_dec_ref(x_1);
-x_69 = lean_ctor_get(x_68, 0);
-lean_inc(x_69);
-lean_dec_ref(x_68);
-x_70 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_abstractFVarsRange_spec__2___redArg(x_69, x_15);
-x_71 = lean_ctor_get(x_70, 0);
-lean_inc(x_71);
-x_72 = lean_ctor_get(x_70, 1);
+x_70 = lean_ctor_get(x_69, 0);
+lean_inc(x_70);
+lean_dec_ref(x_69);
+x_71 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_abstractFVarsRange_spec__2___redArg(x_70, x_15);
+x_72 = lean_ctor_get(x_71, 0);
 lean_inc(x_72);
-lean_dec_ref(x_70);
-x_19 = x_71;
-x_20 = x_72;
-goto block_35;
+x_73 = lean_ctor_get(x_71, 1);
+lean_inc(x_73);
+lean_dec_ref(x_71);
+x_19 = x_72;
+x_20 = x_73;
+goto block_36;
 }
 else
 {
-lean_dec(x_68);
+lean_dec(x_69);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 }
 case 9:
 {
-lean_dec_ref(x_63);
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 case 2:
 {
-lean_dec_ref(x_63);
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 case 0:
 {
-lean_dec_ref(x_63);
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 case 4:
 {
-lean_dec_ref(x_63);
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 case 3:
 {
-lean_dec_ref(x_63);
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 default: 
 {
 if (x_7 == 0)
 {
-lean_dec_ref(x_63);
+lean_dec_ref(x_64);
+lean_dec_ref(x_38);
 lean_dec_ref(x_37);
-lean_dec_ref(x_36);
 x_19 = x_1;
 x_20 = x_15;
-goto block_35;
+goto block_36;
 }
 else
 {
-lean_object* x_73; lean_object* x_74; 
-x_73 = l_Lean_LocalDecl_index(x_63);
-lean_dec_ref(x_63);
-lean_inc_ref(x_37);
-x_74 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_abstractFVarsRange_spec__3___redArg(x_37, x_1);
-if (lean_obj_tag(x_74) == 1)
+lean_object* x_74; lean_object* x_75; 
+x_74 = l_Lean_LocalDecl_index(x_64);
+lean_dec_ref(x_64);
+lean_inc_ref(x_38);
+x_75 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_abstractFVarsRange_spec__3___redArg(x_38, x_1);
+if (lean_obj_tag(x_75) == 1)
 {
-lean_object* x_75; 
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-lean_dec_ref(x_74);
-if (lean_obj_tag(x_75) == 0)
-{
-lean_object* x_76; lean_object* x_77; 
-x_76 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
-x_77 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__4(x_76);
-x_55 = x_64;
-x_56 = x_73;
-x_57 = x_77;
-goto block_62;
-}
-else
-{
-lean_object* x_78; 
-x_78 = lean_ctor_get(x_75, 0);
-lean_inc(x_78);
+lean_object* x_76; 
+x_76 = lean_ctor_get(x_75, 0);
+lean_inc(x_76);
 lean_dec_ref(x_75);
-x_55 = x_64;
-x_56 = x_73;
-x_57 = x_78;
-goto block_62;
+if (lean_obj_tag(x_76) == 0)
+{
+lean_object* x_77; lean_object* x_78; 
+x_77 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
+x_78 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__4(x_77);
+x_56 = x_65;
+x_57 = x_74;
+x_58 = x_78;
+goto block_63;
+}
+else
+{
+lean_object* x_79; 
+x_79 = lean_ctor_get(x_76, 0);
+lean_inc(x_79);
+lean_dec_ref(x_76);
+x_56 = x_65;
+x_57 = x_74;
+x_58 = x_79;
+goto block_63;
 }
 }
 else
 {
-lean_dec(x_74);
-x_39 = x_64;
-x_40 = x_73;
-x_41 = x_15;
-goto block_48;
+lean_dec(x_75);
+x_40 = x_65;
+x_41 = x_74;
+x_42 = x_15;
+goto block_49;
 }
 }
 }
@@ -3281,382 +3284,389 @@ goto block_48;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_111; lean_object* x_112; uint8_t x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_138; lean_object* x_155; lean_object* x_156; lean_object* x_157; 
-x_86 = lean_ctor_get(x_13, 0);
-x_87 = lean_ctor_get(x_13, 1);
-x_88 = lean_ctor_get(x_13, 2);
-x_89 = lean_ctor_get(x_13, 3);
-x_90 = lean_ctor_get(x_13, 4);
-x_91 = lean_ctor_get(x_13, 5);
-x_92 = lean_ctor_get_uint8(x_13, sizeof(void*)*6);
+lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; uint8_t x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_114; lean_object* x_115; uint8_t x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_141; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
+x_87 = lean_ctor_get(x_13, 0);
+x_88 = lean_ctor_get(x_13, 1);
+x_89 = lean_ctor_get(x_13, 2);
+x_90 = lean_ctor_get(x_13, 3);
+x_91 = lean_ctor_get(x_13, 4);
+x_92 = lean_ctor_get(x_13, 5);
+x_93 = lean_ctor_get(x_13, 6);
+x_94 = lean_ctor_get_uint8(x_13, sizeof(void*)*7);
+lean_inc(x_93);
+lean_inc(x_92);
 lean_inc(x_91);
 lean_inc(x_90);
 lean_inc(x_89);
 lean_inc(x_88);
 lean_inc(x_87);
-lean_inc(x_86);
 lean_dec(x_13);
-x_93 = l_Lean_Meta_Sym_abstractFVarsRange___redArg___closed__0;
-x_94 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_94, 0, x_93);
-lean_ctor_set(x_94, 1, x_87);
-lean_ctor_set(x_94, 2, x_88);
-lean_ctor_set(x_94, 3, x_89);
-lean_ctor_set(x_94, 4, x_90);
-lean_ctor_set(x_94, 5, x_91);
-lean_ctor_set_uint8(x_94, sizeof(void*)*6, x_92);
-x_95 = lean_st_ref_set(x_4, x_94);
-x_96 = lean_st_ref_get(x_4);
-x_111 = lean_ctor_get(x_5, 2);
-lean_inc_ref(x_111);
+x_95 = l_Lean_Meta_Sym_abstractFVarsRange___redArg___closed__0;
+x_96 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_96, 0, x_95);
+lean_ctor_set(x_96, 1, x_88);
+lean_ctor_set(x_96, 2, x_89);
+lean_ctor_set(x_96, 3, x_90);
+lean_ctor_set(x_96, 4, x_91);
+lean_ctor_set(x_96, 5, x_92);
+lean_ctor_set(x_96, 6, x_93);
+lean_ctor_set_uint8(x_96, sizeof(void*)*7, x_94);
+x_97 = lean_st_ref_set(x_4, x_96);
+x_98 = lean_st_ref_get(x_4);
+x_114 = lean_ctor_get(x_5, 2);
+lean_inc_ref(x_114);
 lean_dec_ref(x_5);
-x_112 = lean_ctor_get(x_12, 1);
-lean_inc_ref(x_112);
+x_115 = lean_ctor_get(x_12, 1);
+lean_inc_ref(x_115);
 lean_dec(x_12);
-x_113 = lean_ctor_get_uint8(x_96, sizeof(void*)*6);
-lean_dec(x_96);
-x_155 = lean_array_fget_borrowed(x_3, x_2);
-x_156 = l_Lean_Expr_fvarId_x21(x_155);
-lean_inc_ref(x_111);
-x_157 = lean_local_ctx_find(x_111, x_156);
-if (lean_obj_tag(x_157) == 0)
+x_116 = lean_ctor_get_uint8(x_98, sizeof(void*)*7);
+lean_dec(x_98);
+x_158 = lean_array_fget_borrowed(x_3, x_2);
+x_159 = l_Lean_Expr_fvarId_x21(x_158);
+lean_inc_ref(x_114);
+x_160 = lean_local_ctx_find(x_114, x_159);
+if (lean_obj_tag(x_160) == 0)
 {
-lean_object* x_158; lean_object* x_159; 
-x_158 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
-x_159 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_158);
-x_138 = x_159;
-goto block_154;
+lean_object* x_161; lean_object* x_162; 
+x_161 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
+x_162 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_161);
+x_141 = x_162;
+goto block_157;
 }
 else
 {
-lean_object* x_160; 
-x_160 = lean_ctor_get(x_157, 0);
-lean_inc(x_160);
-lean_dec_ref(x_157);
-x_138 = x_160;
-goto block_154;
+lean_object* x_163; 
+x_163 = lean_ctor_get(x_160, 0);
+lean_inc(x_163);
+lean_dec_ref(x_160);
+x_141 = x_163;
+goto block_157;
 }
-block_110:
+block_113:
 {
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_99 = lean_st_ref_take(x_4);
-x_100 = lean_ctor_get(x_99, 1);
-lean_inc_ref(x_100);
-x_101 = lean_ctor_get(x_99, 2);
-lean_inc_ref(x_101);
-x_102 = lean_ctor_get(x_99, 3);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; 
+x_101 = lean_st_ref_take(x_4);
+x_102 = lean_ctor_get(x_101, 1);
 lean_inc_ref(x_102);
-x_103 = lean_ctor_get(x_99, 4);
+x_103 = lean_ctor_get(x_101, 2);
 lean_inc_ref(x_103);
-x_104 = lean_ctor_get(x_99, 5);
+x_104 = lean_ctor_get(x_101, 3);
 lean_inc_ref(x_104);
-x_105 = lean_ctor_get_uint8(x_99, sizeof(void*)*6);
-if (lean_is_exclusive(x_99)) {
- lean_ctor_release(x_99, 0);
- lean_ctor_release(x_99, 1);
- lean_ctor_release(x_99, 2);
- lean_ctor_release(x_99, 3);
- lean_ctor_release(x_99, 4);
- lean_ctor_release(x_99, 5);
- x_106 = x_99;
+x_105 = lean_ctor_get(x_101, 4);
+lean_inc_ref(x_105);
+x_106 = lean_ctor_get(x_101, 5);
+lean_inc_ref(x_106);
+x_107 = lean_ctor_get(x_101, 6);
+lean_inc_ref(x_107);
+x_108 = lean_ctor_get_uint8(x_101, sizeof(void*)*7);
+if (lean_is_exclusive(x_101)) {
+ lean_ctor_release(x_101, 0);
+ lean_ctor_release(x_101, 1);
+ lean_ctor_release(x_101, 2);
+ lean_ctor_release(x_101, 3);
+ lean_ctor_release(x_101, 4);
+ lean_ctor_release(x_101, 5);
+ lean_ctor_release(x_101, 6);
+ x_109 = x_101;
 } else {
- lean_dec_ref(x_99);
- x_106 = lean_box(0);
+ lean_dec_ref(x_101);
+ x_109 = lean_box(0);
 }
-if (lean_is_scalar(x_106)) {
- x_107 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_109)) {
+ x_110 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_107 = x_106;
+ x_110 = x_109;
 }
-lean_ctor_set(x_107, 0, x_98);
-lean_ctor_set(x_107, 1, x_100);
-lean_ctor_set(x_107, 2, x_101);
-lean_ctor_set(x_107, 3, x_102);
-lean_ctor_set(x_107, 4, x_103);
-lean_ctor_set(x_107, 5, x_104);
-lean_ctor_set_uint8(x_107, sizeof(void*)*6, x_105);
-x_108 = lean_st_ref_set(x_4, x_107);
-x_109 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_109, 0, x_97);
-return x_109;
+lean_ctor_set(x_110, 0, x_100);
+lean_ctor_set(x_110, 1, x_102);
+lean_ctor_set(x_110, 2, x_103);
+lean_ctor_set(x_110, 3, x_104);
+lean_ctor_set(x_110, 4, x_105);
+lean_ctor_set(x_110, 5, x_106);
+lean_ctor_set(x_110, 6, x_107);
+lean_ctor_set_uint8(x_110, sizeof(void*)*7, x_108);
+x_111 = lean_st_ref_set(x_4, x_110);
+x_112 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_112, 0, x_99);
+return x_112;
 }
-block_123:
+block_126:
 {
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_dec(x_115);
-lean_dec(x_114);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_116;
-goto block_110;
+lean_dec(x_118);
+lean_dec(x_117);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_119;
+goto block_113;
 }
 case 2:
 {
-lean_dec(x_115);
-lean_dec(x_114);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_116;
-goto block_110;
+lean_dec(x_118);
+lean_dec(x_117);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_119;
+goto block_113;
 }
 case 0:
 {
-lean_dec(x_115);
-lean_dec(x_114);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_116;
-goto block_110;
+lean_dec(x_118);
+lean_dec(x_117);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_119;
+goto block_113;
 }
 case 1:
 {
-lean_dec(x_115);
-lean_dec(x_114);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_116;
-goto block_110;
+lean_dec(x_118);
+lean_dec(x_117);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_119;
+goto block_113;
 }
 case 4:
 {
-lean_dec(x_115);
-lean_dec(x_114);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_116;
-goto block_110;
+lean_dec(x_118);
+lean_dec(x_117);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_119;
+goto block_113;
 }
 case 3:
 {
-lean_dec(x_115);
-lean_dec(x_114);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_116;
-goto block_110;
+lean_dec(x_118);
+lean_dec(x_117);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_119;
+goto block_113;
 }
 default: 
 {
-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_117 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___closed__2;
-lean_inc(x_114);
-x_118 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_118, 0, x_114);
-lean_ctor_set(x_118, 1, x_117);
-x_119 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_abstractFVarsRange_spec__5(x_115, x_111, x_9, x_2, x_3, x_112, x_1, x_114, x_118, x_113, x_116);
-lean_dec(x_115);
-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_ref(x_119);
-x_122 = lean_ctor_get(x_120, 0);
-lean_inc(x_122);
-lean_dec(x_120);
-x_97 = x_122;
-x_98 = x_121;
-goto block_110;
+lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_120 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___closed__2;
+lean_inc(x_117);
+x_121 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_121, 0, x_117);
+lean_ctor_set(x_121, 1, x_120);
+x_122 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_abstractFVarsRange_spec__5(x_118, x_114, x_9, x_2, x_3, x_115, x_1, x_117, x_121, x_116, x_119);
+lean_dec(x_118);
+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_ref(x_122);
+x_125 = lean_ctor_get(x_123, 0);
+lean_inc(x_125);
+lean_dec(x_123);
+x_99 = x_125;
+x_100 = x_124;
+goto block_113;
 }
 }
 }
-block_129:
+block_132:
 {
-lean_object* x_127; uint8_t x_128; 
-x_127 = l_Lean_LocalDecl_index(x_126);
-lean_dec_ref(x_126);
-x_128 = lean_nat_dec_lt(x_127, x_125);
+lean_object* x_130; uint8_t x_131; 
+x_130 = l_Lean_LocalDecl_index(x_129);
+lean_dec_ref(x_129);
+x_131 = lean_nat_dec_lt(x_130, x_128);
+lean_dec(x_130);
+if (x_131 == 0)
+{
+x_117 = x_127;
+x_118 = x_128;
+x_119 = x_87;
+goto block_126;
+}
+else
+{
+lean_dec(x_128);
 lean_dec(x_127);
-if (x_128 == 0)
-{
-x_114 = x_124;
-x_115 = x_125;
-x_116 = x_86;
-goto block_123;
-}
-else
-{
-lean_dec(x_125);
-lean_dec(x_124);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 }
-block_137:
-{
-lean_object* x_133; 
-lean_inc_ref(x_111);
-x_133 = lean_local_ctx_find(x_111, x_132);
-if (lean_obj_tag(x_133) == 0)
-{
-lean_object* x_134; lean_object* x_135; 
-x_134 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
-x_135 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_134);
-x_124 = x_130;
-x_125 = x_131;
-x_126 = x_135;
-goto block_129;
-}
-else
+block_140:
 {
 lean_object* x_136; 
-x_136 = lean_ctor_get(x_133, 0);
-lean_inc(x_136);
-lean_dec_ref(x_133);
-x_124 = x_130;
-x_125 = x_131;
-x_126 = x_136;
-goto block_129;
+lean_inc_ref(x_114);
+x_136 = lean_local_ctx_find(x_114, x_135);
+if (lean_obj_tag(x_136) == 0)
+{
+lean_object* x_137; lean_object* x_138; 
+x_137 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
+x_138 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__1(x_137);
+x_127 = x_133;
+x_128 = x_134;
+x_129 = x_138;
+goto block_132;
 }
-}
-block_154:
+else
 {
 lean_object* x_139; 
-x_139 = lean_unsigned_to_nat(0u);
+x_139 = lean_ctor_get(x_136, 0);
+lean_inc(x_139);
+lean_dec_ref(x_136);
+x_127 = x_133;
+x_128 = x_134;
+x_129 = x_139;
+goto block_132;
+}
+}
+block_157:
+{
+lean_object* x_142; 
+x_142 = lean_unsigned_to_nat(0u);
 switch (lean_obj_tag(x_1)) {
 case 1:
 {
-lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_140 = lean_ctor_get(x_1, 0);
-x_141 = lean_unsigned_to_nat(1u);
-x_142 = lean_nat_sub(x_9, x_141);
-x_143 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsRange_go___redArg(x_2, x_3, x_140, x_139, x_142);
-if (lean_obj_tag(x_143) == 1)
+lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; 
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_143 = lean_ctor_get(x_1, 0);
+x_144 = lean_unsigned_to_nat(1u);
+x_145 = lean_nat_sub(x_9, x_144);
+x_146 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsRange_go___redArg(x_2, x_3, x_143, x_142, x_145);
+if (lean_obj_tag(x_146) == 1)
 {
-lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
 lean_dec_ref(x_1);
-x_144 = lean_ctor_get(x_143, 0);
-lean_inc(x_144);
-lean_dec_ref(x_143);
-x_145 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_abstractFVarsRange_spec__2___redArg(x_144, x_86);
-x_146 = lean_ctor_get(x_145, 0);
-lean_inc(x_146);
-x_147 = lean_ctor_get(x_145, 1);
+x_147 = lean_ctor_get(x_146, 0);
 lean_inc(x_147);
-lean_dec_ref(x_145);
-x_97 = x_146;
-x_98 = x_147;
-goto block_110;
+lean_dec_ref(x_146);
+x_148 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_abstractFVarsRange_spec__2___redArg(x_147, x_87);
+x_149 = lean_ctor_get(x_148, 0);
+lean_inc(x_149);
+x_150 = lean_ctor_get(x_148, 1);
+lean_inc(x_150);
+lean_dec_ref(x_148);
+x_99 = x_149;
+x_100 = x_150;
+goto block_113;
 }
 else
 {
-lean_dec(x_143);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec(x_146);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 }
 case 9:
 {
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 case 2:
 {
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 case 0:
 {
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 case 4:
 {
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 case 3:
 {
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 default: 
 {
 if (x_7 == 0)
 {
-lean_dec_ref(x_138);
-lean_dec_ref(x_112);
-lean_dec_ref(x_111);
-x_97 = x_1;
-x_98 = x_86;
-goto block_110;
+lean_dec_ref(x_141);
+lean_dec_ref(x_115);
+lean_dec_ref(x_114);
+x_99 = x_1;
+x_100 = x_87;
+goto block_113;
 }
 else
 {
-lean_object* x_148; lean_object* x_149; 
-x_148 = l_Lean_LocalDecl_index(x_138);
-lean_dec_ref(x_138);
-lean_inc_ref(x_112);
-x_149 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_abstractFVarsRange_spec__3___redArg(x_112, x_1);
-if (lean_obj_tag(x_149) == 1)
-{
-lean_object* x_150; 
-x_150 = lean_ctor_get(x_149, 0);
-lean_inc(x_150);
-lean_dec_ref(x_149);
-if (lean_obj_tag(x_150) == 0)
-{
 lean_object* x_151; lean_object* x_152; 
-x_151 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
-x_152 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__4(x_151);
-x_130 = x_139;
-x_131 = x_148;
-x_132 = x_152;
-goto block_137;
-}
-else
+x_151 = l_Lean_LocalDecl_index(x_141);
+lean_dec_ref(x_141);
+lean_inc_ref(x_115);
+x_152 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_abstractFVarsRange_spec__3___redArg(x_115, x_1);
+if (lean_obj_tag(x_152) == 1)
 {
 lean_object* x_153; 
-x_153 = lean_ctor_get(x_150, 0);
+x_153 = lean_ctor_get(x_152, 0);
 lean_inc(x_153);
-lean_dec_ref(x_150);
-x_130 = x_139;
-x_131 = x_148;
-x_132 = x_153;
-goto block_137;
+lean_dec_ref(x_152);
+if (lean_obj_tag(x_153) == 0)
+{
+lean_object* x_154; lean_object* x_155; 
+x_154 = l___private_Lean_Meta_Sym_AbstractS_0__Lean_Meta_Sym_abstractFVarsCore___lam__0___closed__3;
+x_155 = l_panic___at___00Lean_Meta_Sym_abstractFVarsRange_spec__4(x_154);
+x_133 = x_142;
+x_134 = x_151;
+x_135 = x_155;
+goto block_140;
+}
+else
+{
+lean_object* x_156; 
+x_156 = lean_ctor_get(x_153, 0);
+lean_inc(x_156);
+lean_dec_ref(x_153);
+x_133 = x_142;
+x_134 = x_151;
+x_135 = x_156;
+goto block_140;
 }
 }
 else
 {
-lean_dec(x_149);
-x_114 = x_139;
-x_115 = x_148;
-x_116 = x_86;
-goto block_123;
+lean_dec(x_152);
+x_117 = x_142;
+x_118 = x_151;
+x_119 = x_87;
+goto block_126;
 }
 }
 }
@@ -3839,7 +3849,7 @@ _start:
 {
 lean_object* x_12; lean_object* x_13; lean_object* x_17; uint8_t x_18; 
 x_17 = lean_st_ref_get(x_6);
-x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
 lean_dec(x_17);
 if (x_18 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Sym/AlphaShareBuilder.c b/stage0/stdlib/Lean/Meta/Sym/AlphaShareBuilder.c
index b2026ddd5c..be4001c442 100644
--- a/stage0/stdlib/Lean/Meta/Sym/AlphaShareBuilder.c
+++ b/stage0/stdlib/Lean/Meta/Sym/AlphaShareBuilder.c
@@ -1103,14 +1103,16 @@ return x_18;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
 x_19 = lean_ctor_get(x_12, 0);
 x_20 = lean_ctor_get(x_12, 1);
 x_21 = lean_ctor_get(x_12, 2);
 x_22 = lean_ctor_get(x_12, 3);
 x_23 = lean_ctor_get(x_12, 4);
 x_24 = lean_ctor_get(x_12, 5);
-x_25 = lean_ctor_get_uint8(x_12, sizeof(void*)*6);
+x_25 = lean_ctor_get(x_12, 6);
+x_26 = lean_ctor_get_uint8(x_12, sizeof(void*)*7);
+lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
@@ -1118,21 +1120,22 @@ lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_dec(x_12);
-x_26 = lean_box(0);
+x_27 = lean_box(0);
 lean_inc_ref(x_1);
-x_27 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_Internal_Sym_share1_spec__1___redArg(x_19, x_1, x_26);
-x_28 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_28, 0, x_27);
-lean_ctor_set(x_28, 1, x_20);
-lean_ctor_set(x_28, 2, x_21);
-lean_ctor_set(x_28, 3, x_22);
-lean_ctor_set(x_28, 4, x_23);
-lean_ctor_set(x_28, 5, x_24);
-lean_ctor_set_uint8(x_28, sizeof(void*)*6, x_25);
-x_29 = lean_st_ref_set(x_2, x_28);
-x_30 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_30, 0, x_1);
-return x_30;
+x_28 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_Internal_Sym_share1_spec__1___redArg(x_19, x_1, x_27);
+x_29 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_20);
+lean_ctor_set(x_29, 2, x_21);
+lean_ctor_set(x_29, 3, x_22);
+lean_ctor_set(x_29, 4, x_23);
+lean_ctor_set(x_29, 5, x_24);
+lean_ctor_set(x_29, 6, x_25);
+lean_ctor_set_uint8(x_29, sizeof(void*)*7, x_26);
+x_30 = lean_st_ref_set(x_2, x_29);
+x_31 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_31, 0, x_1);
+return x_31;
 }
 }
 }
@@ -1811,7 +1814,7 @@ x_7 = l_Lean_Meta_Sym_Internal_liftBuilderM___redArg___closed__2;
 lean_ctor_set(x_4, 0, x_7);
 x_8 = lean_st_ref_set(x_2, x_4);
 x_9 = lean_st_ref_get(x_2);
-x_10 = lean_ctor_get_uint8(x_9, sizeof(void*)*6);
+x_10 = lean_ctor_get_uint8(x_9, sizeof(void*)*7);
 lean_dec(x_9);
 x_11 = lean_box(x_10);
 x_12 = lean_apply_2(x_1, x_11, x_6);
@@ -1835,110 +1838,120 @@ return x_19;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
 x_20 = lean_ctor_get(x_15, 1);
 x_21 = lean_ctor_get(x_15, 2);
 x_22 = lean_ctor_get(x_15, 3);
 x_23 = lean_ctor_get(x_15, 4);
 x_24 = lean_ctor_get(x_15, 5);
-x_25 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_25 = lean_ctor_get(x_15, 6);
+x_26 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
+lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_dec(x_15);
-x_26 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_26, 0, x_14);
-lean_ctor_set(x_26, 1, x_20);
-lean_ctor_set(x_26, 2, x_21);
-lean_ctor_set(x_26, 3, x_22);
-lean_ctor_set(x_26, 4, x_23);
-lean_ctor_set(x_26, 5, x_24);
-lean_ctor_set_uint8(x_26, sizeof(void*)*6, x_25);
-x_27 = lean_st_ref_set(x_2, x_26);
-x_28 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_28, 0, x_13);
-return x_28;
+x_27 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_27, 0, x_14);
+lean_ctor_set(x_27, 1, x_20);
+lean_ctor_set(x_27, 2, x_21);
+lean_ctor_set(x_27, 3, x_22);
+lean_ctor_set(x_27, 4, x_23);
+lean_ctor_set(x_27, 5, x_24);
+lean_ctor_set(x_27, 6, x_25);
+lean_ctor_set_uint8(x_27, sizeof(void*)*7, x_26);
+x_28 = lean_st_ref_set(x_2, x_27);
+x_29 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_29, 0, x_13);
+return x_29;
 }
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_29 = lean_ctor_get(x_4, 0);
-x_30 = lean_ctor_get(x_4, 1);
-x_31 = lean_ctor_get(x_4, 2);
-x_32 = lean_ctor_get(x_4, 3);
-x_33 = lean_ctor_get(x_4, 4);
-x_34 = lean_ctor_get(x_4, 5);
-x_35 = lean_ctor_get_uint8(x_4, sizeof(void*)*6);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; uint8_t x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_30 = lean_ctor_get(x_4, 0);
+x_31 = lean_ctor_get(x_4, 1);
+x_32 = lean_ctor_get(x_4, 2);
+x_33 = lean_ctor_get(x_4, 3);
+x_34 = lean_ctor_get(x_4, 4);
+x_35 = lean_ctor_get(x_4, 5);
+x_36 = lean_ctor_get(x_4, 6);
+x_37 = lean_ctor_get_uint8(x_4, sizeof(void*)*7);
+lean_inc(x_36);
+lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
-lean_inc(x_29);
 lean_dec(x_4);
-x_36 = l_Lean_Meta_Sym_Internal_liftBuilderM___redArg___closed__2;
-x_37 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_30);
-lean_ctor_set(x_37, 2, x_31);
-lean_ctor_set(x_37, 3, x_32);
-lean_ctor_set(x_37, 4, x_33);
-lean_ctor_set(x_37, 5, x_34);
-lean_ctor_set_uint8(x_37, sizeof(void*)*6, x_35);
-x_38 = lean_st_ref_set(x_2, x_37);
-x_39 = lean_st_ref_get(x_2);
-x_40 = lean_ctor_get_uint8(x_39, sizeof(void*)*6);
-lean_dec(x_39);
-x_41 = lean_box(x_40);
-x_42 = lean_apply_2(x_1, x_41, x_29);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-lean_dec_ref(x_42);
-x_45 = lean_st_ref_take(x_2);
-x_46 = lean_ctor_get(x_45, 1);
-lean_inc_ref(x_46);
-x_47 = lean_ctor_get(x_45, 2);
-lean_inc_ref(x_47);
-x_48 = lean_ctor_get(x_45, 3);
+x_38 = l_Lean_Meta_Sym_Internal_liftBuilderM___redArg___closed__2;
+x_39 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_39, 0, x_38);
+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_35);
+lean_ctor_set(x_39, 6, x_36);
+lean_ctor_set_uint8(x_39, sizeof(void*)*7, x_37);
+x_40 = lean_st_ref_set(x_2, x_39);
+x_41 = lean_st_ref_get(x_2);
+x_42 = lean_ctor_get_uint8(x_41, sizeof(void*)*7);
+lean_dec(x_41);
+x_43 = lean_box(x_42);
+x_44 = lean_apply_2(x_1, x_43, x_30);
+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_ref(x_44);
+x_47 = lean_st_ref_take(x_2);
+x_48 = lean_ctor_get(x_47, 1);
 lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_45, 4);
+x_49 = lean_ctor_get(x_47, 2);
 lean_inc_ref(x_49);
-x_50 = lean_ctor_get(x_45, 5);
+x_50 = lean_ctor_get(x_47, 3);
 lean_inc_ref(x_50);
-x_51 = lean_ctor_get_uint8(x_45, sizeof(void*)*6);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- lean_ctor_release(x_45, 2);
- lean_ctor_release(x_45, 3);
- lean_ctor_release(x_45, 4);
- lean_ctor_release(x_45, 5);
- x_52 = x_45;
+x_51 = lean_ctor_get(x_47, 4);
+lean_inc_ref(x_51);
+x_52 = lean_ctor_get(x_47, 5);
+lean_inc_ref(x_52);
+x_53 = lean_ctor_get(x_47, 6);
+lean_inc_ref(x_53);
+x_54 = lean_ctor_get_uint8(x_47, sizeof(void*)*7);
+if (lean_is_exclusive(x_47)) {
+ lean_ctor_release(x_47, 0);
+ lean_ctor_release(x_47, 1);
+ lean_ctor_release(x_47, 2);
+ lean_ctor_release(x_47, 3);
+ lean_ctor_release(x_47, 4);
+ lean_ctor_release(x_47, 5);
+ lean_ctor_release(x_47, 6);
+ x_55 = x_47;
 } else {
- lean_dec_ref(x_45);
- x_52 = lean_box(0);
+ lean_dec_ref(x_47);
+ x_55 = lean_box(0);
 }
-if (lean_is_scalar(x_52)) {
- x_53 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_55)) {
+ x_56 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_53 = x_52;
+ x_56 = x_55;
 }
-lean_ctor_set(x_53, 0, x_44);
-lean_ctor_set(x_53, 1, x_46);
-lean_ctor_set(x_53, 2, x_47);
-lean_ctor_set(x_53, 3, x_48);
-lean_ctor_set(x_53, 4, x_49);
-lean_ctor_set(x_53, 5, x_50);
-lean_ctor_set_uint8(x_53, sizeof(void*)*6, x_51);
-x_54 = lean_st_ref_set(x_2, x_53);
-x_55 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_55, 0, x_43);
-return x_55;
+lean_ctor_set(x_56, 0, x_46);
+lean_ctor_set(x_56, 1, x_48);
+lean_ctor_set(x_56, 2, x_49);
+lean_ctor_set(x_56, 3, x_50);
+lean_ctor_set(x_56, 4, x_51);
+lean_ctor_set(x_56, 5, x_52);
+lean_ctor_set(x_56, 6, x_53);
+lean_ctor_set_uint8(x_56, sizeof(void*)*7, x_54);
+x_57 = lean_st_ref_set(x_2, x_56);
+x_58 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_58, 0, x_45);
+return x_58;
 }
 }
 }
@@ -1965,7 +1978,7 @@ x_13 = l_Lean_Meta_Sym_Internal_liftBuilderM___redArg___closed__2;
 lean_ctor_set(x_10, 0, x_13);
 x_14 = lean_st_ref_set(x_4, x_10);
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 x_17 = lean_box(x_16);
 x_18 = lean_apply_2(x_2, x_17, x_12);
@@ -1989,110 +2002,120 @@ return x_25;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
 x_26 = lean_ctor_get(x_21, 1);
 x_27 = lean_ctor_get(x_21, 2);
 x_28 = lean_ctor_get(x_21, 3);
 x_29 = lean_ctor_get(x_21, 4);
 x_30 = lean_ctor_get(x_21, 5);
-x_31 = lean_ctor_get_uint8(x_21, sizeof(void*)*6);
+x_31 = lean_ctor_get(x_21, 6);
+x_32 = lean_ctor_get_uint8(x_21, sizeof(void*)*7);
+lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_21);
-x_32 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_32, 0, x_20);
-lean_ctor_set(x_32, 1, x_26);
-lean_ctor_set(x_32, 2, x_27);
-lean_ctor_set(x_32, 3, x_28);
-lean_ctor_set(x_32, 4, x_29);
-lean_ctor_set(x_32, 5, x_30);
-lean_ctor_set_uint8(x_32, sizeof(void*)*6, x_31);
-x_33 = lean_st_ref_set(x_4, x_32);
-x_34 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_34, 0, x_19);
-return x_34;
+x_33 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_33, 0, x_20);
+lean_ctor_set(x_33, 1, x_26);
+lean_ctor_set(x_33, 2, x_27);
+lean_ctor_set(x_33, 3, x_28);
+lean_ctor_set(x_33, 4, x_29);
+lean_ctor_set(x_33, 5, x_30);
+lean_ctor_set(x_33, 6, x_31);
+lean_ctor_set_uint8(x_33, sizeof(void*)*7, x_32);
+x_34 = lean_st_ref_set(x_4, x_33);
+x_35 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_35, 0, x_19);
+return x_35;
 }
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 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; lean_object* x_51; 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_59; lean_object* x_60; lean_object* x_61; 
-x_35 = lean_ctor_get(x_10, 0);
-x_36 = lean_ctor_get(x_10, 1);
-x_37 = lean_ctor_get(x_10, 2);
-x_38 = lean_ctor_get(x_10, 3);
-x_39 = lean_ctor_get(x_10, 4);
-x_40 = lean_ctor_get(x_10, 5);
-x_41 = lean_ctor_get_uint8(x_10, sizeof(void*)*6);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_36 = lean_ctor_get(x_10, 0);
+x_37 = lean_ctor_get(x_10, 1);
+x_38 = lean_ctor_get(x_10, 2);
+x_39 = lean_ctor_get(x_10, 3);
+x_40 = lean_ctor_get(x_10, 4);
+x_41 = lean_ctor_get(x_10, 5);
+x_42 = lean_ctor_get(x_10, 6);
+x_43 = lean_ctor_get_uint8(x_10, sizeof(void*)*7);
+lean_inc(x_42);
+lean_inc(x_41);
 lean_inc(x_40);
 lean_inc(x_39);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
-lean_inc(x_35);
 lean_dec(x_10);
-x_42 = l_Lean_Meta_Sym_Internal_liftBuilderM___redArg___closed__2;
-x_43 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_43, 0, x_42);
-lean_ctor_set(x_43, 1, x_36);
-lean_ctor_set(x_43, 2, x_37);
-lean_ctor_set(x_43, 3, x_38);
-lean_ctor_set(x_43, 4, x_39);
-lean_ctor_set(x_43, 5, x_40);
-lean_ctor_set_uint8(x_43, sizeof(void*)*6, x_41);
-x_44 = lean_st_ref_set(x_4, x_43);
-x_45 = lean_st_ref_get(x_4);
-x_46 = lean_ctor_get_uint8(x_45, sizeof(void*)*6);
-lean_dec(x_45);
-x_47 = lean_box(x_46);
-x_48 = lean_apply_2(x_2, x_47, x_35);
-x_49 = lean_ctor_get(x_48, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_48, 1);
-lean_inc(x_50);
-lean_dec_ref(x_48);
-x_51 = lean_st_ref_take(x_4);
-x_52 = lean_ctor_get(x_51, 1);
-lean_inc_ref(x_52);
-x_53 = lean_ctor_get(x_51, 2);
-lean_inc_ref(x_53);
-x_54 = lean_ctor_get(x_51, 3);
+x_44 = l_Lean_Meta_Sym_Internal_liftBuilderM___redArg___closed__2;
+x_45 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_37);
+lean_ctor_set(x_45, 2, x_38);
+lean_ctor_set(x_45, 3, x_39);
+lean_ctor_set(x_45, 4, x_40);
+lean_ctor_set(x_45, 5, x_41);
+lean_ctor_set(x_45, 6, x_42);
+lean_ctor_set_uint8(x_45, sizeof(void*)*7, x_43);
+x_46 = lean_st_ref_set(x_4, x_45);
+x_47 = lean_st_ref_get(x_4);
+x_48 = lean_ctor_get_uint8(x_47, sizeof(void*)*7);
+lean_dec(x_47);
+x_49 = lean_box(x_48);
+x_50 = lean_apply_2(x_2, x_49, x_36);
+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_ref(x_50);
+x_53 = lean_st_ref_take(x_4);
+x_54 = lean_ctor_get(x_53, 1);
 lean_inc_ref(x_54);
-x_55 = lean_ctor_get(x_51, 4);
+x_55 = lean_ctor_get(x_53, 2);
 lean_inc_ref(x_55);
-x_56 = lean_ctor_get(x_51, 5);
+x_56 = lean_ctor_get(x_53, 3);
 lean_inc_ref(x_56);
-x_57 = lean_ctor_get_uint8(x_51, sizeof(void*)*6);
-if (lean_is_exclusive(x_51)) {
- lean_ctor_release(x_51, 0);
- lean_ctor_release(x_51, 1);
- lean_ctor_release(x_51, 2);
- lean_ctor_release(x_51, 3);
- lean_ctor_release(x_51, 4);
- lean_ctor_release(x_51, 5);
- x_58 = x_51;
+x_57 = lean_ctor_get(x_53, 4);
+lean_inc_ref(x_57);
+x_58 = lean_ctor_get(x_53, 5);
+lean_inc_ref(x_58);
+x_59 = lean_ctor_get(x_53, 6);
+lean_inc_ref(x_59);
+x_60 = lean_ctor_get_uint8(x_53, sizeof(void*)*7);
+if (lean_is_exclusive(x_53)) {
+ lean_ctor_release(x_53, 0);
+ lean_ctor_release(x_53, 1);
+ lean_ctor_release(x_53, 2);
+ lean_ctor_release(x_53, 3);
+ lean_ctor_release(x_53, 4);
+ lean_ctor_release(x_53, 5);
+ lean_ctor_release(x_53, 6);
+ x_61 = x_53;
 } else {
- lean_dec_ref(x_51);
- x_58 = lean_box(0);
+ lean_dec_ref(x_53);
+ x_61 = lean_box(0);
 }
-if (lean_is_scalar(x_58)) {
- x_59 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_61)) {
+ x_62 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_59 = x_58;
+ x_62 = x_61;
 }
-lean_ctor_set(x_59, 0, x_50);
-lean_ctor_set(x_59, 1, x_52);
-lean_ctor_set(x_59, 2, x_53);
-lean_ctor_set(x_59, 3, x_54);
-lean_ctor_set(x_59, 4, x_55);
-lean_ctor_set(x_59, 5, x_56);
-lean_ctor_set_uint8(x_59, sizeof(void*)*6, x_57);
-x_60 = lean_st_ref_set(x_4, x_59);
-x_61 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_61, 0, x_49);
-return x_61;
+lean_ctor_set(x_62, 0, x_52);
+lean_ctor_set(x_62, 1, x_54);
+lean_ctor_set(x_62, 2, x_55);
+lean_ctor_set(x_62, 3, x_56);
+lean_ctor_set(x_62, 4, x_57);
+lean_ctor_set(x_62, 5, x_58);
+lean_ctor_set(x_62, 6, x_59);
+lean_ctor_set_uint8(x_62, sizeof(void*)*7, x_60);
+x_63 = lean_st_ref_set(x_4, x_62);
+x_64 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_64, 0, x_51);
+return x_64;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Sym/InferType.c b/stage0/stdlib/Lean/Meta/Sym/InferType.c
index 05a9f4bb39..7a0b46eca8 100644
--- a/stage0/stdlib/Lean/Meta/Sym/InferType.c
+++ b/stage0/stdlib/Lean/Meta/Sym/InferType.c
@@ -972,14 +972,16 @@ return x_16;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
 x_24 = lean_ctor_get(x_19, 0);
 x_25 = lean_ctor_get(x_19, 1);
 x_26 = lean_ctor_get(x_19, 2);
 x_27 = lean_ctor_get(x_19, 3);
 x_28 = lean_ctor_get(x_19, 4);
 x_29 = lean_ctor_get(x_19, 5);
-x_30 = lean_ctor_get_uint8(x_19, sizeof(void*)*6);
+x_30 = lean_ctor_get(x_19, 6);
+x_31 = lean_ctor_get_uint8(x_19, sizeof(void*)*7);
+lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
@@ -988,69 +990,74 @@ lean_inc(x_25);
 lean_inc(x_24);
 lean_dec(x_19);
 lean_inc(x_18);
-x_31 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_27, x_1, x_18);
-x_32 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_32, 0, x_24);
-lean_ctor_set(x_32, 1, x_25);
-lean_ctor_set(x_32, 2, x_26);
-lean_ctor_set(x_32, 3, x_31);
-lean_ctor_set(x_32, 4, x_28);
-lean_ctor_set(x_32, 5, x_29);
-lean_ctor_set_uint8(x_32, sizeof(void*)*6, x_30);
-x_33 = lean_st_ref_set(x_2, x_32);
+x_32 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_27, x_1, x_18);
+x_33 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_33, 0, x_24);
+lean_ctor_set(x_33, 1, x_25);
+lean_ctor_set(x_33, 2, x_26);
+lean_ctor_set(x_33, 3, x_32);
+lean_ctor_set(x_33, 4, x_28);
+lean_ctor_set(x_33, 5, x_29);
+lean_ctor_set(x_33, 6, x_30);
+lean_ctor_set_uint8(x_33, sizeof(void*)*7, x_31);
+x_34 = lean_st_ref_set(x_2, x_33);
 return x_16;
 }
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_34 = lean_ctor_get(x_16, 0);
-lean_inc(x_34);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_35 = lean_ctor_get(x_16, 0);
+lean_inc(x_35);
 lean_dec(x_16);
-x_35 = lean_st_ref_take(x_2);
-x_36 = lean_ctor_get(x_35, 0);
-lean_inc_ref(x_36);
-x_37 = lean_ctor_get(x_35, 1);
+x_36 = lean_st_ref_take(x_2);
+x_37 = lean_ctor_get(x_36, 0);
 lean_inc_ref(x_37);
-x_38 = lean_ctor_get(x_35, 2);
+x_38 = lean_ctor_get(x_36, 1);
 lean_inc_ref(x_38);
-x_39 = lean_ctor_get(x_35, 3);
+x_39 = lean_ctor_get(x_36, 2);
 lean_inc_ref(x_39);
-x_40 = lean_ctor_get(x_35, 4);
+x_40 = lean_ctor_get(x_36, 3);
 lean_inc_ref(x_40);
-x_41 = lean_ctor_get(x_35, 5);
+x_41 = lean_ctor_get(x_36, 4);
 lean_inc_ref(x_41);
-x_42 = lean_ctor_get_uint8(x_35, sizeof(void*)*6);
-if (lean_is_exclusive(x_35)) {
- lean_ctor_release(x_35, 0);
- lean_ctor_release(x_35, 1);
- lean_ctor_release(x_35, 2);
- lean_ctor_release(x_35, 3);
- lean_ctor_release(x_35, 4);
- lean_ctor_release(x_35, 5);
- x_43 = x_35;
+x_42 = lean_ctor_get(x_36, 5);
+lean_inc_ref(x_42);
+x_43 = lean_ctor_get(x_36, 6);
+lean_inc_ref(x_43);
+x_44 = lean_ctor_get_uint8(x_36, sizeof(void*)*7);
+if (lean_is_exclusive(x_36)) {
+ lean_ctor_release(x_36, 0);
+ lean_ctor_release(x_36, 1);
+ lean_ctor_release(x_36, 2);
+ lean_ctor_release(x_36, 3);
+ lean_ctor_release(x_36, 4);
+ lean_ctor_release(x_36, 5);
+ lean_ctor_release(x_36, 6);
+ x_45 = x_36;
 } else {
- lean_dec_ref(x_35);
- x_43 = lean_box(0);
+ lean_dec_ref(x_36);
+ x_45 = lean_box(0);
 }
-lean_inc(x_34);
-x_44 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_39, x_1, x_34);
-if (lean_is_scalar(x_43)) {
- x_45 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_35);
+x_46 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_40, x_1, x_35);
+if (lean_is_scalar(x_45)) {
+ x_47 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_45 = x_43;
+ x_47 = x_45;
 }
-lean_ctor_set(x_45, 0, x_36);
-lean_ctor_set(x_45, 1, x_37);
-lean_ctor_set(x_45, 2, x_38);
-lean_ctor_set(x_45, 3, x_44);
-lean_ctor_set(x_45, 4, x_40);
-lean_ctor_set(x_45, 5, x_41);
-lean_ctor_set_uint8(x_45, sizeof(void*)*6, x_42);
-x_46 = lean_st_ref_set(x_2, x_45);
-x_47 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_47, 0, x_34);
-return x_47;
+lean_ctor_set(x_47, 0, x_37);
+lean_ctor_set(x_47, 1, x_38);
+lean_ctor_set(x_47, 2, x_39);
+lean_ctor_set(x_47, 3, x_46);
+lean_ctor_set(x_47, 4, x_41);
+lean_ctor_set(x_47, 5, x_42);
+lean_ctor_set(x_47, 6, x_43);
+lean_ctor_set_uint8(x_47, sizeof(void*)*7, x_44);
+x_48 = lean_st_ref_set(x_2, x_47);
+x_49 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_49, 0, x_35);
+return x_49;
 }
 }
 else
@@ -1275,14 +1282,16 @@ return x_14;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_22 = lean_ctor_get(x_17, 0);
 x_23 = lean_ctor_get(x_17, 1);
 x_24 = lean_ctor_get(x_17, 2);
 x_25 = lean_ctor_get(x_17, 3);
 x_26 = lean_ctor_get(x_17, 4);
 x_27 = lean_ctor_get(x_17, 5);
-x_28 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_28 = lean_ctor_get(x_17, 6);
+x_29 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
+lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
@@ -1291,69 +1300,74 @@ lean_inc(x_23);
 lean_inc(x_22);
 lean_dec(x_17);
 lean_inc(x_16);
-x_29 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_26, x_1, x_16);
-x_30 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_30, 0, x_22);
-lean_ctor_set(x_30, 1, x_23);
-lean_ctor_set(x_30, 2, x_24);
-lean_ctor_set(x_30, 3, x_25);
-lean_ctor_set(x_30, 4, x_29);
-lean_ctor_set(x_30, 5, x_27);
-lean_ctor_set_uint8(x_30, sizeof(void*)*6, x_28);
-x_31 = lean_st_ref_set(x_2, x_30);
+x_30 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_26, x_1, x_16);
+x_31 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_31, 0, x_22);
+lean_ctor_set(x_31, 1, x_23);
+lean_ctor_set(x_31, 2, x_24);
+lean_ctor_set(x_31, 3, x_25);
+lean_ctor_set(x_31, 4, x_30);
+lean_ctor_set(x_31, 5, x_27);
+lean_ctor_set(x_31, 6, x_28);
+lean_ctor_set_uint8(x_31, sizeof(void*)*7, x_29);
+x_32 = lean_st_ref_set(x_2, x_31);
 return x_14;
 }
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_32 = lean_ctor_get(x_14, 0);
-lean_inc(x_32);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_33 = lean_ctor_get(x_14, 0);
+lean_inc(x_33);
 lean_dec(x_14);
-x_33 = lean_st_ref_take(x_2);
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc_ref(x_34);
-x_35 = lean_ctor_get(x_33, 1);
+x_34 = lean_st_ref_take(x_2);
+x_35 = lean_ctor_get(x_34, 0);
 lean_inc_ref(x_35);
-x_36 = lean_ctor_get(x_33, 2);
+x_36 = lean_ctor_get(x_34, 1);
 lean_inc_ref(x_36);
-x_37 = lean_ctor_get(x_33, 3);
+x_37 = lean_ctor_get(x_34, 2);
 lean_inc_ref(x_37);
-x_38 = lean_ctor_get(x_33, 4);
+x_38 = lean_ctor_get(x_34, 3);
 lean_inc_ref(x_38);
-x_39 = lean_ctor_get(x_33, 5);
+x_39 = lean_ctor_get(x_34, 4);
 lean_inc_ref(x_39);
-x_40 = lean_ctor_get_uint8(x_33, sizeof(void*)*6);
-if (lean_is_exclusive(x_33)) {
- lean_ctor_release(x_33, 0);
- lean_ctor_release(x_33, 1);
- lean_ctor_release(x_33, 2);
- lean_ctor_release(x_33, 3);
- lean_ctor_release(x_33, 4);
- lean_ctor_release(x_33, 5);
- x_41 = x_33;
+x_40 = lean_ctor_get(x_34, 5);
+lean_inc_ref(x_40);
+x_41 = lean_ctor_get(x_34, 6);
+lean_inc_ref(x_41);
+x_42 = lean_ctor_get_uint8(x_34, sizeof(void*)*7);
+if (lean_is_exclusive(x_34)) {
+ lean_ctor_release(x_34, 0);
+ lean_ctor_release(x_34, 1);
+ lean_ctor_release(x_34, 2);
+ lean_ctor_release(x_34, 3);
+ lean_ctor_release(x_34, 4);
+ lean_ctor_release(x_34, 5);
+ lean_ctor_release(x_34, 6);
+ x_43 = x_34;
 } else {
- lean_dec_ref(x_33);
- x_41 = lean_box(0);
+ lean_dec_ref(x_34);
+ x_43 = lean_box(0);
 }
-lean_inc(x_32);
-x_42 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_38, x_1, x_32);
-if (lean_is_scalar(x_41)) {
- x_43 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_33);
+x_44 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_inferType_spec__1___redArg(x_39, x_1, x_33);
+if (lean_is_scalar(x_43)) {
+ x_45 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_43 = x_41;
+ x_45 = x_43;
 }
-lean_ctor_set(x_43, 0, x_34);
-lean_ctor_set(x_43, 1, x_35);
-lean_ctor_set(x_43, 2, x_36);
-lean_ctor_set(x_43, 3, x_37);
-lean_ctor_set(x_43, 4, x_42);
-lean_ctor_set(x_43, 5, x_39);
-lean_ctor_set_uint8(x_43, sizeof(void*)*6, x_40);
-x_44 = lean_st_ref_set(x_2, x_43);
-x_45 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_45, 0, x_32);
-return x_45;
+lean_ctor_set(x_45, 0, x_35);
+lean_ctor_set(x_45, 1, x_36);
+lean_ctor_set(x_45, 2, x_37);
+lean_ctor_set(x_45, 3, x_38);
+lean_ctor_set(x_45, 4, x_44);
+lean_ctor_set(x_45, 5, x_40);
+lean_ctor_set(x_45, 6, x_41);
+lean_ctor_set_uint8(x_45, sizeof(void*)*7, x_42);
+x_46 = lean_st_ref_set(x_2, x_45);
+x_47 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_47, 0, x_33);
+return x_47;
 }
 }
 else
diff --git a/stage0/stdlib/Lean/Meta/Sym/InstantiateS.c b/stage0/stdlib/Lean/Meta/Sym/InstantiateS.c
index 193a3675ed..c0e560089d 100644
--- a/stage0/stdlib/Lean/Meta/Sym/InstantiateS.c
+++ b/stage0/stdlib/Lean/Meta/Sym/InstantiateS.c
@@ -2395,191 +2395,191 @@ x_15 = lean_st_ref_take(x_6);
 x_16 = !lean_is_exclusive(x_15);
 if (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; uint8_t x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_39; lean_object* x_40; lean_object* x_41; 
 x_17 = lean_ctor_get(x_15, 0);
 x_18 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
 lean_ctor_set(x_15, 0, x_18);
 x_19 = lean_st_ref_set(x_6, x_15);
 x_20 = lean_st_ref_get(x_6);
-x_38 = lean_ctor_get_uint8(x_20, sizeof(void*)*6);
+x_39 = lean_ctor_get_uint8(x_20, sizeof(void*)*7);
 lean_dec(x_20);
-x_39 = lean_nat_sub(x_3, x_2);
-x_40 = lean_unsigned_to_nat(0u);
+x_40 = lean_nat_sub(x_3, x_2);
+x_41 = lean_unsigned_to_nat(0u);
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_41; uint8_t x_42; 
-x_41 = lean_ctor_get(x_1, 0);
-x_42 = lean_nat_dec_le(x_2, x_41);
-if (x_42 == 0)
-{
-lean_dec(x_39);
-x_21 = x_1;
-x_22 = x_17;
-goto block_37;
-}
-else
-{
-uint8_t x_43; 
-lean_inc(x_41);
-lean_dec_ref(x_1);
-x_43 = lean_nat_dec_lt(x_41, x_39);
+lean_object* x_42; uint8_t x_43; 
+x_42 = lean_ctor_get(x_1, 0);
+x_43 = lean_nat_dec_le(x_2, x_42);
 if (x_43 == 0)
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_44 = lean_nat_sub(x_41, x_39);
-lean_dec(x_39);
-lean_dec(x_41);
-x_45 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__1___redArg(x_44, x_17);
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_45, 1);
-lean_inc(x_47);
-lean_dec_ref(x_45);
-x_21 = x_46;
-x_22 = x_47;
-goto block_37;
+lean_dec(x_40);
+x_21 = x_1;
+x_22 = x_17;
+goto block_38;
 }
 else
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_48 = lean_nat_sub(x_39, x_41);
-lean_dec(x_41);
-lean_dec(x_39);
-x_49 = lean_unsigned_to_nat(1u);
-x_50 = lean_nat_sub(x_48, x_49);
-lean_dec(x_48);
-x_51 = lean_array_fget_borrowed(x_4, x_50);
-lean_dec(x_50);
-lean_inc(x_51);
-x_52 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_51, x_40, x_40, x_38, x_17);
-x_53 = lean_ctor_get(x_52, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
+uint8_t x_44; 
+lean_inc(x_42);
+lean_dec_ref(x_1);
+x_44 = lean_nat_dec_lt(x_42, x_40);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_45 = lean_nat_sub(x_42, x_40);
+lean_dec(x_40);
+lean_dec(x_42);
+x_46 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__1___redArg(x_45, x_17);
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec_ref(x_46);
+x_21 = x_47;
+x_22 = x_48;
+goto block_38;
+}
+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_nat_sub(x_40, x_42);
+lean_dec(x_42);
+lean_dec(x_40);
+x_50 = lean_unsigned_to_nat(1u);
+x_51 = lean_nat_sub(x_49, x_50);
+lean_dec(x_49);
+x_52 = lean_array_fget_borrowed(x_4, x_51);
+lean_dec(x_51);
+lean_inc(x_52);
+x_53 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_52, x_41, x_41, x_39, x_17);
+x_54 = lean_ctor_get(x_53, 0);
 lean_inc(x_54);
-lean_dec_ref(x_52);
-x_21 = x_53;
-x_22 = x_54;
-goto block_37;
+x_55 = lean_ctor_get(x_53, 1);
+lean_inc(x_55);
+lean_dec_ref(x_53);
+x_21 = x_54;
+x_22 = x_55;
+goto block_38;
 }
 }
 }
 case 9:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 2:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 1:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 4:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 3:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 default: 
 {
-lean_object* x_55; uint8_t x_56; 
-x_55 = l_Lean_Expr_looseBVarRange(x_1);
-x_56 = lean_nat_dec_le(x_55, x_2);
-lean_dec(x_55);
-if (x_56 == 0)
+lean_object* x_56; uint8_t x_57; 
+x_56 = l_Lean_Expr_looseBVarRange(x_1);
+x_57 = lean_nat_dec_le(x_56, x_2);
+lean_dec(x_56);
+if (x_57 == 0)
 {
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 2:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 0:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 1:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 4:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 case 3:
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 default: 
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_57 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__2;
-x_58 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__2(x_2, x_39, x_4, x_1, x_40, x_57, x_38, x_17);
-lean_dec(x_39);
-x_59 = lean_ctor_get(x_58, 0);
-lean_inc(x_59);
-x_60 = lean_ctor_get(x_58, 1);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_58 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__2;
+x_59 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__2(x_2, x_40, x_4, x_1, x_41, x_58, x_39, x_17);
+lean_dec(x_40);
+x_60 = lean_ctor_get(x_59, 0);
 lean_inc(x_60);
-lean_dec_ref(x_58);
-x_61 = lean_ctor_get(x_59, 0);
+x_61 = lean_ctor_get(x_59, 1);
 lean_inc(x_61);
-lean_dec(x_59);
-x_21 = x_61;
-x_22 = x_60;
-goto block_37;
+lean_dec_ref(x_59);
+x_62 = lean_ctor_get(x_60, 0);
+lean_inc(x_62);
+lean_dec(x_60);
+x_21 = x_62;
+x_22 = x_61;
+goto block_38;
 }
 }
 }
 else
 {
-lean_dec(x_39);
+lean_dec(x_40);
 x_21 = x_1;
 x_22 = x_17;
-goto block_37;
+goto block_38;
 }
 }
 }
-block_37:
+block_38:
 {
 lean_object* x_23; uint8_t x_24; 
 x_23 = lean_st_ref_take(x_6);
@@ -2598,304 +2598,314 @@ return x_27;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
 x_28 = lean_ctor_get(x_23, 1);
 x_29 = lean_ctor_get(x_23, 2);
 x_30 = lean_ctor_get(x_23, 3);
 x_31 = lean_ctor_get(x_23, 4);
 x_32 = lean_ctor_get(x_23, 5);
-x_33 = lean_ctor_get_uint8(x_23, sizeof(void*)*6);
+x_33 = lean_ctor_get(x_23, 6);
+x_34 = lean_ctor_get_uint8(x_23, sizeof(void*)*7);
+lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_dec(x_23);
-x_34 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_34, 0, x_22);
-lean_ctor_set(x_34, 1, x_28);
-lean_ctor_set(x_34, 2, x_29);
-lean_ctor_set(x_34, 3, x_30);
-lean_ctor_set(x_34, 4, x_31);
-lean_ctor_set(x_34, 5, x_32);
-lean_ctor_set_uint8(x_34, sizeof(void*)*6, x_33);
-x_35 = lean_st_ref_set(x_6, x_34);
+x_35 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_35, 0, x_22);
+lean_ctor_set(x_35, 1, x_28);
+lean_ctor_set(x_35, 2, x_29);
+lean_ctor_set(x_35, 3, x_30);
+lean_ctor_set(x_35, 4, x_31);
+lean_ctor_set(x_35, 5, x_32);
+lean_ctor_set(x_35, 6, x_33);
+lean_ctor_set_uint8(x_35, sizeof(void*)*7, x_34);
+x_36 = lean_st_ref_set(x_6, x_35);
 lean_dec(x_6);
-x_36 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_36, 0, x_21);
-return x_36;
+x_37 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_37, 0, x_21);
+return x_37;
 }
 }
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; uint8_t x_87; lean_object* x_88; lean_object* x_89; 
-x_62 = lean_ctor_get(x_15, 0);
-x_63 = lean_ctor_get(x_15, 1);
-x_64 = lean_ctor_get(x_15, 2);
-x_65 = lean_ctor_get(x_15, 3);
-x_66 = lean_ctor_get(x_15, 4);
-x_67 = lean_ctor_get(x_15, 5);
-x_68 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; uint8_t x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_90; lean_object* x_91; lean_object* x_92; 
+x_63 = lean_ctor_get(x_15, 0);
+x_64 = lean_ctor_get(x_15, 1);
+x_65 = lean_ctor_get(x_15, 2);
+x_66 = lean_ctor_get(x_15, 3);
+x_67 = lean_ctor_get(x_15, 4);
+x_68 = lean_ctor_get(x_15, 5);
+x_69 = lean_ctor_get(x_15, 6);
+x_70 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
+lean_inc(x_69);
+lean_inc(x_68);
 lean_inc(x_67);
 lean_inc(x_66);
 lean_inc(x_65);
 lean_inc(x_64);
 lean_inc(x_63);
-lean_inc(x_62);
 lean_dec(x_15);
-x_69 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
-x_70 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_63);
-lean_ctor_set(x_70, 2, x_64);
-lean_ctor_set(x_70, 3, x_65);
-lean_ctor_set(x_70, 4, x_66);
-lean_ctor_set(x_70, 5, x_67);
-lean_ctor_set_uint8(x_70, sizeof(void*)*6, x_68);
-x_71 = lean_st_ref_set(x_6, x_70);
-x_72 = lean_st_ref_get(x_6);
-x_87 = lean_ctor_get_uint8(x_72, sizeof(void*)*6);
-lean_dec(x_72);
-x_88 = lean_nat_sub(x_3, x_2);
-x_89 = lean_unsigned_to_nat(0u);
+x_71 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
+x_72 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_72, 0, x_71);
+lean_ctor_set(x_72, 1, x_64);
+lean_ctor_set(x_72, 2, x_65);
+lean_ctor_set(x_72, 3, x_66);
+lean_ctor_set(x_72, 4, x_67);
+lean_ctor_set(x_72, 5, x_68);
+lean_ctor_set(x_72, 6, x_69);
+lean_ctor_set_uint8(x_72, sizeof(void*)*7, x_70);
+x_73 = lean_st_ref_set(x_6, x_72);
+x_74 = lean_st_ref_get(x_6);
+x_90 = lean_ctor_get_uint8(x_74, sizeof(void*)*7);
+lean_dec(x_74);
+x_91 = lean_nat_sub(x_3, x_2);
+x_92 = lean_unsigned_to_nat(0u);
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_90; uint8_t x_91; 
-x_90 = lean_ctor_get(x_1, 0);
-x_91 = lean_nat_dec_le(x_2, x_90);
-if (x_91 == 0)
+lean_object* x_93; uint8_t x_94; 
+x_93 = lean_ctor_get(x_1, 0);
+x_94 = lean_nat_dec_le(x_2, x_93);
+if (x_94 == 0)
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 else
 {
-uint8_t x_92; 
-lean_inc(x_90);
+uint8_t x_95; 
+lean_inc(x_93);
 lean_dec_ref(x_1);
-x_92 = lean_nat_dec_lt(x_90, x_88);
-if (x_92 == 0)
+x_95 = lean_nat_dec_lt(x_93, x_91);
+if (x_95 == 0)
 {
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_93 = lean_nat_sub(x_90, x_88);
-lean_dec(x_88);
-lean_dec(x_90);
-x_94 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__1___redArg(x_93, x_62);
-x_95 = lean_ctor_get(x_94, 0);
-lean_inc(x_95);
-x_96 = lean_ctor_get(x_94, 1);
-lean_inc(x_96);
-lean_dec_ref(x_94);
-x_73 = x_95;
-x_74 = x_96;
-goto block_86;
+lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_96 = lean_nat_sub(x_93, x_91);
+lean_dec(x_91);
+lean_dec(x_93);
+x_97 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__1___redArg(x_96, x_63);
+x_98 = lean_ctor_get(x_97, 0);
+lean_inc(x_98);
+x_99 = lean_ctor_get(x_97, 1);
+lean_inc(x_99);
+lean_dec_ref(x_97);
+x_75 = x_98;
+x_76 = x_99;
+goto block_89;
 }
 else
 {
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
-x_97 = lean_nat_sub(x_88, x_90);
-lean_dec(x_90);
-lean_dec(x_88);
-x_98 = lean_unsigned_to_nat(1u);
-x_99 = lean_nat_sub(x_97, x_98);
-lean_dec(x_97);
-x_100 = lean_array_fget_borrowed(x_4, x_99);
-lean_dec(x_99);
-lean_inc(x_100);
-x_101 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_100, x_89, x_89, x_87, x_62);
-x_102 = lean_ctor_get(x_101, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_101, 1);
+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_nat_sub(x_91, x_93);
+lean_dec(x_93);
+lean_dec(x_91);
+x_101 = lean_unsigned_to_nat(1u);
+x_102 = lean_nat_sub(x_100, x_101);
+lean_dec(x_100);
+x_103 = lean_array_fget_borrowed(x_4, x_102);
+lean_dec(x_102);
 lean_inc(x_103);
-lean_dec_ref(x_101);
-x_73 = x_102;
-x_74 = x_103;
-goto block_86;
+x_104 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_103, x_92, x_92, x_90, x_63);
+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_ref(x_104);
+x_75 = x_105;
+x_76 = x_106;
+goto block_89;
 }
 }
 }
 case 9:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 2:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 1:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 4:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 3:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 default: 
 {
-lean_object* x_104; uint8_t x_105; 
-x_104 = l_Lean_Expr_looseBVarRange(x_1);
-x_105 = lean_nat_dec_le(x_104, x_2);
-lean_dec(x_104);
-if (x_105 == 0)
+lean_object* x_107; uint8_t x_108; 
+x_107 = l_Lean_Expr_looseBVarRange(x_1);
+x_108 = lean_nat_dec_le(x_107, x_2);
+lean_dec(x_107);
+if (x_108 == 0)
 {
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 2:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 0:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 1:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 4:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 case 3:
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 default: 
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
-x_106 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__2;
-x_107 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__2(x_2, x_88, x_4, x_1, x_89, x_106, x_87, x_62);
-lean_dec(x_88);
-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_ref(x_107);
-x_110 = lean_ctor_get(x_108, 0);
-lean_inc(x_110);
-lean_dec(x_108);
-x_73 = x_110;
-x_74 = x_109;
-goto block_86;
+lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_109 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__2;
+x_110 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__2(x_2, x_91, x_4, x_1, x_92, x_109, x_90, x_63);
+lean_dec(x_91);
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_110, 1);
+lean_inc(x_112);
+lean_dec_ref(x_110);
+x_113 = lean_ctor_get(x_111, 0);
+lean_inc(x_113);
+lean_dec(x_111);
+x_75 = x_113;
+x_76 = x_112;
+goto block_89;
 }
 }
 }
 else
 {
-lean_dec(x_88);
-x_73 = x_1;
-x_74 = x_62;
-goto block_86;
+lean_dec(x_91);
+x_75 = x_1;
+x_76 = x_63;
+goto block_89;
 }
 }
 }
-block_86:
+block_89:
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-x_75 = lean_st_ref_take(x_6);
-x_76 = lean_ctor_get(x_75, 1);
-lean_inc_ref(x_76);
-x_77 = lean_ctor_get(x_75, 2);
-lean_inc_ref(x_77);
-x_78 = lean_ctor_get(x_75, 3);
+lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_77 = lean_st_ref_take(x_6);
+x_78 = lean_ctor_get(x_77, 1);
 lean_inc_ref(x_78);
-x_79 = lean_ctor_get(x_75, 4);
+x_79 = lean_ctor_get(x_77, 2);
 lean_inc_ref(x_79);
-x_80 = lean_ctor_get(x_75, 5);
+x_80 = lean_ctor_get(x_77, 3);
 lean_inc_ref(x_80);
-x_81 = lean_ctor_get_uint8(x_75, sizeof(void*)*6);
-if (lean_is_exclusive(x_75)) {
- lean_ctor_release(x_75, 0);
- lean_ctor_release(x_75, 1);
- lean_ctor_release(x_75, 2);
- lean_ctor_release(x_75, 3);
- lean_ctor_release(x_75, 4);
- lean_ctor_release(x_75, 5);
- x_82 = x_75;
+x_81 = lean_ctor_get(x_77, 4);
+lean_inc_ref(x_81);
+x_82 = lean_ctor_get(x_77, 5);
+lean_inc_ref(x_82);
+x_83 = lean_ctor_get(x_77, 6);
+lean_inc_ref(x_83);
+x_84 = lean_ctor_get_uint8(x_77, sizeof(void*)*7);
+if (lean_is_exclusive(x_77)) {
+ lean_ctor_release(x_77, 0);
+ lean_ctor_release(x_77, 1);
+ lean_ctor_release(x_77, 2);
+ lean_ctor_release(x_77, 3);
+ lean_ctor_release(x_77, 4);
+ lean_ctor_release(x_77, 5);
+ lean_ctor_release(x_77, 6);
+ x_85 = x_77;
 } else {
- lean_dec_ref(x_75);
- x_82 = lean_box(0);
+ lean_dec_ref(x_77);
+ x_85 = lean_box(0);
 }
-if (lean_is_scalar(x_82)) {
- x_83 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_85)) {
+ x_86 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_83 = x_82;
+ x_86 = x_85;
 }
-lean_ctor_set(x_83, 0, x_74);
-lean_ctor_set(x_83, 1, x_76);
-lean_ctor_set(x_83, 2, x_77);
-lean_ctor_set(x_83, 3, x_78);
-lean_ctor_set(x_83, 4, x_79);
-lean_ctor_set(x_83, 5, x_80);
-lean_ctor_set_uint8(x_83, sizeof(void*)*6, x_81);
-x_84 = lean_st_ref_set(x_6, x_83);
+lean_ctor_set(x_86, 0, x_76);
+lean_ctor_set(x_86, 1, x_78);
+lean_ctor_set(x_86, 2, x_79);
+lean_ctor_set(x_86, 3, x_80);
+lean_ctor_set(x_86, 4, x_81);
+lean_ctor_set(x_86, 5, x_82);
+lean_ctor_set(x_86, 6, x_83);
+lean_ctor_set_uint8(x_86, sizeof(void*)*7, x_84);
+x_87 = lean_st_ref_set(x_6, x_86);
 lean_dec(x_6);
-x_85 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_85, 0, x_73);
-return x_85;
+x_88 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_88, 0, x_75);
+return x_88;
 }
 }
 }
 else
 {
-lean_object* x_111; lean_object* x_112; 
+lean_object* x_114; lean_object* x_115; 
 lean_dec_ref(x_1);
-x_111 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__5;
-x_112 = l_panic___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__3(x_111, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_112;
+x_114 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__5;
+x_115 = l_panic___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__3(x_114, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_115;
 }
 }
 else
 {
-lean_object* x_113; lean_object* x_114; 
+lean_object* x_116; lean_object* x_117; 
 lean_dec_ref(x_1);
-x_113 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__6;
-x_114 = l_panic___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__3(x_113, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_114;
+x_116 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__6;
+x_117 = l_panic___at___00Lean_Meta_Sym_instantiateRevRangeS_spec__3(x_116, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_117;
 }
 }
 }
@@ -4243,7 +4253,7 @@ x_8 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
 lean_ctor_set(x_5, 0, x_8);
 x_9 = lean_st_ref_set(x_3, x_5);
 x_10 = lean_st_ref_get(x_3);
-x_11 = lean_ctor_get_uint8(x_10, sizeof(void*)*6);
+x_11 = lean_ctor_get_uint8(x_10, sizeof(void*)*7);
 lean_dec(x_10);
 x_12 = l___private_Lean_Meta_Sym_InstantiateS_0__Lean_Meta_Sym_instantiateS_x27(x_1, x_2, x_11, x_7);
 x_13 = lean_ctor_get(x_12, 0);
@@ -4266,109 +4276,119 @@ return x_19;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
 x_20 = lean_ctor_get(x_15, 1);
 x_21 = lean_ctor_get(x_15, 2);
 x_22 = lean_ctor_get(x_15, 3);
 x_23 = lean_ctor_get(x_15, 4);
 x_24 = lean_ctor_get(x_15, 5);
-x_25 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_25 = lean_ctor_get(x_15, 6);
+x_26 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
+lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_dec(x_15);
-x_26 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_26, 0, x_14);
-lean_ctor_set(x_26, 1, x_20);
-lean_ctor_set(x_26, 2, x_21);
-lean_ctor_set(x_26, 3, x_22);
-lean_ctor_set(x_26, 4, x_23);
-lean_ctor_set(x_26, 5, x_24);
-lean_ctor_set_uint8(x_26, sizeof(void*)*6, x_25);
-x_27 = lean_st_ref_set(x_3, x_26);
-x_28 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_28, 0, x_13);
-return x_28;
+x_27 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_27, 0, x_14);
+lean_ctor_set(x_27, 1, x_20);
+lean_ctor_set(x_27, 2, x_21);
+lean_ctor_set(x_27, 3, x_22);
+lean_ctor_set(x_27, 4, x_23);
+lean_ctor_set(x_27, 5, x_24);
+lean_ctor_set(x_27, 6, x_25);
+lean_ctor_set_uint8(x_27, sizeof(void*)*7, x_26);
+x_28 = lean_st_ref_set(x_3, x_27);
+x_29 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_29, 0, x_13);
+return x_29;
 }
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_29 = lean_ctor_get(x_5, 0);
-x_30 = lean_ctor_get(x_5, 1);
-x_31 = lean_ctor_get(x_5, 2);
-x_32 = lean_ctor_get(x_5, 3);
-x_33 = lean_ctor_get(x_5, 4);
-x_34 = lean_ctor_get(x_5, 5);
-x_35 = lean_ctor_get_uint8(x_5, sizeof(void*)*6);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_30 = lean_ctor_get(x_5, 0);
+x_31 = lean_ctor_get(x_5, 1);
+x_32 = lean_ctor_get(x_5, 2);
+x_33 = lean_ctor_get(x_5, 3);
+x_34 = lean_ctor_get(x_5, 4);
+x_35 = lean_ctor_get(x_5, 5);
+x_36 = lean_ctor_get(x_5, 6);
+x_37 = lean_ctor_get_uint8(x_5, sizeof(void*)*7);
+lean_inc(x_36);
+lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
-lean_inc(x_29);
 lean_dec(x_5);
-x_36 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
-x_37 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_30);
-lean_ctor_set(x_37, 2, x_31);
-lean_ctor_set(x_37, 3, x_32);
-lean_ctor_set(x_37, 4, x_33);
-lean_ctor_set(x_37, 5, x_34);
-lean_ctor_set_uint8(x_37, sizeof(void*)*6, x_35);
-x_38 = lean_st_ref_set(x_3, x_37);
-x_39 = lean_st_ref_get(x_3);
-x_40 = lean_ctor_get_uint8(x_39, sizeof(void*)*6);
-lean_dec(x_39);
-x_41 = l___private_Lean_Meta_Sym_InstantiateS_0__Lean_Meta_Sym_instantiateS_x27(x_1, x_2, x_40, x_29);
-x_42 = lean_ctor_get(x_41, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_41, 1);
-lean_inc(x_43);
-lean_dec_ref(x_41);
-x_44 = lean_st_ref_take(x_3);
-x_45 = lean_ctor_get(x_44, 1);
-lean_inc_ref(x_45);
-x_46 = lean_ctor_get(x_44, 2);
-lean_inc_ref(x_46);
-x_47 = lean_ctor_get(x_44, 3);
+x_38 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
+x_39 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_39, 0, x_38);
+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_35);
+lean_ctor_set(x_39, 6, x_36);
+lean_ctor_set_uint8(x_39, sizeof(void*)*7, x_37);
+x_40 = lean_st_ref_set(x_3, x_39);
+x_41 = lean_st_ref_get(x_3);
+x_42 = lean_ctor_get_uint8(x_41, sizeof(void*)*7);
+lean_dec(x_41);
+x_43 = l___private_Lean_Meta_Sym_InstantiateS_0__Lean_Meta_Sym_instantiateS_x27(x_1, x_2, x_42, x_30);
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec_ref(x_43);
+x_46 = lean_st_ref_take(x_3);
+x_47 = lean_ctor_get(x_46, 1);
 lean_inc_ref(x_47);
-x_48 = lean_ctor_get(x_44, 4);
+x_48 = lean_ctor_get(x_46, 2);
 lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_44, 5);
+x_49 = lean_ctor_get(x_46, 3);
 lean_inc_ref(x_49);
-x_50 = lean_ctor_get_uint8(x_44, sizeof(void*)*6);
-if (lean_is_exclusive(x_44)) {
- lean_ctor_release(x_44, 0);
- lean_ctor_release(x_44, 1);
- lean_ctor_release(x_44, 2);
- lean_ctor_release(x_44, 3);
- lean_ctor_release(x_44, 4);
- lean_ctor_release(x_44, 5);
- x_51 = x_44;
+x_50 = lean_ctor_get(x_46, 4);
+lean_inc_ref(x_50);
+x_51 = lean_ctor_get(x_46, 5);
+lean_inc_ref(x_51);
+x_52 = lean_ctor_get(x_46, 6);
+lean_inc_ref(x_52);
+x_53 = lean_ctor_get_uint8(x_46, sizeof(void*)*7);
+if (lean_is_exclusive(x_46)) {
+ lean_ctor_release(x_46, 0);
+ lean_ctor_release(x_46, 1);
+ lean_ctor_release(x_46, 2);
+ lean_ctor_release(x_46, 3);
+ lean_ctor_release(x_46, 4);
+ lean_ctor_release(x_46, 5);
+ lean_ctor_release(x_46, 6);
+ x_54 = x_46;
 } else {
- lean_dec_ref(x_44);
- x_51 = lean_box(0);
+ lean_dec_ref(x_46);
+ x_54 = lean_box(0);
 }
-if (lean_is_scalar(x_51)) {
- x_52 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_54)) {
+ x_55 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_52 = x_51;
+ x_55 = x_54;
 }
-lean_ctor_set(x_52, 0, x_43);
-lean_ctor_set(x_52, 1, x_45);
-lean_ctor_set(x_52, 2, x_46);
-lean_ctor_set(x_52, 3, x_47);
-lean_ctor_set(x_52, 4, x_48);
-lean_ctor_set(x_52, 5, x_49);
-lean_ctor_set_uint8(x_52, sizeof(void*)*6, x_50);
-x_53 = lean_st_ref_set(x_3, x_52);
-x_54 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_54, 0, x_42);
-return x_54;
+lean_ctor_set(x_55, 0, x_45);
+lean_ctor_set(x_55, 1, x_47);
+lean_ctor_set(x_55, 2, x_48);
+lean_ctor_set(x_55, 3, x_49);
+lean_ctor_set(x_55, 4, x_50);
+lean_ctor_set(x_55, 5, x_51);
+lean_ctor_set(x_55, 6, x_52);
+lean_ctor_set_uint8(x_55, sizeof(void*)*7, x_53);
+x_56 = lean_st_ref_set(x_3, x_55);
+x_57 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_57, 0, x_44);
+return x_57;
 }
 }
 }
@@ -6719,7 +6739,7 @@ x_11 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
 lean_ctor_set(x_8, 0, x_11);
 x_12 = lean_st_ref_set(x_3, x_8);
 x_13 = lean_st_ref_get(x_3);
-x_14 = lean_ctor_get_uint8(x_13, sizeof(void*)*6);
+x_14 = lean_ctor_get_uint8(x_13, sizeof(void*)*7);
 lean_dec(x_13);
 x_15 = l___private_Lean_Meta_Sym_InstantiateS_0__Lean_Meta_Sym_instantiateRevBetaS_x27(x_1, x_2, x_14, x_10);
 x_16 = lean_ctor_get(x_15, 0);
@@ -6742,117 +6762,127 @@ return x_22;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_23 = lean_ctor_get(x_18, 1);
 x_24 = lean_ctor_get(x_18, 2);
 x_25 = lean_ctor_get(x_18, 3);
 x_26 = lean_ctor_get(x_18, 4);
 x_27 = lean_ctor_get(x_18, 5);
-x_28 = lean_ctor_get_uint8(x_18, sizeof(void*)*6);
+x_28 = lean_ctor_get(x_18, 6);
+x_29 = lean_ctor_get_uint8(x_18, sizeof(void*)*7);
+lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_dec(x_18);
-x_29 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_29, 0, x_17);
-lean_ctor_set(x_29, 1, x_23);
-lean_ctor_set(x_29, 2, x_24);
-lean_ctor_set(x_29, 3, x_25);
-lean_ctor_set(x_29, 4, x_26);
-lean_ctor_set(x_29, 5, x_27);
-lean_ctor_set_uint8(x_29, sizeof(void*)*6, x_28);
-x_30 = lean_st_ref_set(x_3, x_29);
-x_31 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_31, 0, x_16);
-return x_31;
+x_30 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_30, 0, x_17);
+lean_ctor_set(x_30, 1, x_23);
+lean_ctor_set(x_30, 2, x_24);
+lean_ctor_set(x_30, 3, x_25);
+lean_ctor_set(x_30, 4, x_26);
+lean_ctor_set(x_30, 5, x_27);
+lean_ctor_set(x_30, 6, x_28);
+lean_ctor_set_uint8(x_30, sizeof(void*)*7, x_29);
+x_31 = lean_st_ref_set(x_3, x_30);
+x_32 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_32, 0, x_16);
+return x_32;
 }
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_32 = lean_ctor_get(x_8, 0);
-x_33 = lean_ctor_get(x_8, 1);
-x_34 = lean_ctor_get(x_8, 2);
-x_35 = lean_ctor_get(x_8, 3);
-x_36 = lean_ctor_get(x_8, 4);
-x_37 = lean_ctor_get(x_8, 5);
-x_38 = lean_ctor_get_uint8(x_8, sizeof(void*)*6);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_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; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_33 = lean_ctor_get(x_8, 0);
+x_34 = lean_ctor_get(x_8, 1);
+x_35 = lean_ctor_get(x_8, 2);
+x_36 = lean_ctor_get(x_8, 3);
+x_37 = lean_ctor_get(x_8, 4);
+x_38 = lean_ctor_get(x_8, 5);
+x_39 = lean_ctor_get(x_8, 6);
+x_40 = lean_ctor_get_uint8(x_8, sizeof(void*)*7);
+lean_inc(x_39);
+lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
 lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
-lean_inc(x_32);
 lean_dec(x_8);
-x_39 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
-x_40 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_33);
-lean_ctor_set(x_40, 2, x_34);
-lean_ctor_set(x_40, 3, x_35);
-lean_ctor_set(x_40, 4, x_36);
-lean_ctor_set(x_40, 5, x_37);
-lean_ctor_set_uint8(x_40, sizeof(void*)*6, x_38);
-x_41 = lean_st_ref_set(x_3, x_40);
-x_42 = lean_st_ref_get(x_3);
-x_43 = lean_ctor_get_uint8(x_42, sizeof(void*)*6);
-lean_dec(x_42);
-x_44 = l___private_Lean_Meta_Sym_InstantiateS_0__Lean_Meta_Sym_instantiateRevBetaS_x27(x_1, x_2, x_43, x_32);
-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_ref(x_44);
-x_47 = lean_st_ref_take(x_3);
-x_48 = lean_ctor_get(x_47, 1);
-lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_47, 2);
-lean_inc_ref(x_49);
-x_50 = lean_ctor_get(x_47, 3);
+x_41 = l_Lean_Meta_Sym_instantiateRevRangeS___closed__0;
+x_42 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_34);
+lean_ctor_set(x_42, 2, x_35);
+lean_ctor_set(x_42, 3, x_36);
+lean_ctor_set(x_42, 4, x_37);
+lean_ctor_set(x_42, 5, x_38);
+lean_ctor_set(x_42, 6, x_39);
+lean_ctor_set_uint8(x_42, sizeof(void*)*7, x_40);
+x_43 = lean_st_ref_set(x_3, x_42);
+x_44 = lean_st_ref_get(x_3);
+x_45 = lean_ctor_get_uint8(x_44, sizeof(void*)*7);
+lean_dec(x_44);
+x_46 = l___private_Lean_Meta_Sym_InstantiateS_0__Lean_Meta_Sym_instantiateRevBetaS_x27(x_1, x_2, x_45, x_33);
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec_ref(x_46);
+x_49 = lean_st_ref_take(x_3);
+x_50 = lean_ctor_get(x_49, 1);
 lean_inc_ref(x_50);
-x_51 = lean_ctor_get(x_47, 4);
+x_51 = lean_ctor_get(x_49, 2);
 lean_inc_ref(x_51);
-x_52 = lean_ctor_get(x_47, 5);
+x_52 = lean_ctor_get(x_49, 3);
 lean_inc_ref(x_52);
-x_53 = lean_ctor_get_uint8(x_47, sizeof(void*)*6);
-if (lean_is_exclusive(x_47)) {
- lean_ctor_release(x_47, 0);
- lean_ctor_release(x_47, 1);
- lean_ctor_release(x_47, 2);
- lean_ctor_release(x_47, 3);
- lean_ctor_release(x_47, 4);
- lean_ctor_release(x_47, 5);
- x_54 = x_47;
+x_53 = lean_ctor_get(x_49, 4);
+lean_inc_ref(x_53);
+x_54 = lean_ctor_get(x_49, 5);
+lean_inc_ref(x_54);
+x_55 = lean_ctor_get(x_49, 6);
+lean_inc_ref(x_55);
+x_56 = lean_ctor_get_uint8(x_49, sizeof(void*)*7);
+if (lean_is_exclusive(x_49)) {
+ lean_ctor_release(x_49, 0);
+ lean_ctor_release(x_49, 1);
+ lean_ctor_release(x_49, 2);
+ lean_ctor_release(x_49, 3);
+ lean_ctor_release(x_49, 4);
+ lean_ctor_release(x_49, 5);
+ lean_ctor_release(x_49, 6);
+ x_57 = x_49;
 } else {
- lean_dec_ref(x_47);
- x_54 = lean_box(0);
+ lean_dec_ref(x_49);
+ x_57 = lean_box(0);
 }
-if (lean_is_scalar(x_54)) {
- x_55 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_57)) {
+ x_58 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_55 = x_54;
+ x_58 = x_57;
 }
-lean_ctor_set(x_55, 0, x_46);
-lean_ctor_set(x_55, 1, x_48);
-lean_ctor_set(x_55, 2, x_49);
-lean_ctor_set(x_55, 3, x_50);
-lean_ctor_set(x_55, 4, x_51);
-lean_ctor_set(x_55, 5, x_52);
-lean_ctor_set_uint8(x_55, sizeof(void*)*6, x_53);
-x_56 = lean_st_ref_set(x_3, x_55);
-x_57 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_57, 0, x_45);
-return x_57;
+lean_ctor_set(x_58, 0, x_48);
+lean_ctor_set(x_58, 1, x_50);
+lean_ctor_set(x_58, 2, x_51);
+lean_ctor_set(x_58, 3, x_52);
+lean_ctor_set(x_58, 4, x_53);
+lean_ctor_set(x_58, 5, x_54);
+lean_ctor_set(x_58, 6, x_55);
+lean_ctor_set_uint8(x_58, sizeof(void*)*7, x_56);
+x_59 = lean_st_ref_set(x_3, x_58);
+x_60 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_60, 0, x_47);
+return x_60;
 }
 }
 else
 {
-lean_object* x_58; 
-x_58 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_58, 0, x_1);
-return x_58;
+lean_object* x_61; 
+x_61 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_61, 0, x_1);
+return x_61;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Sym/LooseBVarsS.c b/stage0/stdlib/Lean/Meta/Sym/LooseBVarsS.c
index 26db728f44..83081b312a 100644
--- a/stage0/stdlib/Lean/Meta/Sym/LooseBVarsS.c
+++ b/stage0/stdlib/Lean/Meta/Sym/LooseBVarsS.c
@@ -1898,7 +1898,7 @@ x_9 = l_Lean_Meta_Sym_lowerLooseBVarsS___redArg___closed__0;
 lean_ctor_set(x_6, 0, x_9);
 x_10 = lean_st_ref_set(x_4, x_6);
 x_11 = lean_st_ref_get(x_4);
-x_12 = lean_ctor_get_uint8(x_11, sizeof(void*)*6);
+x_12 = lean_ctor_get_uint8(x_11, sizeof(void*)*7);
 lean_dec(x_11);
 x_13 = l_Lean_Meta_Sym_lowerLooseBVarsS_x27(x_1, x_2, x_3, x_12, x_8);
 x_14 = lean_ctor_get(x_13, 0);
@@ -1921,109 +1921,119 @@ return x_20;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_21 = lean_ctor_get(x_16, 1);
 x_22 = lean_ctor_get(x_16, 2);
 x_23 = lean_ctor_get(x_16, 3);
 x_24 = lean_ctor_get(x_16, 4);
 x_25 = lean_ctor_get(x_16, 5);
-x_26 = lean_ctor_get_uint8(x_16, sizeof(void*)*6);
+x_26 = lean_ctor_get(x_16, 6);
+x_27 = lean_ctor_get_uint8(x_16, sizeof(void*)*7);
+lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_dec(x_16);
-x_27 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_27, 0, x_15);
-lean_ctor_set(x_27, 1, x_21);
-lean_ctor_set(x_27, 2, x_22);
-lean_ctor_set(x_27, 3, x_23);
-lean_ctor_set(x_27, 4, x_24);
-lean_ctor_set(x_27, 5, x_25);
-lean_ctor_set_uint8(x_27, sizeof(void*)*6, x_26);
-x_28 = lean_st_ref_set(x_4, x_27);
-x_29 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_29, 0, x_14);
-return x_29;
+x_28 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_28, 0, x_15);
+lean_ctor_set(x_28, 1, x_21);
+lean_ctor_set(x_28, 2, x_22);
+lean_ctor_set(x_28, 3, x_23);
+lean_ctor_set(x_28, 4, x_24);
+lean_ctor_set(x_28, 5, x_25);
+lean_ctor_set(x_28, 6, x_26);
+lean_ctor_set_uint8(x_28, sizeof(void*)*7, x_27);
+x_29 = lean_st_ref_set(x_4, x_28);
+x_30 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_30, 0, x_14);
+return x_30;
 }
 }
 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; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_30 = lean_ctor_get(x_6, 0);
-x_31 = lean_ctor_get(x_6, 1);
-x_32 = lean_ctor_get(x_6, 2);
-x_33 = lean_ctor_get(x_6, 3);
-x_34 = lean_ctor_get(x_6, 4);
-x_35 = lean_ctor_get(x_6, 5);
-x_36 = lean_ctor_get_uint8(x_6, sizeof(void*)*6);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; uint8_t x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_31 = lean_ctor_get(x_6, 0);
+x_32 = lean_ctor_get(x_6, 1);
+x_33 = lean_ctor_get(x_6, 2);
+x_34 = lean_ctor_get(x_6, 3);
+x_35 = lean_ctor_get(x_6, 4);
+x_36 = lean_ctor_get(x_6, 5);
+x_37 = lean_ctor_get(x_6, 6);
+x_38 = lean_ctor_get_uint8(x_6, sizeof(void*)*7);
+lean_inc(x_37);
+lean_inc(x_36);
 lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
-lean_inc(x_30);
 lean_dec(x_6);
-x_37 = l_Lean_Meta_Sym_lowerLooseBVarsS___redArg___closed__0;
-x_38 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_31);
-lean_ctor_set(x_38, 2, x_32);
-lean_ctor_set(x_38, 3, x_33);
-lean_ctor_set(x_38, 4, x_34);
-lean_ctor_set(x_38, 5, x_35);
-lean_ctor_set_uint8(x_38, sizeof(void*)*6, x_36);
-x_39 = lean_st_ref_set(x_4, x_38);
-x_40 = lean_st_ref_get(x_4);
-x_41 = lean_ctor_get_uint8(x_40, sizeof(void*)*6);
-lean_dec(x_40);
-x_42 = l_Lean_Meta_Sym_lowerLooseBVarsS_x27(x_1, x_2, x_3, x_41, x_30);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-lean_dec_ref(x_42);
-x_45 = lean_st_ref_take(x_4);
-x_46 = lean_ctor_get(x_45, 1);
-lean_inc_ref(x_46);
-x_47 = lean_ctor_get(x_45, 2);
-lean_inc_ref(x_47);
-x_48 = lean_ctor_get(x_45, 3);
+x_39 = l_Lean_Meta_Sym_lowerLooseBVarsS___redArg___closed__0;
+x_40 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_32);
+lean_ctor_set(x_40, 2, x_33);
+lean_ctor_set(x_40, 3, x_34);
+lean_ctor_set(x_40, 4, x_35);
+lean_ctor_set(x_40, 5, x_36);
+lean_ctor_set(x_40, 6, x_37);
+lean_ctor_set_uint8(x_40, sizeof(void*)*7, x_38);
+x_41 = lean_st_ref_set(x_4, x_40);
+x_42 = lean_st_ref_get(x_4);
+x_43 = lean_ctor_get_uint8(x_42, sizeof(void*)*7);
+lean_dec(x_42);
+x_44 = l_Lean_Meta_Sym_lowerLooseBVarsS_x27(x_1, x_2, x_3, x_43, x_31);
+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_ref(x_44);
+x_47 = lean_st_ref_take(x_4);
+x_48 = lean_ctor_get(x_47, 1);
 lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_45, 4);
+x_49 = lean_ctor_get(x_47, 2);
 lean_inc_ref(x_49);
-x_50 = lean_ctor_get(x_45, 5);
+x_50 = lean_ctor_get(x_47, 3);
 lean_inc_ref(x_50);
-x_51 = lean_ctor_get_uint8(x_45, sizeof(void*)*6);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- lean_ctor_release(x_45, 2);
- lean_ctor_release(x_45, 3);
- lean_ctor_release(x_45, 4);
- lean_ctor_release(x_45, 5);
- x_52 = x_45;
+x_51 = lean_ctor_get(x_47, 4);
+lean_inc_ref(x_51);
+x_52 = lean_ctor_get(x_47, 5);
+lean_inc_ref(x_52);
+x_53 = lean_ctor_get(x_47, 6);
+lean_inc_ref(x_53);
+x_54 = lean_ctor_get_uint8(x_47, sizeof(void*)*7);
+if (lean_is_exclusive(x_47)) {
+ lean_ctor_release(x_47, 0);
+ lean_ctor_release(x_47, 1);
+ lean_ctor_release(x_47, 2);
+ lean_ctor_release(x_47, 3);
+ lean_ctor_release(x_47, 4);
+ lean_ctor_release(x_47, 5);
+ lean_ctor_release(x_47, 6);
+ x_55 = x_47;
 } else {
- lean_dec_ref(x_45);
- x_52 = lean_box(0);
+ lean_dec_ref(x_47);
+ x_55 = lean_box(0);
 }
-if (lean_is_scalar(x_52)) {
- x_53 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_55)) {
+ x_56 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_53 = x_52;
+ x_56 = x_55;
 }
-lean_ctor_set(x_53, 0, x_44);
-lean_ctor_set(x_53, 1, x_46);
-lean_ctor_set(x_53, 2, x_47);
-lean_ctor_set(x_53, 3, x_48);
-lean_ctor_set(x_53, 4, x_49);
-lean_ctor_set(x_53, 5, x_50);
-lean_ctor_set_uint8(x_53, sizeof(void*)*6, x_51);
-x_54 = lean_st_ref_set(x_4, x_53);
-x_55 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_55, 0, x_43);
-return x_55;
+lean_ctor_set(x_56, 0, x_46);
+lean_ctor_set(x_56, 1, x_48);
+lean_ctor_set(x_56, 2, x_49);
+lean_ctor_set(x_56, 3, x_50);
+lean_ctor_set(x_56, 4, x_51);
+lean_ctor_set(x_56, 5, x_52);
+lean_ctor_set(x_56, 6, x_53);
+lean_ctor_set_uint8(x_56, sizeof(void*)*7, x_54);
+x_57 = lean_st_ref_set(x_4, x_56);
+x_58 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_58, 0, x_45);
+return x_58;
 }
 }
 }
@@ -3053,7 +3063,7 @@ x_9 = l_Lean_Meta_Sym_lowerLooseBVarsS___redArg___closed__0;
 lean_ctor_set(x_6, 0, x_9);
 x_10 = lean_st_ref_set(x_4, x_6);
 x_11 = lean_st_ref_get(x_4);
-x_12 = lean_ctor_get_uint8(x_11, sizeof(void*)*6);
+x_12 = lean_ctor_get_uint8(x_11, sizeof(void*)*7);
 lean_dec(x_11);
 x_13 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_1, x_2, x_3, x_12, x_8);
 x_14 = lean_ctor_get(x_13, 0);
@@ -3076,109 +3086,119 @@ return x_20;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 x_21 = lean_ctor_get(x_16, 1);
 x_22 = lean_ctor_get(x_16, 2);
 x_23 = lean_ctor_get(x_16, 3);
 x_24 = lean_ctor_get(x_16, 4);
 x_25 = lean_ctor_get(x_16, 5);
-x_26 = lean_ctor_get_uint8(x_16, sizeof(void*)*6);
+x_26 = lean_ctor_get(x_16, 6);
+x_27 = lean_ctor_get_uint8(x_16, sizeof(void*)*7);
+lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_dec(x_16);
-x_27 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_27, 0, x_15);
-lean_ctor_set(x_27, 1, x_21);
-lean_ctor_set(x_27, 2, x_22);
-lean_ctor_set(x_27, 3, x_23);
-lean_ctor_set(x_27, 4, x_24);
-lean_ctor_set(x_27, 5, x_25);
-lean_ctor_set_uint8(x_27, sizeof(void*)*6, x_26);
-x_28 = lean_st_ref_set(x_4, x_27);
-x_29 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_29, 0, x_14);
-return x_29;
+x_28 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_28, 0, x_15);
+lean_ctor_set(x_28, 1, x_21);
+lean_ctor_set(x_28, 2, x_22);
+lean_ctor_set(x_28, 3, x_23);
+lean_ctor_set(x_28, 4, x_24);
+lean_ctor_set(x_28, 5, x_25);
+lean_ctor_set(x_28, 6, x_26);
+lean_ctor_set_uint8(x_28, sizeof(void*)*7, x_27);
+x_29 = lean_st_ref_set(x_4, x_28);
+x_30 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_30, 0, x_14);
+return x_30;
 }
 }
 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; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_30 = lean_ctor_get(x_6, 0);
-x_31 = lean_ctor_get(x_6, 1);
-x_32 = lean_ctor_get(x_6, 2);
-x_33 = lean_ctor_get(x_6, 3);
-x_34 = lean_ctor_get(x_6, 4);
-x_35 = lean_ctor_get(x_6, 5);
-x_36 = lean_ctor_get_uint8(x_6, sizeof(void*)*6);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; uint8_t x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_31 = lean_ctor_get(x_6, 0);
+x_32 = lean_ctor_get(x_6, 1);
+x_33 = lean_ctor_get(x_6, 2);
+x_34 = lean_ctor_get(x_6, 3);
+x_35 = lean_ctor_get(x_6, 4);
+x_36 = lean_ctor_get(x_6, 5);
+x_37 = lean_ctor_get(x_6, 6);
+x_38 = lean_ctor_get_uint8(x_6, sizeof(void*)*7);
+lean_inc(x_37);
+lean_inc(x_36);
 lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
-lean_inc(x_30);
 lean_dec(x_6);
-x_37 = l_Lean_Meta_Sym_lowerLooseBVarsS___redArg___closed__0;
-x_38 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_31);
-lean_ctor_set(x_38, 2, x_32);
-lean_ctor_set(x_38, 3, x_33);
-lean_ctor_set(x_38, 4, x_34);
-lean_ctor_set(x_38, 5, x_35);
-lean_ctor_set_uint8(x_38, sizeof(void*)*6, x_36);
-x_39 = lean_st_ref_set(x_4, x_38);
-x_40 = lean_st_ref_get(x_4);
-x_41 = lean_ctor_get_uint8(x_40, sizeof(void*)*6);
-lean_dec(x_40);
-x_42 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_1, x_2, x_3, x_41, x_30);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-lean_dec_ref(x_42);
-x_45 = lean_st_ref_take(x_4);
-x_46 = lean_ctor_get(x_45, 1);
-lean_inc_ref(x_46);
-x_47 = lean_ctor_get(x_45, 2);
-lean_inc_ref(x_47);
-x_48 = lean_ctor_get(x_45, 3);
+x_39 = l_Lean_Meta_Sym_lowerLooseBVarsS___redArg___closed__0;
+x_40 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_32);
+lean_ctor_set(x_40, 2, x_33);
+lean_ctor_set(x_40, 3, x_34);
+lean_ctor_set(x_40, 4, x_35);
+lean_ctor_set(x_40, 5, x_36);
+lean_ctor_set(x_40, 6, x_37);
+lean_ctor_set_uint8(x_40, sizeof(void*)*7, x_38);
+x_41 = lean_st_ref_set(x_4, x_40);
+x_42 = lean_st_ref_get(x_4);
+x_43 = lean_ctor_get_uint8(x_42, sizeof(void*)*7);
+lean_dec(x_42);
+x_44 = l_Lean_Meta_Sym_liftLooseBVarsS_x27(x_1, x_2, x_3, x_43, x_31);
+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_ref(x_44);
+x_47 = lean_st_ref_take(x_4);
+x_48 = lean_ctor_get(x_47, 1);
 lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_45, 4);
+x_49 = lean_ctor_get(x_47, 2);
 lean_inc_ref(x_49);
-x_50 = lean_ctor_get(x_45, 5);
+x_50 = lean_ctor_get(x_47, 3);
 lean_inc_ref(x_50);
-x_51 = lean_ctor_get_uint8(x_45, sizeof(void*)*6);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- lean_ctor_release(x_45, 2);
- lean_ctor_release(x_45, 3);
- lean_ctor_release(x_45, 4);
- lean_ctor_release(x_45, 5);
- x_52 = x_45;
+x_51 = lean_ctor_get(x_47, 4);
+lean_inc_ref(x_51);
+x_52 = lean_ctor_get(x_47, 5);
+lean_inc_ref(x_52);
+x_53 = lean_ctor_get(x_47, 6);
+lean_inc_ref(x_53);
+x_54 = lean_ctor_get_uint8(x_47, sizeof(void*)*7);
+if (lean_is_exclusive(x_47)) {
+ lean_ctor_release(x_47, 0);
+ lean_ctor_release(x_47, 1);
+ lean_ctor_release(x_47, 2);
+ lean_ctor_release(x_47, 3);
+ lean_ctor_release(x_47, 4);
+ lean_ctor_release(x_47, 5);
+ lean_ctor_release(x_47, 6);
+ x_55 = x_47;
 } else {
- lean_dec_ref(x_45);
- x_52 = lean_box(0);
+ lean_dec_ref(x_47);
+ x_55 = lean_box(0);
 }
-if (lean_is_scalar(x_52)) {
- x_53 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_55)) {
+ x_56 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_53 = x_52;
+ x_56 = x_55;
 }
-lean_ctor_set(x_53, 0, x_44);
-lean_ctor_set(x_53, 1, x_46);
-lean_ctor_set(x_53, 2, x_47);
-lean_ctor_set(x_53, 3, x_48);
-lean_ctor_set(x_53, 4, x_49);
-lean_ctor_set(x_53, 5, x_50);
-lean_ctor_set_uint8(x_53, sizeof(void*)*6, x_51);
-x_54 = lean_st_ref_set(x_4, x_53);
-x_55 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_55, 0, x_43);
-return x_55;
+lean_ctor_set(x_56, 0, x_46);
+lean_ctor_set(x_56, 1, x_48);
+lean_ctor_set(x_56, 2, x_49);
+lean_ctor_set(x_56, 3, x_50);
+lean_ctor_set(x_56, 4, x_51);
+lean_ctor_set(x_56, 5, x_52);
+lean_ctor_set(x_56, 6, x_53);
+lean_ctor_set_uint8(x_56, sizeof(void*)*7, x_54);
+x_57 = lean_st_ref_set(x_4, x_56);
+x_58 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_58, 0, x_45);
+return x_58;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Sym/MaxFVar.c b/stage0/stdlib/Lean/Meta/Sym/MaxFVar.c
index fc4b83bbf5..266a653f04 100644
--- a/stage0/stdlib/Lean/Meta/Sym/MaxFVar.c
+++ b/stage0/stdlib/Lean/Meta/Sym/MaxFVar.c
@@ -332,21 +332,21 @@ return x_8;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_check(lean_object* x_1, lean_object* x_2, 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_10; uint8_t x_54; 
-x_54 = l_Lean_Expr_hasFVar(x_1);
-if (x_54 == 0)
+uint8_t x_10; uint8_t x_56; 
+x_56 = l_Lean_Expr_hasFVar(x_1);
+if (x_56 == 0)
 {
-uint8_t x_55; 
-x_55 = l_Lean_Expr_hasMVar(x_1);
-x_10 = x_55;
-goto block_53;
+uint8_t x_57; 
+x_57 = l_Lean_Expr_hasMVar(x_1);
+x_10 = x_57;
+goto block_55;
 }
 else
 {
-x_10 = x_54;
-goto block_53;
+x_10 = x_56;
+goto block_55;
 }
-block_53:
+block_55:
 {
 if (x_10 == 0)
 {
@@ -432,14 +432,16 @@ return x_21;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 x_29 = lean_ctor_get(x_24, 0);
 x_30 = lean_ctor_get(x_24, 1);
 x_31 = lean_ctor_get(x_24, 2);
 x_32 = lean_ctor_get(x_24, 3);
 x_33 = lean_ctor_get(x_24, 4);
 x_34 = lean_ctor_get(x_24, 5);
-x_35 = lean_ctor_get_uint8(x_24, sizeof(void*)*6);
+x_35 = lean_ctor_get(x_24, 6);
+x_36 = lean_ctor_get_uint8(x_24, sizeof(void*)*7);
+lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
@@ -448,71 +450,76 @@ lean_inc(x_30);
 lean_inc(x_29);
 lean_dec(x_24);
 lean_inc(x_23);
-x_36 = l_Lean_PersistentHashMap_insert___redArg(x_15, x_16, x_30, x_1, x_23);
-x_37 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_37, 0, x_29);
-lean_ctor_set(x_37, 1, x_36);
-lean_ctor_set(x_37, 2, x_31);
-lean_ctor_set(x_37, 3, x_32);
-lean_ctor_set(x_37, 4, x_33);
-lean_ctor_set(x_37, 5, x_34);
-lean_ctor_set_uint8(x_37, sizeof(void*)*6, x_35);
-x_38 = lean_st_ref_set(x_4, x_37);
+x_37 = l_Lean_PersistentHashMap_insert___redArg(x_15, x_16, x_30, x_1, x_23);
+x_38 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_38, 0, x_29);
+lean_ctor_set(x_38, 1, x_37);
+lean_ctor_set(x_38, 2, x_31);
+lean_ctor_set(x_38, 3, x_32);
+lean_ctor_set(x_38, 4, x_33);
+lean_ctor_set(x_38, 5, x_34);
+lean_ctor_set(x_38, 6, x_35);
+lean_ctor_set_uint8(x_38, sizeof(void*)*7, x_36);
+x_39 = lean_st_ref_set(x_4, x_38);
 lean_dec(x_4);
 return x_21;
 }
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-x_39 = lean_ctor_get(x_21, 0);
-lean_inc(x_39);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_40 = lean_ctor_get(x_21, 0);
+lean_inc(x_40);
 lean_dec(x_21);
-x_40 = lean_st_ref_take(x_4);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc_ref(x_41);
-x_42 = lean_ctor_get(x_40, 1);
+x_41 = lean_st_ref_take(x_4);
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc_ref(x_42);
-x_43 = lean_ctor_get(x_40, 2);
+x_43 = lean_ctor_get(x_41, 1);
 lean_inc_ref(x_43);
-x_44 = lean_ctor_get(x_40, 3);
+x_44 = lean_ctor_get(x_41, 2);
 lean_inc_ref(x_44);
-x_45 = lean_ctor_get(x_40, 4);
+x_45 = lean_ctor_get(x_41, 3);
 lean_inc_ref(x_45);
-x_46 = lean_ctor_get(x_40, 5);
+x_46 = lean_ctor_get(x_41, 4);
 lean_inc_ref(x_46);
-x_47 = lean_ctor_get_uint8(x_40, sizeof(void*)*6);
-if (lean_is_exclusive(x_40)) {
- lean_ctor_release(x_40, 0);
- lean_ctor_release(x_40, 1);
- lean_ctor_release(x_40, 2);
- lean_ctor_release(x_40, 3);
- lean_ctor_release(x_40, 4);
- lean_ctor_release(x_40, 5);
- x_48 = x_40;
+x_47 = lean_ctor_get(x_41, 5);
+lean_inc_ref(x_47);
+x_48 = lean_ctor_get(x_41, 6);
+lean_inc_ref(x_48);
+x_49 = lean_ctor_get_uint8(x_41, sizeof(void*)*7);
+if (lean_is_exclusive(x_41)) {
+ lean_ctor_release(x_41, 0);
+ lean_ctor_release(x_41, 1);
+ lean_ctor_release(x_41, 2);
+ lean_ctor_release(x_41, 3);
+ lean_ctor_release(x_41, 4);
+ lean_ctor_release(x_41, 5);
+ lean_ctor_release(x_41, 6);
+ x_50 = x_41;
 } else {
- lean_dec_ref(x_40);
- x_48 = lean_box(0);
+ lean_dec_ref(x_41);
+ x_50 = lean_box(0);
 }
-lean_inc(x_39);
-x_49 = l_Lean_PersistentHashMap_insert___redArg(x_15, x_16, x_42, x_1, x_39);
-if (lean_is_scalar(x_48)) {
- x_50 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_40);
+x_51 = l_Lean_PersistentHashMap_insert___redArg(x_15, x_16, x_43, x_1, x_40);
+if (lean_is_scalar(x_50)) {
+ x_52 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_50 = x_48;
+ x_52 = x_50;
 }
-lean_ctor_set(x_50, 0, x_41);
-lean_ctor_set(x_50, 1, x_49);
-lean_ctor_set(x_50, 2, x_43);
-lean_ctor_set(x_50, 3, x_44);
-lean_ctor_set(x_50, 4, x_45);
-lean_ctor_set(x_50, 5, x_46);
-lean_ctor_set_uint8(x_50, sizeof(void*)*6, x_47);
-x_51 = lean_st_ref_set(x_4, x_50);
+lean_ctor_set(x_52, 0, x_42);
+lean_ctor_set(x_52, 1, x_51);
+lean_ctor_set(x_52, 2, x_44);
+lean_ctor_set(x_52, 3, x_45);
+lean_ctor_set(x_52, 4, x_46);
+lean_ctor_set(x_52, 5, x_47);
+lean_ctor_set(x_52, 6, x_48);
+lean_ctor_set_uint8(x_52, sizeof(void*)*7, x_49);
+x_53 = lean_st_ref_set(x_4, x_52);
 lean_dec(x_4);
-x_52 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_52, 0, x_39);
-return x_52;
+x_54 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_54, 0, x_40);
+return x_54;
 }
 }
 else
@@ -1694,48 +1701,48 @@ return x_6;
 LEAN_EXPORT lean_object* l_Lean_Meta_Sym_getMaxFVar_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_9; lean_object* x_42; lean_object* x_43; lean_object* x_62; lean_object* x_63; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_132; 
+lean_object* x_9; lean_object* x_44; lean_object* x_45; lean_object* x_65; lean_object* x_66; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; uint8_t x_110; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_137; 
 switch (lean_obj_tag(x_1)) {
 case 1:
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; 
+lean_object* x_172; lean_object* x_173; lean_object* x_174; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_165 = lean_ctor_get(x_1, 0);
-lean_inc(x_165);
+x_172 = lean_ctor_get(x_1, 0);
+lean_inc(x_172);
 lean_dec_ref(x_1);
-x_166 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_166, 0, x_165);
-x_167 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_167, 0, x_166);
-return x_167;
+x_173 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_173, 0, x_172);
+x_174 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_174, 0, x_173);
+return x_174;
 }
 case 2:
 {
-lean_object* x_168; uint8_t x_169; uint8_t x_198; 
-x_168 = lean_ctor_get(x_1, 0);
-x_198 = l_Lean_Expr_hasFVar(x_1);
-if (x_198 == 0)
+lean_object* x_175; uint8_t x_176; uint8_t x_205; 
+x_175 = lean_ctor_get(x_1, 0);
+x_205 = l_Lean_Expr_hasFVar(x_1);
+if (x_205 == 0)
 {
-uint8_t x_199; 
-x_199 = l_Lean_Expr_hasMVar(x_1);
-x_169 = x_199;
-goto block_197;
+uint8_t x_206; 
+x_206 = l_Lean_Expr_hasMVar(x_1);
+x_176 = x_206;
+goto block_204;
 }
 else
 {
-x_169 = x_198;
-goto block_197;
+x_176 = x_205;
+goto block_204;
 }
-block_197:
+block_204:
 {
-if (x_169 == 0)
+if (x_176 == 0)
 {
-lean_object* x_170; lean_object* x_171; 
+lean_object* x_177; lean_object* x_178; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -1743,166 +1750,166 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_170 = lean_box(0);
-x_171 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_171, 0, x_170);
-return x_171;
-}
-else
-{
-lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-x_172 = lean_st_ref_get(x_3);
-x_173 = lean_ctor_get(x_172, 1);
-lean_inc_ref(x_173);
-lean_dec(x_172);
-x_174 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_173, x_1);
-if (lean_obj_tag(x_174) == 1)
-{
-uint8_t x_175; 
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_175 = !lean_is_exclusive(x_174);
-if (x_175 == 0)
-{
-lean_ctor_set_tag(x_174, 0);
-return x_174;
-}
-else
-{
-lean_object* x_176; lean_object* x_177; 
-x_176 = lean_ctor_get(x_174, 0);
-lean_inc(x_176);
-lean_dec(x_174);
-x_177 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_177, 0, x_176);
-return x_177;
-}
-}
-else
-{
-lean_object* x_178; 
-lean_dec(x_174);
-lean_inc(x_168);
-x_178 = l_Lean_MVarId_getDecl(x_168, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_178) == 0)
-{
-lean_object* x_179; lean_object* x_180; lean_object* x_181; uint8_t x_182; 
-x_179 = lean_ctor_get(x_178, 0);
-lean_inc(x_179);
-lean_dec_ref(x_178);
-x_180 = lean_ctor_get(x_179, 1);
-lean_inc_ref(x_180);
-lean_dec(x_179);
-x_181 = lean_ctor_get(x_180, 1);
-x_182 = l_Lean_PersistentArray_isEmpty___redArg(x_181);
-if (x_182 == 0)
-{
-lean_object* x_183; 
-x_183 = l_Lean_LocalContext_lastDecl(x_180);
-if (lean_obj_tag(x_183) == 1)
-{
-uint8_t x_184; 
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_4);
-lean_dec_ref(x_2);
-x_184 = !lean_is_exclusive(x_183);
-if (x_184 == 0)
-{
-lean_object* x_185; lean_object* x_186; 
-x_185 = lean_ctor_get(x_183, 0);
-x_186 = l_Lean_LocalDecl_fvarId(x_185);
-lean_dec(x_185);
-lean_ctor_set(x_183, 0, x_186);
-x_42 = x_183;
-x_43 = lean_box(0);
-goto block_61;
-}
-else
-{
-lean_object* x_187; lean_object* x_188; lean_object* x_189; 
-x_187 = lean_ctor_get(x_183, 0);
-lean_inc(x_187);
-lean_dec(x_183);
-x_188 = l_Lean_LocalDecl_fvarId(x_187);
-lean_dec(x_187);
-x_189 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_189, 0, x_188);
-x_42 = x_189;
-x_43 = lean_box(0);
-goto block_61;
-}
-}
-else
-{
-lean_object* x_190; lean_object* x_191; 
-lean_dec(x_183);
-x_190 = l_Lean_Meta_Sym_getMaxFVar_x3f___closed__3;
-lean_inc(x_3);
-x_191 = l_panic___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__2(x_190, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_191) == 0)
-{
-lean_object* x_192; 
-x_192 = lean_ctor_get(x_191, 0);
-lean_inc(x_192);
-lean_dec_ref(x_191);
-x_42 = x_192;
-x_43 = lean_box(0);
-goto block_61;
-}
-else
-{
-lean_dec(x_3);
-lean_dec_ref(x_1);
-return x_191;
-}
-}
-}
-else
-{
-lean_object* x_193; 
-lean_dec_ref(x_180);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_4);
-lean_dec_ref(x_2);
-x_193 = lean_box(0);
-x_42 = x_193;
-x_43 = lean_box(0);
-goto block_61;
-}
-}
-else
-{
-uint8_t x_194; 
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_194 = !lean_is_exclusive(x_178);
-if (x_194 == 0)
-{
+x_177 = lean_box(0);
+x_178 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_178, 0, x_177);
 return x_178;
 }
 else
 {
-lean_object* x_195; lean_object* x_196; 
-x_195 = lean_ctor_get(x_178, 0);
-lean_inc(x_195);
-lean_dec(x_178);
+lean_object* x_179; lean_object* x_180; lean_object* x_181; 
+x_179 = lean_st_ref_get(x_3);
+x_180 = lean_ctor_get(x_179, 1);
+lean_inc_ref(x_180);
+lean_dec(x_179);
+x_181 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_180, x_1);
+if (lean_obj_tag(x_181) == 1)
+{
+uint8_t x_182; 
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_182 = !lean_is_exclusive(x_181);
+if (x_182 == 0)
+{
+lean_ctor_set_tag(x_181, 0);
+return x_181;
+}
+else
+{
+lean_object* x_183; lean_object* x_184; 
+x_183 = lean_ctor_get(x_181, 0);
+lean_inc(x_183);
+lean_dec(x_181);
+x_184 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_184, 0, x_183);
+return x_184;
+}
+}
+else
+{
+lean_object* x_185; 
+lean_dec(x_181);
+lean_inc(x_175);
+x_185 = l_Lean_MVarId_getDecl(x_175, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_185) == 0)
+{
+lean_object* x_186; lean_object* x_187; lean_object* x_188; uint8_t x_189; 
+x_186 = lean_ctor_get(x_185, 0);
+lean_inc(x_186);
+lean_dec_ref(x_185);
+x_187 = lean_ctor_get(x_186, 1);
+lean_inc_ref(x_187);
+lean_dec(x_186);
+x_188 = lean_ctor_get(x_187, 1);
+x_189 = l_Lean_PersistentArray_isEmpty___redArg(x_188);
+if (x_189 == 0)
+{
+lean_object* x_190; 
+x_190 = l_Lean_LocalContext_lastDecl(x_187);
+if (lean_obj_tag(x_190) == 1)
+{
+uint8_t x_191; 
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec_ref(x_2);
+x_191 = !lean_is_exclusive(x_190);
+if (x_191 == 0)
+{
+lean_object* x_192; lean_object* x_193; 
+x_192 = lean_ctor_get(x_190, 0);
+x_193 = l_Lean_LocalDecl_fvarId(x_192);
+lean_dec(x_192);
+lean_ctor_set(x_190, 0, x_193);
+x_44 = x_190;
+x_45 = lean_box(0);
+goto block_64;
+}
+else
+{
+lean_object* x_194; lean_object* x_195; lean_object* x_196; 
+x_194 = lean_ctor_get(x_190, 0);
+lean_inc(x_194);
+lean_dec(x_190);
+x_195 = l_Lean_LocalDecl_fvarId(x_194);
+lean_dec(x_194);
 x_196 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_196, 0, x_195);
-return x_196;
+x_44 = x_196;
+x_45 = lean_box(0);
+goto block_64;
+}
+}
+else
+{
+lean_object* x_197; lean_object* x_198; 
+lean_dec(x_190);
+x_197 = l_Lean_Meta_Sym_getMaxFVar_x3f___closed__3;
+lean_inc(x_3);
+x_198 = l_panic___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__2(x_197, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_198) == 0)
+{
+lean_object* x_199; 
+x_199 = lean_ctor_get(x_198, 0);
+lean_inc(x_199);
+lean_dec_ref(x_198);
+x_44 = x_199;
+x_45 = lean_box(0);
+goto block_64;
+}
+else
+{
+lean_dec(x_3);
+lean_dec_ref(x_1);
+return x_198;
+}
+}
+}
+else
+{
+lean_object* x_200; 
+lean_dec_ref(x_187);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec_ref(x_2);
+x_200 = lean_box(0);
+x_44 = x_200;
+x_45 = lean_box(0);
+goto block_64;
+}
+}
+else
+{
+uint8_t x_201; 
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_201 = !lean_is_exclusive(x_185);
+if (x_201 == 0)
+{
+return x_185;
+}
+else
+{
+lean_object* x_202; lean_object* x_203; 
+x_202 = lean_ctor_get(x_185, 0);
+lean_inc(x_202);
+lean_dec(x_185);
+x_203 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_203, 0, x_202);
+return x_203;
 }
 }
 }
@@ -1911,27 +1918,27 @@ return x_196;
 }
 case 5:
 {
-lean_object* x_200; lean_object* x_201; uint8_t x_202; uint8_t x_217; 
-x_200 = lean_ctor_get(x_1, 0);
-x_201 = lean_ctor_get(x_1, 1);
-x_217 = l_Lean_Expr_hasFVar(x_1);
-if (x_217 == 0)
+lean_object* x_207; lean_object* x_208; uint8_t x_209; uint8_t x_224; 
+x_207 = lean_ctor_get(x_1, 0);
+x_208 = lean_ctor_get(x_1, 1);
+x_224 = l_Lean_Expr_hasFVar(x_1);
+if (x_224 == 0)
 {
-uint8_t x_218; 
-x_218 = l_Lean_Expr_hasMVar(x_1);
-x_202 = x_218;
-goto block_216;
+uint8_t x_225; 
+x_225 = l_Lean_Expr_hasMVar(x_1);
+x_209 = x_225;
+goto block_223;
 }
 else
 {
-x_202 = x_217;
-goto block_216;
+x_209 = x_224;
+goto block_223;
 }
-block_216:
+block_223:
 {
-if (x_202 == 0)
+if (x_209 == 0)
 {
-lean_object* x_203; lean_object* x_204; 
+lean_object* x_210; lean_object* x_211; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -1939,22 +1946,22 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_203 = lean_box(0);
-x_204 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_204, 0, x_203);
-return x_204;
+x_210 = lean_box(0);
+x_211 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_211, 0, x_210);
+return x_211;
 }
 else
 {
-lean_object* x_205; lean_object* x_206; lean_object* x_207; 
-x_205 = lean_st_ref_get(x_3);
-x_206 = lean_ctor_get(x_205, 1);
-lean_inc_ref(x_206);
-lean_dec(x_205);
-x_207 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_206, x_1);
-if (lean_obj_tag(x_207) == 1)
+lean_object* x_212; lean_object* x_213; lean_object* x_214; 
+x_212 = lean_st_ref_get(x_3);
+x_213 = lean_ctor_get(x_212, 1);
+lean_inc_ref(x_213);
+lean_dec(x_212);
+x_214 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_213, x_1);
+if (lean_obj_tag(x_214) == 1)
 {
-uint8_t x_208; 
+uint8_t x_215; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -1962,67 +1969,67 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_208 = !lean_is_exclusive(x_207);
-if (x_208 == 0)
+x_215 = !lean_is_exclusive(x_214);
+if (x_215 == 0)
 {
-lean_ctor_set_tag(x_207, 0);
-return x_207;
+lean_ctor_set_tag(x_214, 0);
+return x_214;
 }
 else
 {
-lean_object* x_209; lean_object* x_210; 
-x_209 = lean_ctor_get(x_207, 0);
-lean_inc(x_209);
-lean_dec(x_207);
-x_210 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_210, 0, x_209);
-return x_210;
+lean_object* x_216; lean_object* x_217; 
+x_216 = lean_ctor_get(x_214, 0);
+lean_inc(x_216);
+lean_dec(x_214);
+x_217 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_217, 0, x_216);
+return x_217;
 }
 }
 else
 {
-lean_object* x_211; 
-lean_dec(x_207);
+lean_object* x_218; 
+lean_dec(x_214);
 lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc_ref(x_4);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-lean_inc_ref(x_200);
-x_211 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_200, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_211) == 0)
+lean_inc_ref(x_207);
+x_218 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_207, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_218) == 0)
 {
-lean_object* x_212; lean_object* x_213; 
-x_212 = lean_ctor_get(x_211, 0);
-lean_inc(x_212);
-lean_dec_ref(x_211);
+lean_object* x_219; lean_object* x_220; 
+x_219 = lean_ctor_get(x_218, 0);
+lean_inc(x_219);
+lean_dec_ref(x_218);
 lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc_ref(x_4);
 lean_inc(x_3);
-lean_inc_ref(x_201);
-x_213 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_201, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_213) == 0)
+lean_inc_ref(x_208);
+x_220 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_208, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_220) == 0)
 {
-lean_object* x_214; lean_object* x_215; 
-x_214 = lean_ctor_get(x_213, 0);
-lean_inc(x_214);
-lean_dec_ref(x_213);
-x_215 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_212, x_214, x_4, x_6, x_7);
+lean_object* x_221; lean_object* x_222; 
+x_221 = lean_ctor_get(x_220, 0);
+lean_inc(x_221);
+lean_dec_ref(x_220);
+x_222 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_219, x_221, x_4, x_6, x_7);
 lean_dec(x_7);
 lean_dec_ref(x_6);
-x_132 = x_215;
-goto block_164;
+x_137 = x_222;
+goto block_171;
 }
 else
 {
-lean_dec(x_212);
+lean_dec(x_219);
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
-x_132 = x_213;
-goto block_164;
+x_137 = x_220;
+goto block_171;
 }
 }
 else
@@ -2032,8 +2039,8 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_2);
-x_132 = x_211;
-goto block_164;
+x_137 = x_218;
+goto block_171;
 }
 }
 }
@@ -2041,64 +2048,64 @@ goto block_164;
 }
 case 6:
 {
-lean_object* x_219; lean_object* x_220; 
-x_219 = lean_ctor_get(x_1, 1);
-x_220 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_220);
-lean_inc_ref(x_219);
-x_120 = x_219;
-x_121 = x_220;
-x_122 = x_2;
-x_123 = x_3;
-x_124 = x_4;
-x_125 = x_5;
-x_126 = x_6;
-x_127 = x_7;
-x_128 = lean_box(0);
-goto block_131;
+lean_object* x_226; lean_object* x_227; 
+x_226 = lean_ctor_get(x_1, 1);
+x_227 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_227);
+lean_inc_ref(x_226);
+x_125 = x_226;
+x_126 = x_227;
+x_127 = x_2;
+x_128 = x_3;
+x_129 = x_4;
+x_130 = x_5;
+x_131 = x_6;
+x_132 = x_7;
+x_133 = lean_box(0);
+goto block_136;
 }
 case 7:
 {
-lean_object* x_221; lean_object* x_222; 
-x_221 = lean_ctor_get(x_1, 1);
-x_222 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_222);
-lean_inc_ref(x_221);
-x_120 = x_221;
-x_121 = x_222;
-x_122 = x_2;
-x_123 = x_3;
-x_124 = x_4;
-x_125 = x_5;
-x_126 = x_6;
-x_127 = x_7;
-x_128 = lean_box(0);
-goto block_131;
+lean_object* x_228; lean_object* x_229; 
+x_228 = lean_ctor_get(x_1, 1);
+x_229 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_229);
+lean_inc_ref(x_228);
+x_125 = x_228;
+x_126 = x_229;
+x_127 = x_2;
+x_128 = x_3;
+x_129 = x_4;
+x_130 = x_5;
+x_131 = x_6;
+x_132 = x_7;
+x_133 = lean_box(0);
+goto block_136;
 }
 case 8:
 {
-lean_object* x_223; lean_object* x_224; lean_object* x_225; uint8_t x_226; uint8_t x_245; 
-x_223 = lean_ctor_get(x_1, 1);
-x_224 = lean_ctor_get(x_1, 2);
-x_225 = lean_ctor_get(x_1, 3);
-x_245 = l_Lean_Expr_hasFVar(x_1);
-if (x_245 == 0)
+lean_object* x_230; lean_object* x_231; lean_object* x_232; uint8_t x_233; uint8_t x_252; 
+x_230 = lean_ctor_get(x_1, 1);
+x_231 = lean_ctor_get(x_1, 2);
+x_232 = lean_ctor_get(x_1, 3);
+x_252 = l_Lean_Expr_hasFVar(x_1);
+if (x_252 == 0)
 {
-uint8_t x_246; 
-x_246 = l_Lean_Expr_hasMVar(x_1);
-x_226 = x_246;
-goto block_244;
+uint8_t x_253; 
+x_253 = l_Lean_Expr_hasMVar(x_1);
+x_233 = x_253;
+goto block_251;
 }
 else
 {
-x_226 = x_245;
-goto block_244;
+x_233 = x_252;
+goto block_251;
 }
-block_244:
+block_251:
 {
-if (x_226 == 0)
+if (x_233 == 0)
 {
-lean_object* x_227; lean_object* x_228; 
+lean_object* x_234; lean_object* x_235; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -2106,22 +2113,22 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_227 = lean_box(0);
-x_228 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_228, 0, x_227);
-return x_228;
+x_234 = lean_box(0);
+x_235 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_235, 0, x_234);
+return x_235;
 }
 else
 {
-lean_object* x_229; lean_object* x_230; lean_object* x_231; 
-x_229 = lean_st_ref_get(x_3);
-x_230 = lean_ctor_get(x_229, 1);
-lean_inc_ref(x_230);
-lean_dec(x_229);
-x_231 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_230, x_1);
-if (lean_obj_tag(x_231) == 1)
+lean_object* x_236; lean_object* x_237; lean_object* x_238; 
+x_236 = lean_st_ref_get(x_3);
+x_237 = lean_ctor_get(x_236, 1);
+lean_inc_ref(x_237);
+lean_dec(x_236);
+x_238 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_237, x_1);
+if (lean_obj_tag(x_238) == 1)
 {
-uint8_t x_232; 
+uint8_t x_239; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -2129,89 +2136,89 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_232 = !lean_is_exclusive(x_231);
-if (x_232 == 0)
+x_239 = !lean_is_exclusive(x_238);
+if (x_239 == 0)
 {
-lean_ctor_set_tag(x_231, 0);
-return x_231;
+lean_ctor_set_tag(x_238, 0);
+return x_238;
 }
 else
 {
-lean_object* x_233; lean_object* x_234; 
-x_233 = lean_ctor_get(x_231, 0);
-lean_inc(x_233);
-lean_dec(x_231);
-x_234 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_234, 0, x_233);
-return x_234;
-}
-}
-else
-{
-lean_object* x_235; 
-lean_dec(x_231);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc_ref(x_4);
-lean_inc(x_3);
-lean_inc_ref(x_2);
-lean_inc_ref(x_223);
-x_235 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_223, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_235) == 0)
-{
-lean_object* x_236; lean_object* x_237; 
-x_236 = lean_ctor_get(x_235, 0);
-lean_inc(x_236);
-lean_dec_ref(x_235);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc_ref(x_4);
-lean_inc(x_3);
-lean_inc_ref(x_2);
-lean_inc_ref(x_224);
-x_237 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_224, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_237) == 0)
-{
-lean_object* x_238; lean_object* x_239; 
-x_238 = lean_ctor_get(x_237, 0);
-lean_inc(x_238);
-lean_dec_ref(x_237);
-lean_inc_ref(x_4);
-x_239 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_236, x_238, x_4, x_6, x_7);
-if (lean_obj_tag(x_239) == 0)
-{
 lean_object* x_240; lean_object* x_241; 
-x_240 = lean_ctor_get(x_239, 0);
+x_240 = lean_ctor_get(x_238, 0);
 lean_inc(x_240);
-lean_dec_ref(x_239);
+lean_dec(x_238);
+x_241 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_241, 0, x_240);
+return x_241;
+}
+}
+else
+{
+lean_object* x_242; 
+lean_dec(x_238);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc_ref(x_4);
+lean_inc(x_3);
+lean_inc_ref(x_2);
+lean_inc_ref(x_230);
+x_242 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_230, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_242) == 0)
+{
+lean_object* x_243; lean_object* x_244; 
+x_243 = lean_ctor_get(x_242, 0);
+lean_inc(x_243);
+lean_dec_ref(x_242);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc_ref(x_4);
+lean_inc(x_3);
+lean_inc_ref(x_2);
+lean_inc_ref(x_231);
+x_244 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_231, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_244) == 0)
+{
+lean_object* x_245; lean_object* x_246; 
+x_245 = lean_ctor_get(x_244, 0);
+lean_inc(x_245);
+lean_dec_ref(x_244);
+lean_inc_ref(x_4);
+x_246 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_243, x_245, x_4, x_6, x_7);
+if (lean_obj_tag(x_246) == 0)
+{
+lean_object* x_247; lean_object* x_248; 
+x_247 = lean_ctor_get(x_246, 0);
+lean_inc(x_247);
+lean_dec_ref(x_246);
 lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc_ref(x_4);
 lean_inc(x_3);
-lean_inc_ref(x_225);
-x_241 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_225, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_241) == 0)
+lean_inc_ref(x_232);
+x_248 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_232, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_248) == 0)
 {
-lean_object* x_242; lean_object* x_243; 
-x_242 = lean_ctor_get(x_241, 0);
-lean_inc(x_242);
-lean_dec_ref(x_241);
-x_243 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_240, x_242, x_4, x_6, x_7);
+lean_object* x_249; lean_object* x_250; 
+x_249 = lean_ctor_get(x_248, 0);
+lean_inc(x_249);
+lean_dec_ref(x_248);
+x_250 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_247, x_249, x_4, x_6, x_7);
 lean_dec(x_7);
 lean_dec_ref(x_6);
-x_9 = x_243;
-goto block_41;
+x_9 = x_250;
+goto block_43;
 }
 else
 {
-lean_dec(x_240);
+lean_dec(x_247);
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
-x_9 = x_241;
-goto block_41;
+x_9 = x_248;
+goto block_43;
 }
 }
 else
@@ -2221,20 +2228,20 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_2);
-x_9 = x_239;
-goto block_41;
+x_9 = x_246;
+goto block_43;
 }
 }
 else
 {
-lean_dec(x_236);
+lean_dec(x_243);
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_2);
-x_9 = x_237;
-goto block_41;
+x_9 = x_244;
+goto block_43;
 }
 }
 else
@@ -2244,8 +2251,8 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_2);
-x_9 = x_235;
-goto block_41;
+x_9 = x_242;
+goto block_43;
 }
 }
 }
@@ -2253,193 +2260,200 @@ goto block_41;
 }
 case 10:
 {
-lean_object* x_247; uint8_t x_248; uint8_t x_290; 
-x_247 = lean_ctor_get(x_1, 1);
-lean_inc_ref(x_247);
+lean_object* x_254; uint8_t x_255; uint8_t x_299; 
+x_254 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_254);
 lean_dec_ref(x_1);
-x_290 = l_Lean_Expr_hasFVar(x_247);
-if (x_290 == 0)
+x_299 = l_Lean_Expr_hasFVar(x_254);
+if (x_299 == 0)
 {
-uint8_t x_291; 
-x_291 = l_Lean_Expr_hasMVar(x_247);
-x_248 = x_291;
-goto block_289;
+uint8_t x_300; 
+x_300 = l_Lean_Expr_hasMVar(x_254);
+x_255 = x_300;
+goto block_298;
 }
 else
 {
-x_248 = x_290;
-goto block_289;
+x_255 = x_299;
+goto block_298;
 }
-block_289:
+block_298:
 {
-if (x_248 == 0)
+if (x_255 == 0)
 {
-lean_object* x_249; lean_object* x_250; 
-lean_dec_ref(x_247);
+lean_object* x_256; lean_object* x_257; 
+lean_dec_ref(x_254);
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_249 = lean_box(0);
-x_250 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_250, 0, x_249);
-return x_250;
+x_256 = lean_box(0);
+x_257 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_257, 0, x_256);
+return x_257;
 }
 else
 {
-lean_object* x_251; lean_object* x_252; lean_object* x_253; 
-x_251 = lean_st_ref_get(x_3);
-x_252 = lean_ctor_get(x_251, 1);
-lean_inc_ref(x_252);
-lean_dec(x_251);
-x_253 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_252, x_247);
-if (lean_obj_tag(x_253) == 1)
+lean_object* x_258; lean_object* x_259; lean_object* x_260; 
+x_258 = lean_st_ref_get(x_3);
+x_259 = lean_ctor_get(x_258, 1);
+lean_inc_ref(x_259);
+lean_dec(x_258);
+x_260 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_259, x_254);
+if (lean_obj_tag(x_260) == 1)
 {
-uint8_t x_254; 
-lean_dec_ref(x_247);
+uint8_t x_261; 
+lean_dec_ref(x_254);
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_254 = !lean_is_exclusive(x_253);
-if (x_254 == 0)
-{
-lean_ctor_set_tag(x_253, 0);
-return x_253;
-}
-else
-{
-lean_object* x_255; lean_object* x_256; 
-x_255 = lean_ctor_get(x_253, 0);
-lean_inc(x_255);
-lean_dec(x_253);
-x_256 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_256, 0, x_255);
-return x_256;
-}
-}
-else
-{
-lean_object* x_257; 
-lean_dec(x_253);
-lean_inc(x_3);
-lean_inc_ref(x_247);
-x_257 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_247, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_257) == 0)
-{
-uint8_t x_258; 
-x_258 = !lean_is_exclusive(x_257);
-if (x_258 == 0)
-{
-lean_object* x_259; lean_object* x_260; uint8_t x_261; 
-x_259 = lean_ctor_get(x_257, 0);
-x_260 = lean_st_ref_take(x_3);
 x_261 = !lean_is_exclusive(x_260);
 if (x_261 == 0)
 {
-lean_object* x_262; lean_object* x_263; lean_object* x_264; 
-x_262 = lean_ctor_get(x_260, 1);
-lean_inc(x_259);
-x_263 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_262, x_247, x_259);
-lean_ctor_set(x_260, 1, x_263);
-x_264 = lean_st_ref_set(x_3, x_260);
-lean_dec(x_3);
-return x_257;
+lean_ctor_set_tag(x_260, 0);
+return x_260;
 }
 else
 {
-lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; uint8_t x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
-x_265 = lean_ctor_get(x_260, 0);
-x_266 = lean_ctor_get(x_260, 1);
-x_267 = lean_ctor_get(x_260, 2);
-x_268 = lean_ctor_get(x_260, 3);
-x_269 = lean_ctor_get(x_260, 4);
-x_270 = lean_ctor_get(x_260, 5);
-x_271 = lean_ctor_get_uint8(x_260, sizeof(void*)*6);
-lean_inc(x_270);
-lean_inc(x_269);
-lean_inc(x_268);
-lean_inc(x_267);
-lean_inc(x_266);
-lean_inc(x_265);
+lean_object* x_262; lean_object* x_263; 
+x_262 = lean_ctor_get(x_260, 0);
+lean_inc(x_262);
 lean_dec(x_260);
-lean_inc(x_259);
-x_272 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_266, x_247, x_259);
-x_273 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_273, 0, x_265);
-lean_ctor_set(x_273, 1, x_272);
-lean_ctor_set(x_273, 2, x_267);
-lean_ctor_set(x_273, 3, x_268);
-lean_ctor_set(x_273, 4, x_269);
-lean_ctor_set(x_273, 5, x_270);
-lean_ctor_set_uint8(x_273, sizeof(void*)*6, x_271);
-x_274 = lean_st_ref_set(x_3, x_273);
-lean_dec(x_3);
-return x_257;
+x_263 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_263, 0, x_262);
+return x_263;
 }
 }
 else
 {
-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; uint8_t x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; 
-x_275 = lean_ctor_get(x_257, 0);
-lean_inc(x_275);
-lean_dec(x_257);
-x_276 = lean_st_ref_take(x_3);
-x_277 = lean_ctor_get(x_276, 0);
-lean_inc_ref(x_277);
-x_278 = lean_ctor_get(x_276, 1);
-lean_inc_ref(x_278);
-x_279 = lean_ctor_get(x_276, 2);
-lean_inc_ref(x_279);
-x_280 = lean_ctor_get(x_276, 3);
-lean_inc_ref(x_280);
-x_281 = lean_ctor_get(x_276, 4);
-lean_inc_ref(x_281);
-x_282 = lean_ctor_get(x_276, 5);
-lean_inc_ref(x_282);
-x_283 = lean_ctor_get_uint8(x_276, sizeof(void*)*6);
-if (lean_is_exclusive(x_276)) {
- lean_ctor_release(x_276, 0);
- lean_ctor_release(x_276, 1);
- lean_ctor_release(x_276, 2);
- lean_ctor_release(x_276, 3);
- lean_ctor_release(x_276, 4);
- lean_ctor_release(x_276, 5);
- x_284 = x_276;
-} else {
- lean_dec_ref(x_276);
- x_284 = lean_box(0);
-}
-lean_inc(x_275);
-x_285 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_278, x_247, x_275);
-if (lean_is_scalar(x_284)) {
- x_286 = lean_alloc_ctor(0, 6, 1);
-} else {
- x_286 = x_284;
-}
-lean_ctor_set(x_286, 0, x_277);
-lean_ctor_set(x_286, 1, x_285);
-lean_ctor_set(x_286, 2, x_279);
-lean_ctor_set(x_286, 3, x_280);
-lean_ctor_set(x_286, 4, x_281);
-lean_ctor_set(x_286, 5, x_282);
-lean_ctor_set_uint8(x_286, sizeof(void*)*6, x_283);
-x_287 = lean_st_ref_set(x_3, x_286);
+lean_object* x_264; 
+lean_dec(x_260);
+lean_inc(x_3);
+lean_inc_ref(x_254);
+x_264 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_254, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_264) == 0)
+{
+uint8_t x_265; 
+x_265 = !lean_is_exclusive(x_264);
+if (x_265 == 0)
+{
+lean_object* x_266; lean_object* x_267; uint8_t x_268; 
+x_266 = lean_ctor_get(x_264, 0);
+x_267 = lean_st_ref_take(x_3);
+x_268 = !lean_is_exclusive(x_267);
+if (x_268 == 0)
+{
+lean_object* x_269; lean_object* x_270; lean_object* x_271; 
+x_269 = lean_ctor_get(x_267, 1);
+lean_inc(x_266);
+x_270 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_269, x_254, x_266);
+lean_ctor_set(x_267, 1, x_270);
+x_271 = lean_st_ref_set(x_3, x_267);
 lean_dec(x_3);
-x_288 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_288, 0, x_275);
-return x_288;
+return x_264;
+}
+else
+{
+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; uint8_t x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; 
+x_272 = lean_ctor_get(x_267, 0);
+x_273 = lean_ctor_get(x_267, 1);
+x_274 = lean_ctor_get(x_267, 2);
+x_275 = lean_ctor_get(x_267, 3);
+x_276 = lean_ctor_get(x_267, 4);
+x_277 = lean_ctor_get(x_267, 5);
+x_278 = lean_ctor_get(x_267, 6);
+x_279 = lean_ctor_get_uint8(x_267, sizeof(void*)*7);
+lean_inc(x_278);
+lean_inc(x_277);
+lean_inc(x_276);
+lean_inc(x_275);
+lean_inc(x_274);
+lean_inc(x_273);
+lean_inc(x_272);
+lean_dec(x_267);
+lean_inc(x_266);
+x_280 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_273, x_254, x_266);
+x_281 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_281, 0, x_272);
+lean_ctor_set(x_281, 1, x_280);
+lean_ctor_set(x_281, 2, x_274);
+lean_ctor_set(x_281, 3, x_275);
+lean_ctor_set(x_281, 4, x_276);
+lean_ctor_set(x_281, 5, x_277);
+lean_ctor_set(x_281, 6, x_278);
+lean_ctor_set_uint8(x_281, sizeof(void*)*7, x_279);
+x_282 = lean_st_ref_set(x_3, x_281);
+lean_dec(x_3);
+return x_264;
 }
 }
 else
 {
-lean_dec_ref(x_247);
+lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; uint8_t x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; 
+x_283 = lean_ctor_get(x_264, 0);
+lean_inc(x_283);
+lean_dec(x_264);
+x_284 = lean_st_ref_take(x_3);
+x_285 = lean_ctor_get(x_284, 0);
+lean_inc_ref(x_285);
+x_286 = lean_ctor_get(x_284, 1);
+lean_inc_ref(x_286);
+x_287 = lean_ctor_get(x_284, 2);
+lean_inc_ref(x_287);
+x_288 = lean_ctor_get(x_284, 3);
+lean_inc_ref(x_288);
+x_289 = lean_ctor_get(x_284, 4);
+lean_inc_ref(x_289);
+x_290 = lean_ctor_get(x_284, 5);
+lean_inc_ref(x_290);
+x_291 = lean_ctor_get(x_284, 6);
+lean_inc_ref(x_291);
+x_292 = lean_ctor_get_uint8(x_284, sizeof(void*)*7);
+if (lean_is_exclusive(x_284)) {
+ lean_ctor_release(x_284, 0);
+ lean_ctor_release(x_284, 1);
+ lean_ctor_release(x_284, 2);
+ lean_ctor_release(x_284, 3);
+ lean_ctor_release(x_284, 4);
+ lean_ctor_release(x_284, 5);
+ lean_ctor_release(x_284, 6);
+ x_293 = x_284;
+} else {
+ lean_dec_ref(x_284);
+ x_293 = lean_box(0);
+}
+lean_inc(x_283);
+x_294 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_286, x_254, x_283);
+if (lean_is_scalar(x_293)) {
+ x_295 = lean_alloc_ctor(0, 7, 1);
+} else {
+ x_295 = x_293;
+}
+lean_ctor_set(x_295, 0, x_285);
+lean_ctor_set(x_295, 1, x_294);
+lean_ctor_set(x_295, 2, x_287);
+lean_ctor_set(x_295, 3, x_288);
+lean_ctor_set(x_295, 4, x_289);
+lean_ctor_set(x_295, 5, x_290);
+lean_ctor_set(x_295, 6, x_291);
+lean_ctor_set_uint8(x_295, sizeof(void*)*7, x_292);
+x_296 = lean_st_ref_set(x_3, x_295);
 lean_dec(x_3);
-return x_257;
+x_297 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_297, 0, x_283);
+return x_297;
+}
+}
+else
+{
+lean_dec_ref(x_254);
+lean_dec(x_3);
+return x_264;
 }
 }
 }
@@ -2447,26 +2461,26 @@ return x_257;
 }
 case 11:
 {
-lean_object* x_292; uint8_t x_293; uint8_t x_335; 
-x_292 = lean_ctor_get(x_1, 2);
-x_335 = l_Lean_Expr_hasFVar(x_1);
-if (x_335 == 0)
+lean_object* x_301; uint8_t x_302; uint8_t x_346; 
+x_301 = lean_ctor_get(x_1, 2);
+x_346 = l_Lean_Expr_hasFVar(x_1);
+if (x_346 == 0)
 {
-uint8_t x_336; 
-x_336 = l_Lean_Expr_hasMVar(x_1);
-x_293 = x_336;
-goto block_334;
+uint8_t x_347; 
+x_347 = l_Lean_Expr_hasMVar(x_1);
+x_302 = x_347;
+goto block_345;
 }
 else
 {
-x_293 = x_335;
-goto block_334;
+x_302 = x_346;
+goto block_345;
 }
-block_334:
+block_345:
 {
-if (x_293 == 0)
+if (x_302 == 0)
 {
-lean_object* x_294; lean_object* x_295; 
+lean_object* x_303; lean_object* x_304; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -2474,164 +2488,171 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_294 = lean_box(0);
-x_295 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_295, 0, x_294);
-return x_295;
+x_303 = lean_box(0);
+x_304 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_304, 0, x_303);
+return x_304;
 }
 else
 {
-lean_object* x_296; lean_object* x_297; lean_object* x_298; 
-x_296 = lean_st_ref_get(x_3);
-x_297 = lean_ctor_get(x_296, 1);
-lean_inc_ref(x_297);
-lean_dec(x_296);
-x_298 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_297, x_1);
-if (lean_obj_tag(x_298) == 1)
-{
-uint8_t x_299; 
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_299 = !lean_is_exclusive(x_298);
-if (x_299 == 0)
-{
-lean_ctor_set_tag(x_298, 0);
-return x_298;
-}
-else
-{
-lean_object* x_300; lean_object* x_301; 
-x_300 = lean_ctor_get(x_298, 0);
-lean_inc(x_300);
-lean_dec(x_298);
-x_301 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_301, 0, x_300);
-return x_301;
-}
-}
-else
-{
-lean_object* x_302; 
-lean_dec(x_298);
-lean_inc(x_3);
-lean_inc_ref(x_292);
-x_302 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_292, x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_302) == 0)
-{
-uint8_t x_303; 
-x_303 = !lean_is_exclusive(x_302);
-if (x_303 == 0)
-{
-lean_object* x_304; lean_object* x_305; uint8_t x_306; 
-x_304 = lean_ctor_get(x_302, 0);
-x_305 = lean_st_ref_take(x_3);
-x_306 = !lean_is_exclusive(x_305);
-if (x_306 == 0)
-{
-lean_object* x_307; lean_object* x_308; lean_object* x_309; 
-x_307 = lean_ctor_get(x_305, 1);
-lean_inc(x_304);
-x_308 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_307, x_1, x_304);
-lean_ctor_set(x_305, 1, x_308);
-x_309 = lean_st_ref_set(x_3, x_305);
-lean_dec(x_3);
-return x_302;
-}
-else
-{
-lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; uint8_t x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; 
-x_310 = lean_ctor_get(x_305, 0);
-x_311 = lean_ctor_get(x_305, 1);
-x_312 = lean_ctor_get(x_305, 2);
-x_313 = lean_ctor_get(x_305, 3);
-x_314 = lean_ctor_get(x_305, 4);
-x_315 = lean_ctor_get(x_305, 5);
-x_316 = lean_ctor_get_uint8(x_305, sizeof(void*)*6);
-lean_inc(x_315);
-lean_inc(x_314);
-lean_inc(x_313);
-lean_inc(x_312);
-lean_inc(x_311);
-lean_inc(x_310);
+lean_object* x_305; lean_object* x_306; lean_object* x_307; 
+x_305 = lean_st_ref_get(x_3);
+x_306 = lean_ctor_get(x_305, 1);
+lean_inc_ref(x_306);
 lean_dec(x_305);
-lean_inc(x_304);
-x_317 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_311, x_1, x_304);
-x_318 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_318, 0, x_310);
-lean_ctor_set(x_318, 1, x_317);
-lean_ctor_set(x_318, 2, x_312);
-lean_ctor_set(x_318, 3, x_313);
-lean_ctor_set(x_318, 4, x_314);
-lean_ctor_set(x_318, 5, x_315);
-lean_ctor_set_uint8(x_318, sizeof(void*)*6, x_316);
-x_319 = lean_st_ref_set(x_3, x_318);
+x_307 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_306, x_1);
+if (lean_obj_tag(x_307) == 1)
+{
+uint8_t x_308; 
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
 lean_dec(x_3);
-return x_302;
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_308 = !lean_is_exclusive(x_307);
+if (x_308 == 0)
+{
+lean_ctor_set_tag(x_307, 0);
+return x_307;
+}
+else
+{
+lean_object* x_309; lean_object* x_310; 
+x_309 = lean_ctor_get(x_307, 0);
+lean_inc(x_309);
+lean_dec(x_307);
+x_310 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_310, 0, x_309);
+return x_310;
 }
 }
 else
 {
-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; uint8_t x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; 
-x_320 = lean_ctor_get(x_302, 0);
-lean_inc(x_320);
-lean_dec(x_302);
-x_321 = lean_st_ref_take(x_3);
-x_322 = lean_ctor_get(x_321, 0);
-lean_inc_ref(x_322);
-x_323 = lean_ctor_get(x_321, 1);
-lean_inc_ref(x_323);
-x_324 = lean_ctor_get(x_321, 2);
-lean_inc_ref(x_324);
-x_325 = lean_ctor_get(x_321, 3);
-lean_inc_ref(x_325);
-x_326 = lean_ctor_get(x_321, 4);
-lean_inc_ref(x_326);
-x_327 = lean_ctor_get(x_321, 5);
-lean_inc_ref(x_327);
-x_328 = lean_ctor_get_uint8(x_321, sizeof(void*)*6);
-if (lean_is_exclusive(x_321)) {
- lean_ctor_release(x_321, 0);
- lean_ctor_release(x_321, 1);
- lean_ctor_release(x_321, 2);
- lean_ctor_release(x_321, 3);
- lean_ctor_release(x_321, 4);
- lean_ctor_release(x_321, 5);
- x_329 = x_321;
-} else {
- lean_dec_ref(x_321);
- x_329 = lean_box(0);
-}
-lean_inc(x_320);
-x_330 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_323, x_1, x_320);
-if (lean_is_scalar(x_329)) {
- x_331 = lean_alloc_ctor(0, 6, 1);
-} else {
- x_331 = x_329;
-}
-lean_ctor_set(x_331, 0, x_322);
-lean_ctor_set(x_331, 1, x_330);
-lean_ctor_set(x_331, 2, x_324);
-lean_ctor_set(x_331, 3, x_325);
-lean_ctor_set(x_331, 4, x_326);
-lean_ctor_set(x_331, 5, x_327);
-lean_ctor_set_uint8(x_331, sizeof(void*)*6, x_328);
-x_332 = lean_st_ref_set(x_3, x_331);
+lean_object* x_311; 
+lean_dec(x_307);
+lean_inc(x_3);
+lean_inc_ref(x_301);
+x_311 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_301, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_311) == 0)
+{
+uint8_t x_312; 
+x_312 = !lean_is_exclusive(x_311);
+if (x_312 == 0)
+{
+lean_object* x_313; lean_object* x_314; uint8_t x_315; 
+x_313 = lean_ctor_get(x_311, 0);
+x_314 = lean_st_ref_take(x_3);
+x_315 = !lean_is_exclusive(x_314);
+if (x_315 == 0)
+{
+lean_object* x_316; lean_object* x_317; lean_object* x_318; 
+x_316 = lean_ctor_get(x_314, 1);
+lean_inc(x_313);
+x_317 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_316, x_1, x_313);
+lean_ctor_set(x_314, 1, x_317);
+x_318 = lean_st_ref_set(x_3, x_314);
 lean_dec(x_3);
-x_333 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_333, 0, x_320);
-return x_333;
+return x_311;
+}
+else
+{
+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; uint8_t x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; 
+x_319 = lean_ctor_get(x_314, 0);
+x_320 = lean_ctor_get(x_314, 1);
+x_321 = lean_ctor_get(x_314, 2);
+x_322 = lean_ctor_get(x_314, 3);
+x_323 = lean_ctor_get(x_314, 4);
+x_324 = lean_ctor_get(x_314, 5);
+x_325 = lean_ctor_get(x_314, 6);
+x_326 = lean_ctor_get_uint8(x_314, sizeof(void*)*7);
+lean_inc(x_325);
+lean_inc(x_324);
+lean_inc(x_323);
+lean_inc(x_322);
+lean_inc(x_321);
+lean_inc(x_320);
+lean_inc(x_319);
+lean_dec(x_314);
+lean_inc(x_313);
+x_327 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_320, x_1, x_313);
+x_328 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_328, 0, x_319);
+lean_ctor_set(x_328, 1, x_327);
+lean_ctor_set(x_328, 2, x_321);
+lean_ctor_set(x_328, 3, x_322);
+lean_ctor_set(x_328, 4, x_323);
+lean_ctor_set(x_328, 5, x_324);
+lean_ctor_set(x_328, 6, x_325);
+lean_ctor_set_uint8(x_328, sizeof(void*)*7, x_326);
+x_329 = lean_st_ref_set(x_3, x_328);
+lean_dec(x_3);
+return x_311;
+}
+}
+else
+{
+lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; uint8_t x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; 
+x_330 = lean_ctor_get(x_311, 0);
+lean_inc(x_330);
+lean_dec(x_311);
+x_331 = lean_st_ref_take(x_3);
+x_332 = lean_ctor_get(x_331, 0);
+lean_inc_ref(x_332);
+x_333 = lean_ctor_get(x_331, 1);
+lean_inc_ref(x_333);
+x_334 = lean_ctor_get(x_331, 2);
+lean_inc_ref(x_334);
+x_335 = lean_ctor_get(x_331, 3);
+lean_inc_ref(x_335);
+x_336 = lean_ctor_get(x_331, 4);
+lean_inc_ref(x_336);
+x_337 = lean_ctor_get(x_331, 5);
+lean_inc_ref(x_337);
+x_338 = lean_ctor_get(x_331, 6);
+lean_inc_ref(x_338);
+x_339 = lean_ctor_get_uint8(x_331, sizeof(void*)*7);
+if (lean_is_exclusive(x_331)) {
+ lean_ctor_release(x_331, 0);
+ lean_ctor_release(x_331, 1);
+ lean_ctor_release(x_331, 2);
+ lean_ctor_release(x_331, 3);
+ lean_ctor_release(x_331, 4);
+ lean_ctor_release(x_331, 5);
+ lean_ctor_release(x_331, 6);
+ x_340 = x_331;
+} else {
+ lean_dec_ref(x_331);
+ x_340 = lean_box(0);
+}
+lean_inc(x_330);
+x_341 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_333, x_1, x_330);
+if (lean_is_scalar(x_340)) {
+ x_342 = lean_alloc_ctor(0, 7, 1);
+} else {
+ x_342 = x_340;
+}
+lean_ctor_set(x_342, 0, x_332);
+lean_ctor_set(x_342, 1, x_341);
+lean_ctor_set(x_342, 2, x_334);
+lean_ctor_set(x_342, 3, x_335);
+lean_ctor_set(x_342, 4, x_336);
+lean_ctor_set(x_342, 5, x_337);
+lean_ctor_set(x_342, 6, x_338);
+lean_ctor_set_uint8(x_342, sizeof(void*)*7, x_339);
+x_343 = lean_st_ref_set(x_3, x_342);
+lean_dec(x_3);
+x_344 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_344, 0, x_330);
+return x_344;
 }
 }
 else
 {
 lean_dec(x_3);
 lean_dec_ref(x_1);
-return x_302;
+return x_311;
 }
 }
 }
@@ -2639,7 +2660,7 @@ return x_302;
 }
 default: 
 {
-lean_object* x_337; lean_object* x_338; 
+lean_object* x_348; lean_object* x_349; 
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
@@ -2647,13 +2668,13 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_337 = lean_box(0);
-x_338 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_338, 0, x_337);
-return x_338;
+x_348 = lean_box(0);
+x_349 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_349, 0, x_348);
+return x_349;
 }
 }
-block_41:
+block_43:
 {
 if (lean_obj_tag(x_9) == 0)
 {
@@ -2678,14 +2699,16 @@ return x_9;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
 x_17 = lean_ctor_get(x_12, 0);
 x_18 = lean_ctor_get(x_12, 1);
 x_19 = lean_ctor_get(x_12, 2);
 x_20 = lean_ctor_get(x_12, 3);
 x_21 = lean_ctor_get(x_12, 4);
 x_22 = lean_ctor_get(x_12, 5);
-x_23 = lean_ctor_get_uint8(x_12, sizeof(void*)*6);
+x_23 = lean_ctor_get(x_12, 6);
+x_24 = lean_ctor_get_uint8(x_12, sizeof(void*)*7);
+lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
@@ -2694,71 +2717,76 @@ lean_inc(x_18);
 lean_inc(x_17);
 lean_dec(x_12);
 lean_inc(x_11);
-x_24 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_18, x_1, x_11);
-x_25 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_25, 0, x_17);
-lean_ctor_set(x_25, 1, x_24);
-lean_ctor_set(x_25, 2, x_19);
-lean_ctor_set(x_25, 3, x_20);
-lean_ctor_set(x_25, 4, x_21);
-lean_ctor_set(x_25, 5, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*6, x_23);
-x_26 = lean_st_ref_set(x_3, x_25);
+x_25 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_18, x_1, x_11);
+x_26 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_26, 0, x_17);
+lean_ctor_set(x_26, 1, x_25);
+lean_ctor_set(x_26, 2, x_19);
+lean_ctor_set(x_26, 3, x_20);
+lean_ctor_set(x_26, 4, x_21);
+lean_ctor_set(x_26, 5, x_22);
+lean_ctor_set(x_26, 6, x_23);
+lean_ctor_set_uint8(x_26, sizeof(void*)*7, x_24);
+x_27 = lean_st_ref_set(x_3, x_26);
 lean_dec(x_3);
 return x_9;
 }
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_27 = lean_ctor_get(x_9, 0);
-lean_inc(x_27);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_28 = lean_ctor_get(x_9, 0);
+lean_inc(x_28);
 lean_dec(x_9);
-x_28 = lean_st_ref_take(x_3);
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc_ref(x_29);
-x_30 = lean_ctor_get(x_28, 1);
+x_29 = lean_st_ref_take(x_3);
+x_30 = lean_ctor_get(x_29, 0);
 lean_inc_ref(x_30);
-x_31 = lean_ctor_get(x_28, 2);
+x_31 = lean_ctor_get(x_29, 1);
 lean_inc_ref(x_31);
-x_32 = lean_ctor_get(x_28, 3);
+x_32 = lean_ctor_get(x_29, 2);
 lean_inc_ref(x_32);
-x_33 = lean_ctor_get(x_28, 4);
+x_33 = lean_ctor_get(x_29, 3);
 lean_inc_ref(x_33);
-x_34 = lean_ctor_get(x_28, 5);
+x_34 = lean_ctor_get(x_29, 4);
 lean_inc_ref(x_34);
-x_35 = lean_ctor_get_uint8(x_28, sizeof(void*)*6);
-if (lean_is_exclusive(x_28)) {
- lean_ctor_release(x_28, 0);
- lean_ctor_release(x_28, 1);
- lean_ctor_release(x_28, 2);
- lean_ctor_release(x_28, 3);
- lean_ctor_release(x_28, 4);
- lean_ctor_release(x_28, 5);
- x_36 = x_28;
+x_35 = lean_ctor_get(x_29, 5);
+lean_inc_ref(x_35);
+x_36 = lean_ctor_get(x_29, 6);
+lean_inc_ref(x_36);
+x_37 = lean_ctor_get_uint8(x_29, sizeof(void*)*7);
+if (lean_is_exclusive(x_29)) {
+ lean_ctor_release(x_29, 0);
+ lean_ctor_release(x_29, 1);
+ lean_ctor_release(x_29, 2);
+ lean_ctor_release(x_29, 3);
+ lean_ctor_release(x_29, 4);
+ lean_ctor_release(x_29, 5);
+ lean_ctor_release(x_29, 6);
+ x_38 = x_29;
 } else {
- lean_dec_ref(x_28);
- x_36 = lean_box(0);
+ lean_dec_ref(x_29);
+ x_38 = lean_box(0);
 }
-lean_inc(x_27);
-x_37 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_30, x_1, x_27);
-if (lean_is_scalar(x_36)) {
- x_38 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_28);
+x_39 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_31, x_1, x_28);
+if (lean_is_scalar(x_38)) {
+ x_40 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_38 = x_36;
+ x_40 = x_38;
 }
-lean_ctor_set(x_38, 0, x_29);
-lean_ctor_set(x_38, 1, x_37);
-lean_ctor_set(x_38, 2, x_31);
-lean_ctor_set(x_38, 3, x_32);
-lean_ctor_set(x_38, 4, x_33);
-lean_ctor_set(x_38, 5, x_34);
-lean_ctor_set_uint8(x_38, sizeof(void*)*6, x_35);
-x_39 = lean_st_ref_set(x_3, x_38);
+lean_ctor_set(x_40, 0, x_30);
+lean_ctor_set(x_40, 1, x_39);
+lean_ctor_set(x_40, 2, x_32);
+lean_ctor_set(x_40, 3, x_33);
+lean_ctor_set(x_40, 4, x_34);
+lean_ctor_set(x_40, 5, x_35);
+lean_ctor_set(x_40, 6, x_36);
+lean_ctor_set_uint8(x_40, sizeof(void*)*7, x_37);
+x_41 = lean_st_ref_set(x_3, x_40);
 lean_dec(x_3);
-x_40 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_40, 0, x_27);
-return x_40;
+x_42 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_42, 0, x_28);
+return x_42;
 }
 }
 else
@@ -2768,438 +2796,455 @@ lean_dec_ref(x_1);
 return x_9;
 }
 }
-block_61:
+block_64:
 {
-lean_object* x_44; uint8_t x_45; 
-x_44 = lean_st_ref_take(x_3);
-x_45 = !lean_is_exclusive(x_44);
-if (x_45 == 0)
+lean_object* x_46; uint8_t x_47; 
+x_46 = lean_st_ref_take(x_3);
+x_47 = !lean_is_exclusive(x_46);
+if (x_47 == 0)
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_46 = lean_ctor_get(x_44, 1);
-lean_inc(x_42);
-x_47 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_46, x_1, x_42);
-lean_ctor_set(x_44, 1, x_47);
-x_48 = lean_st_ref_set(x_3, x_44);
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_44);
+x_49 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_48, x_1, x_44);
+lean_ctor_set(x_46, 1, x_49);
+x_50 = lean_st_ref_set(x_3, x_46);
 lean_dec(x_3);
-x_49 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_49, 0, x_42);
-return x_49;
+x_51 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_51, 0, x_44);
+return x_51;
 }
 else
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_50 = lean_ctor_get(x_44, 0);
-x_51 = lean_ctor_get(x_44, 1);
-x_52 = lean_ctor_get(x_44, 2);
-x_53 = lean_ctor_get(x_44, 3);
-x_54 = lean_ctor_get(x_44, 4);
-x_55 = lean_ctor_get(x_44, 5);
-x_56 = lean_ctor_get_uint8(x_44, sizeof(void*)*6);
+lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_52 = lean_ctor_get(x_46, 0);
+x_53 = lean_ctor_get(x_46, 1);
+x_54 = lean_ctor_get(x_46, 2);
+x_55 = lean_ctor_get(x_46, 3);
+x_56 = lean_ctor_get(x_46, 4);
+x_57 = lean_ctor_get(x_46, 5);
+x_58 = lean_ctor_get(x_46, 6);
+x_59 = lean_ctor_get_uint8(x_46, sizeof(void*)*7);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_inc(x_56);
 lean_inc(x_55);
 lean_inc(x_54);
 lean_inc(x_53);
 lean_inc(x_52);
-lean_inc(x_51);
-lean_inc(x_50);
-lean_dec(x_44);
-lean_inc(x_42);
-x_57 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_51, x_1, x_42);
-x_58 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_58, 0, x_50);
-lean_ctor_set(x_58, 1, x_57);
-lean_ctor_set(x_58, 2, x_52);
-lean_ctor_set(x_58, 3, x_53);
-lean_ctor_set(x_58, 4, x_54);
-lean_ctor_set(x_58, 5, x_55);
-lean_ctor_set_uint8(x_58, sizeof(void*)*6, x_56);
-x_59 = lean_st_ref_set(x_3, x_58);
+lean_dec(x_46);
+lean_inc(x_44);
+x_60 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_53, x_1, x_44);
+x_61 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_61, 0, x_52);
+lean_ctor_set(x_61, 1, x_60);
+lean_ctor_set(x_61, 2, x_54);
+lean_ctor_set(x_61, 3, x_55);
+lean_ctor_set(x_61, 4, x_56);
+lean_ctor_set(x_61, 5, x_57);
+lean_ctor_set(x_61, 6, x_58);
+lean_ctor_set_uint8(x_61, sizeof(void*)*7, x_59);
+x_62 = lean_st_ref_set(x_3, x_61);
 lean_dec(x_3);
-x_60 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_60, 0, x_42);
-return x_60;
+x_63 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_63, 0, x_44);
+return x_63;
 }
 }
-block_95:
+block_100:
 {
-if (lean_obj_tag(x_63) == 0)
+if (lean_obj_tag(x_66) == 0)
 {
-uint8_t x_64; 
-x_64 = !lean_is_exclusive(x_63);
-if (x_64 == 0)
-{
-lean_object* x_65; lean_object* x_66; uint8_t x_67; 
-x_65 = lean_ctor_get(x_63, 0);
-x_66 = lean_st_ref_take(x_62);
+uint8_t x_67; 
 x_67 = !lean_is_exclusive(x_66);
 if (x_67 == 0)
 {
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_68 = lean_ctor_get(x_66, 1);
-lean_inc(x_65);
-x_69 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_68, x_1, x_65);
-lean_ctor_set(x_66, 1, x_69);
-x_70 = lean_st_ref_set(x_62, x_66);
-lean_dec(x_62);
-return x_63;
+lean_object* x_68; lean_object* x_69; uint8_t x_70; 
+x_68 = lean_ctor_get(x_66, 0);
+x_69 = lean_st_ref_take(x_65);
+x_70 = !lean_is_exclusive(x_69);
+if (x_70 == 0)
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_71 = lean_ctor_get(x_69, 1);
+lean_inc(x_68);
+x_72 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_71, x_1, x_68);
+lean_ctor_set(x_69, 1, x_72);
+x_73 = lean_st_ref_set(x_65, x_69);
+lean_dec(x_65);
+return x_66;
 }
 else
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_71 = lean_ctor_get(x_66, 0);
-x_72 = lean_ctor_get(x_66, 1);
-x_73 = lean_ctor_get(x_66, 2);
-x_74 = lean_ctor_get(x_66, 3);
-x_75 = lean_ctor_get(x_66, 4);
-x_76 = lean_ctor_get(x_66, 5);
-x_77 = lean_ctor_get_uint8(x_66, sizeof(void*)*6);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_74 = lean_ctor_get(x_69, 0);
+x_75 = lean_ctor_get(x_69, 1);
+x_76 = lean_ctor_get(x_69, 2);
+x_77 = lean_ctor_get(x_69, 3);
+x_78 = lean_ctor_get(x_69, 4);
+x_79 = lean_ctor_get(x_69, 5);
+x_80 = lean_ctor_get(x_69, 6);
+x_81 = lean_ctor_get_uint8(x_69, sizeof(void*)*7);
+lean_inc(x_80);
+lean_inc(x_79);
+lean_inc(x_78);
+lean_inc(x_77);
 lean_inc(x_76);
 lean_inc(x_75);
 lean_inc(x_74);
-lean_inc(x_73);
-lean_inc(x_72);
-lean_inc(x_71);
+lean_dec(x_69);
+lean_inc(x_68);
+x_82 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_75, x_1, x_68);
+x_83 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_83, 0, x_74);
+lean_ctor_set(x_83, 1, x_82);
+lean_ctor_set(x_83, 2, x_76);
+lean_ctor_set(x_83, 3, x_77);
+lean_ctor_set(x_83, 4, x_78);
+lean_ctor_set(x_83, 5, x_79);
+lean_ctor_set(x_83, 6, x_80);
+lean_ctor_set_uint8(x_83, sizeof(void*)*7, x_81);
+x_84 = lean_st_ref_set(x_65, x_83);
+lean_dec(x_65);
+return x_66;
+}
+}
+else
+{
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; uint8_t x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_85 = lean_ctor_get(x_66, 0);
+lean_inc(x_85);
 lean_dec(x_66);
-lean_inc(x_65);
-x_78 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_72, x_1, x_65);
-x_79 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_79, 0, x_71);
-lean_ctor_set(x_79, 1, x_78);
-lean_ctor_set(x_79, 2, x_73);
-lean_ctor_set(x_79, 3, x_74);
-lean_ctor_set(x_79, 4, x_75);
-lean_ctor_set(x_79, 5, x_76);
-lean_ctor_set_uint8(x_79, sizeof(void*)*6, x_77);
-x_80 = lean_st_ref_set(x_62, x_79);
-lean_dec(x_62);
-return x_63;
-}
-}
-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; uint8_t x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_81 = lean_ctor_get(x_63, 0);
-lean_inc(x_81);
-lean_dec(x_63);
-x_82 = lean_st_ref_take(x_62);
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc_ref(x_83);
-x_84 = lean_ctor_get(x_82, 1);
-lean_inc_ref(x_84);
-x_85 = lean_ctor_get(x_82, 2);
-lean_inc_ref(x_85);
-x_86 = lean_ctor_get(x_82, 3);
-lean_inc_ref(x_86);
-x_87 = lean_ctor_get(x_82, 4);
+x_86 = lean_st_ref_take(x_65);
+x_87 = lean_ctor_get(x_86, 0);
 lean_inc_ref(x_87);
-x_88 = lean_ctor_get(x_82, 5);
+x_88 = lean_ctor_get(x_86, 1);
 lean_inc_ref(x_88);
-x_89 = lean_ctor_get_uint8(x_82, sizeof(void*)*6);
-if (lean_is_exclusive(x_82)) {
- lean_ctor_release(x_82, 0);
- lean_ctor_release(x_82, 1);
- lean_ctor_release(x_82, 2);
- lean_ctor_release(x_82, 3);
- lean_ctor_release(x_82, 4);
- lean_ctor_release(x_82, 5);
- x_90 = x_82;
+x_89 = lean_ctor_get(x_86, 2);
+lean_inc_ref(x_89);
+x_90 = lean_ctor_get(x_86, 3);
+lean_inc_ref(x_90);
+x_91 = lean_ctor_get(x_86, 4);
+lean_inc_ref(x_91);
+x_92 = lean_ctor_get(x_86, 5);
+lean_inc_ref(x_92);
+x_93 = lean_ctor_get(x_86, 6);
+lean_inc_ref(x_93);
+x_94 = lean_ctor_get_uint8(x_86, sizeof(void*)*7);
+if (lean_is_exclusive(x_86)) {
+ lean_ctor_release(x_86, 0);
+ lean_ctor_release(x_86, 1);
+ lean_ctor_release(x_86, 2);
+ lean_ctor_release(x_86, 3);
+ lean_ctor_release(x_86, 4);
+ lean_ctor_release(x_86, 5);
+ lean_ctor_release(x_86, 6);
+ x_95 = x_86;
 } else {
- lean_dec_ref(x_82);
- x_90 = lean_box(0);
+ lean_dec_ref(x_86);
+ x_95 = lean_box(0);
 }
-lean_inc(x_81);
-x_91 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_84, x_1, x_81);
-if (lean_is_scalar(x_90)) {
- x_92 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_85);
+x_96 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_88, x_1, x_85);
+if (lean_is_scalar(x_95)) {
+ x_97 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_92 = x_90;
+ x_97 = x_95;
 }
-lean_ctor_set(x_92, 0, x_83);
-lean_ctor_set(x_92, 1, x_91);
-lean_ctor_set(x_92, 2, x_85);
-lean_ctor_set(x_92, 3, x_86);
-lean_ctor_set(x_92, 4, x_87);
-lean_ctor_set(x_92, 5, x_88);
-lean_ctor_set_uint8(x_92, sizeof(void*)*6, x_89);
-x_93 = lean_st_ref_set(x_62, x_92);
-lean_dec(x_62);
-x_94 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_94, 0, x_81);
-return x_94;
+lean_ctor_set(x_97, 0, x_87);
+lean_ctor_set(x_97, 1, x_96);
+lean_ctor_set(x_97, 2, x_89);
+lean_ctor_set(x_97, 3, x_90);
+lean_ctor_set(x_97, 4, x_91);
+lean_ctor_set(x_97, 5, x_92);
+lean_ctor_set(x_97, 6, x_93);
+lean_ctor_set_uint8(x_97, sizeof(void*)*7, x_94);
+x_98 = lean_st_ref_set(x_65, x_97);
+lean_dec(x_65);
+x_99 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_99, 0, x_85);
+return x_99;
 }
 }
 else
 {
-lean_dec(x_62);
+lean_dec(x_65);
 lean_dec_ref(x_1);
-return x_63;
+return x_66;
 }
 }
-block_119:
+block_124:
 {
-if (x_105 == 0)
+if (x_110 == 0)
 {
-lean_object* x_106; lean_object* x_107; 
+lean_object* x_111; lean_object* x_112; 
+lean_dec_ref(x_109);
+lean_dec_ref(x_107);
+lean_dec_ref(x_106);
+lean_dec(x_105);
 lean_dec(x_104);
 lean_dec_ref(x_103);
-lean_dec_ref(x_102);
+lean_dec(x_102);
 lean_dec_ref(x_101);
-lean_dec_ref(x_100);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec_ref(x_97);
 lean_dec_ref(x_1);
-x_106 = lean_box(0);
-x_107 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_107, 0, x_106);
-return x_107;
+x_111 = lean_box(0);
+x_112 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_112, 0, x_111);
+return x_112;
 }
 else
 {
-lean_object* x_108; lean_object* x_109; lean_object* x_110; 
-x_108 = lean_st_ref_get(x_104);
-x_109 = lean_ctor_get(x_108, 1);
-lean_inc_ref(x_109);
-lean_dec(x_108);
-x_110 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_109, x_1);
-if (lean_obj_tag(x_110) == 1)
+lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_113 = lean_st_ref_get(x_104);
+x_114 = lean_ctor_get(x_113, 1);
+lean_inc_ref(x_114);
+lean_dec(x_113);
+x_115 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__1___redArg(x_114, x_1);
+if (lean_obj_tag(x_115) == 1)
 {
-uint8_t x_111; 
+uint8_t x_116; 
+lean_dec_ref(x_109);
+lean_dec_ref(x_107);
+lean_dec_ref(x_106);
+lean_dec(x_105);
 lean_dec(x_104);
 lean_dec_ref(x_103);
-lean_dec_ref(x_102);
+lean_dec(x_102);
 lean_dec_ref(x_101);
-lean_dec_ref(x_100);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec_ref(x_97);
 lean_dec_ref(x_1);
-x_111 = !lean_is_exclusive(x_110);
-if (x_111 == 0)
+x_116 = !lean_is_exclusive(x_115);
+if (x_116 == 0)
 {
-lean_ctor_set_tag(x_110, 0);
-return x_110;
+lean_ctor_set_tag(x_115, 0);
+return x_115;
 }
 else
 {
-lean_object* x_112; lean_object* x_113; 
-x_112 = lean_ctor_get(x_110, 0);
-lean_inc(x_112);
-lean_dec(x_110);
-x_113 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_113, 0, x_112);
-return x_113;
-}
-}
-else
-{
-lean_object* x_114; 
-lean_dec(x_110);
-lean_inc(x_99);
-lean_inc_ref(x_97);
-lean_inc(x_98);
-lean_inc_ref(x_102);
-lean_inc(x_104);
-lean_inc_ref(x_103);
-x_114 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_101, x_103, x_104, x_102, x_98, x_97, x_99);
-if (lean_obj_tag(x_114) == 0)
-{
-lean_object* x_115; lean_object* x_116; 
-x_115 = lean_ctor_get(x_114, 0);
-lean_inc(x_115);
-lean_dec_ref(x_114);
-lean_inc(x_99);
-lean_inc_ref(x_97);
-lean_inc_ref(x_102);
-lean_inc(x_104);
-x_116 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_100, x_103, x_104, x_102, x_98, x_97, x_99);
-if (lean_obj_tag(x_116) == 0)
-{
 lean_object* x_117; lean_object* x_118; 
-x_117 = lean_ctor_get(x_116, 0);
+x_117 = lean_ctor_get(x_115, 0);
 lean_inc(x_117);
-lean_dec_ref(x_116);
-x_118 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_115, x_117, x_102, x_97, x_99);
-lean_dec(x_99);
-lean_dec_ref(x_97);
-x_62 = x_104;
-x_63 = x_118;
-goto block_95;
-}
-else
-{
 lean_dec(x_115);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec_ref(x_97);
-x_62 = x_104;
-x_63 = x_116;
-goto block_95;
+x_118 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_118, 0, x_117);
+return x_118;
 }
 }
 else
 {
+lean_object* x_119; 
+lean_dec(x_115);
+lean_inc(x_102);
+lean_inc_ref(x_101);
+lean_inc(x_105);
+lean_inc_ref(x_103);
+lean_inc(x_104);
+lean_inc_ref(x_109);
+x_119 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_107, x_109, x_104, x_103, x_105, x_101, x_102);
+if (lean_obj_tag(x_119) == 0)
+{
+lean_object* x_120; lean_object* x_121; 
+x_120 = lean_ctor_get(x_119, 0);
+lean_inc(x_120);
+lean_dec_ref(x_119);
+lean_inc(x_102);
+lean_inc_ref(x_101);
+lean_inc_ref(x_103);
+lean_inc(x_104);
+x_121 = l_Lean_Meta_Sym_getMaxFVar_x3f(x_106, x_109, x_104, x_103, x_105, x_101, x_102);
+if (lean_obj_tag(x_121) == 0)
+{
+lean_object* x_122; lean_object* x_123; 
+x_122 = lean_ctor_get(x_121, 0);
+lean_inc(x_122);
+lean_dec_ref(x_121);
+x_123 = l___private_Lean_Meta_Sym_MaxFVar_0__Lean_Meta_Sym_max___redArg(x_120, x_122, x_103, x_101, x_102);
+lean_dec(x_102);
+lean_dec_ref(x_101);
+x_65 = x_104;
+x_66 = x_123;
+goto block_100;
+}
+else
+{
+lean_dec(x_120);
 lean_dec_ref(x_103);
-lean_dec_ref(x_102);
-lean_dec_ref(x_100);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec_ref(x_97);
-x_62 = x_104;
-x_63 = x_114;
-goto block_95;
+lean_dec(x_102);
+lean_dec_ref(x_101);
+x_65 = x_104;
+x_66 = x_121;
+goto block_100;
 }
 }
-}
-}
-block_131:
+else
 {
-uint8_t x_129; 
-x_129 = l_Lean_Expr_hasFVar(x_1);
-if (x_129 == 0)
+lean_dec_ref(x_109);
+lean_dec_ref(x_106);
+lean_dec(x_105);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_101);
+x_65 = x_104;
+x_66 = x_119;
+goto block_100;
+}
+}
+}
+}
+block_136:
 {
-uint8_t x_130; 
-x_130 = l_Lean_Expr_hasMVar(x_1);
-x_96 = lean_box(0);
-x_97 = x_126;
-x_98 = x_125;
-x_99 = x_127;
-x_100 = x_121;
-x_101 = x_120;
-x_102 = x_124;
-x_103 = x_122;
-x_104 = x_123;
+uint8_t x_134; 
+x_134 = l_Lean_Expr_hasFVar(x_1);
+if (x_134 == 0)
+{
+uint8_t x_135; 
+x_135 = l_Lean_Expr_hasMVar(x_1);
+x_101 = x_131;
+x_102 = x_132;
+x_103 = x_129;
+x_104 = x_128;
 x_105 = x_130;
-goto block_119;
+x_106 = x_126;
+x_107 = x_125;
+x_108 = lean_box(0);
+x_109 = x_127;
+x_110 = x_135;
+goto block_124;
 }
 else
 {
-x_96 = lean_box(0);
-x_97 = x_126;
-x_98 = x_125;
-x_99 = x_127;
-x_100 = x_121;
-x_101 = x_120;
-x_102 = x_124;
-x_103 = x_122;
-x_104 = x_123;
-x_105 = x_129;
-goto block_119;
+x_101 = x_131;
+x_102 = x_132;
+x_103 = x_129;
+x_104 = x_128;
+x_105 = x_130;
+x_106 = x_126;
+x_107 = x_125;
+x_108 = lean_box(0);
+x_109 = x_127;
+x_110 = x_134;
+goto block_124;
 }
 }
-block_164:
+block_171:
 {
-if (lean_obj_tag(x_132) == 0)
+if (lean_obj_tag(x_137) == 0)
 {
-uint8_t x_133; 
-x_133 = !lean_is_exclusive(x_132);
-if (x_133 == 0)
+uint8_t x_138; 
+x_138 = !lean_is_exclusive(x_137);
+if (x_138 == 0)
 {
-lean_object* x_134; lean_object* x_135; uint8_t x_136; 
-x_134 = lean_ctor_get(x_132, 0);
-x_135 = lean_st_ref_take(x_3);
-x_136 = !lean_is_exclusive(x_135);
-if (x_136 == 0)
+lean_object* x_139; lean_object* x_140; uint8_t x_141; 
+x_139 = lean_ctor_get(x_137, 0);
+x_140 = lean_st_ref_take(x_3);
+x_141 = !lean_is_exclusive(x_140);
+if (x_141 == 0)
 {
-lean_object* x_137; lean_object* x_138; lean_object* x_139; 
-x_137 = lean_ctor_get(x_135, 1);
-lean_inc(x_134);
-x_138 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_137, x_1, x_134);
-lean_ctor_set(x_135, 1, x_138);
-x_139 = lean_st_ref_set(x_3, x_135);
+lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_142 = lean_ctor_get(x_140, 1);
+lean_inc(x_139);
+x_143 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_142, x_1, x_139);
+lean_ctor_set(x_140, 1, x_143);
+x_144 = lean_st_ref_set(x_3, x_140);
 lean_dec(x_3);
-return x_132;
+return x_137;
 }
 else
 {
-lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; uint8_t x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; 
-x_140 = lean_ctor_get(x_135, 0);
-x_141 = lean_ctor_get(x_135, 1);
-x_142 = lean_ctor_get(x_135, 2);
-x_143 = lean_ctor_get(x_135, 3);
-x_144 = lean_ctor_get(x_135, 4);
-x_145 = lean_ctor_get(x_135, 5);
-x_146 = lean_ctor_get_uint8(x_135, sizeof(void*)*6);
+lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; uint8_t x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+x_145 = lean_ctor_get(x_140, 0);
+x_146 = lean_ctor_get(x_140, 1);
+x_147 = lean_ctor_get(x_140, 2);
+x_148 = lean_ctor_get(x_140, 3);
+x_149 = lean_ctor_get(x_140, 4);
+x_150 = lean_ctor_get(x_140, 5);
+x_151 = lean_ctor_get(x_140, 6);
+x_152 = lean_ctor_get_uint8(x_140, sizeof(void*)*7);
+lean_inc(x_151);
+lean_inc(x_150);
+lean_inc(x_149);
+lean_inc(x_148);
+lean_inc(x_147);
+lean_inc(x_146);
 lean_inc(x_145);
-lean_inc(x_144);
-lean_inc(x_143);
-lean_inc(x_142);
-lean_inc(x_141);
-lean_inc(x_140);
-lean_dec(x_135);
-lean_inc(x_134);
-x_147 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_141, x_1, x_134);
-x_148 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_148, 0, x_140);
-lean_ctor_set(x_148, 1, x_147);
-lean_ctor_set(x_148, 2, x_142);
-lean_ctor_set(x_148, 3, x_143);
-lean_ctor_set(x_148, 4, x_144);
-lean_ctor_set(x_148, 5, x_145);
-lean_ctor_set_uint8(x_148, sizeof(void*)*6, x_146);
-x_149 = lean_st_ref_set(x_3, x_148);
+lean_dec(x_140);
+lean_inc(x_139);
+x_153 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_146, x_1, x_139);
+x_154 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_154, 0, x_145);
+lean_ctor_set(x_154, 1, x_153);
+lean_ctor_set(x_154, 2, x_147);
+lean_ctor_set(x_154, 3, x_148);
+lean_ctor_set(x_154, 4, x_149);
+lean_ctor_set(x_154, 5, x_150);
+lean_ctor_set(x_154, 6, x_151);
+lean_ctor_set_uint8(x_154, sizeof(void*)*7, x_152);
+x_155 = lean_st_ref_set(x_3, x_154);
 lean_dec(x_3);
-return x_132;
+return x_137;
 }
 }
 else
 {
-lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; uint8_t x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; 
-x_150 = lean_ctor_get(x_132, 0);
-lean_inc(x_150);
-lean_dec(x_132);
-x_151 = lean_st_ref_take(x_3);
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc_ref(x_152);
-x_153 = lean_ctor_get(x_151, 1);
-lean_inc_ref(x_153);
-x_154 = lean_ctor_get(x_151, 2);
-lean_inc_ref(x_154);
-x_155 = lean_ctor_get(x_151, 3);
-lean_inc_ref(x_155);
-x_156 = lean_ctor_get(x_151, 4);
-lean_inc_ref(x_156);
-x_157 = lean_ctor_get(x_151, 5);
-lean_inc_ref(x_157);
-x_158 = lean_ctor_get_uint8(x_151, sizeof(void*)*6);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- lean_ctor_release(x_151, 2);
- lean_ctor_release(x_151, 3);
- lean_ctor_release(x_151, 4);
- lean_ctor_release(x_151, 5);
- x_159 = x_151;
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; uint8_t x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
+x_156 = lean_ctor_get(x_137, 0);
+lean_inc(x_156);
+lean_dec(x_137);
+x_157 = lean_st_ref_take(x_3);
+x_158 = lean_ctor_get(x_157, 0);
+lean_inc_ref(x_158);
+x_159 = lean_ctor_get(x_157, 1);
+lean_inc_ref(x_159);
+x_160 = lean_ctor_get(x_157, 2);
+lean_inc_ref(x_160);
+x_161 = lean_ctor_get(x_157, 3);
+lean_inc_ref(x_161);
+x_162 = lean_ctor_get(x_157, 4);
+lean_inc_ref(x_162);
+x_163 = lean_ctor_get(x_157, 5);
+lean_inc_ref(x_163);
+x_164 = lean_ctor_get(x_157, 6);
+lean_inc_ref(x_164);
+x_165 = lean_ctor_get_uint8(x_157, sizeof(void*)*7);
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ lean_ctor_release(x_157, 2);
+ lean_ctor_release(x_157, 3);
+ lean_ctor_release(x_157, 4);
+ lean_ctor_release(x_157, 5);
+ lean_ctor_release(x_157, 6);
+ x_166 = x_157;
 } else {
- lean_dec_ref(x_151);
- x_159 = lean_box(0);
+ lean_dec_ref(x_157);
+ x_166 = lean_box(0);
 }
-lean_inc(x_150);
-x_160 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_153, x_1, x_150);
-if (lean_is_scalar(x_159)) {
- x_161 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_156);
+x_167 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getMaxFVar_x3f_spec__0___redArg(x_159, x_1, x_156);
+if (lean_is_scalar(x_166)) {
+ x_168 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_161 = x_159;
+ x_168 = x_166;
 }
-lean_ctor_set(x_161, 0, x_152);
-lean_ctor_set(x_161, 1, x_160);
-lean_ctor_set(x_161, 2, x_154);
-lean_ctor_set(x_161, 3, x_155);
-lean_ctor_set(x_161, 4, x_156);
-lean_ctor_set(x_161, 5, x_157);
-lean_ctor_set_uint8(x_161, sizeof(void*)*6, x_158);
-x_162 = lean_st_ref_set(x_3, x_161);
+lean_ctor_set(x_168, 0, x_158);
+lean_ctor_set(x_168, 1, x_167);
+lean_ctor_set(x_168, 2, x_160);
+lean_ctor_set(x_168, 3, x_161);
+lean_ctor_set(x_168, 4, x_162);
+lean_ctor_set(x_168, 5, x_163);
+lean_ctor_set(x_168, 6, x_164);
+lean_ctor_set_uint8(x_168, sizeof(void*)*7, x_165);
+x_169 = lean_st_ref_set(x_3, x_168);
 lean_dec(x_3);
-x_163 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_163, 0, x_150);
-return x_163;
+x_170 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_170, 0, x_156);
+return x_170;
 }
 }
 else
 {
 lean_dec(x_3);
 lean_dec_ref(x_1);
-return x_132;
+return x_137;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Sym/Pattern.c b/stage0/stdlib/Lean/Meta/Sym/Pattern.c
index dc29ffbb57..441f586ded 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Pattern.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Pattern.c
@@ -560,7 +560,7 @@ LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_S
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Sym_Pattern_0__Lean_Meta_Sym_tryAssignUnassigned(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_Sym_Pattern_0__Lean_Meta_Sym_tryAssignUnassigned___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Sym_Pattern_0__Lean_Meta_Sym_isDefEqAppWithInfo(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_isDefEqI(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Sym_isDefEqI___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Sym_Pattern_0__Lean_Meta_Sym_isDefEqAppWithInfo___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Sym_getProofInstInfo_x3f___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Sym_Pattern_0__Lean_Meta_Sym_isDefEqApp___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -17100,6 +17100,7 @@ lean_inc(x_11);
 lean_inc_ref(x_10);
 lean_inc(x_9);
 lean_inc_ref(x_8);
+lean_inc(x_7);
 lean_inc_ref(x_16);
 lean_inc_ref(x_14);
 x_33 = l___private_Lean_Meta_Sym_Pattern_0__Lean_Meta_Sym_tryAssignUnassigned(x_14, x_16, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
@@ -17119,7 +17120,8 @@ if (x_36 == 0)
 lean_object* x_37; 
 lean_free_object(x_33);
 lean_dec(x_20);
-x_37 = l_Lean_Meta_isDefEqI(x_14, x_16, x_8, x_9, x_10, x_11);
+x_37 = l_Lean_Meta_Sym_isDefEqI___redArg(x_14, x_16, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_7);
 return x_37;
 }
 else
@@ -17130,6 +17132,7 @@ lean_dec(x_11);
 lean_dec_ref(x_10);
 lean_dec(x_9);
 lean_dec_ref(x_8);
+lean_dec(x_7);
 lean_ctor_set(x_33, 0, x_20);
 return x_33;
 }
@@ -17146,7 +17149,8 @@ if (x_39 == 0)
 {
 lean_object* x_40; 
 lean_dec(x_20);
-x_40 = l_Lean_Meta_isDefEqI(x_14, x_16, x_8, x_9, x_10, x_11);
+x_40 = l_Lean_Meta_Sym_isDefEqI___redArg(x_14, x_16, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_7);
 return x_40;
 }
 else
@@ -17158,6 +17162,7 @@ lean_dec(x_11);
 lean_dec_ref(x_10);
 lean_dec(x_9);
 lean_dec_ref(x_8);
+lean_dec(x_7);
 x_41 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_41, 0, x_20);
 return x_41;
@@ -17173,6 +17178,7 @@ lean_dec(x_11);
 lean_dec_ref(x_10);
 lean_dec(x_9);
 lean_dec_ref(x_8);
+lean_dec(x_7);
 return x_33;
 }
 }
@@ -23590,7 +23596,7 @@ lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc_ref(x_9);
-x_25 = l_Lean_Meta_isDefEqI(x_24, x_19, x_9, x_10, x_11, x_12);
+x_25 = l_Lean_Meta_Sym_isDefEqI___redArg(x_24, x_19, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_25) == 0)
 {
 uint8_t x_26; 
@@ -23783,7 +23789,7 @@ lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc_ref(x_9);
-x_60 = l_Lean_Meta_isDefEqI(x_59, x_54, x_9, x_10, x_11, x_12);
+x_60 = l_Lean_Meta_Sym_isDefEqI___redArg(x_59, x_54, x_8, x_9, x_10, x_11, x_12);
 if (lean_obj_tag(x_60) == 0)
 {
 lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
diff --git a/stage0/stdlib/Lean/Meta/Sym/ProofInstInfo.c b/stage0/stdlib/Lean/Meta/Sym/ProofInstInfo.c
index b51999598d..3ab5a341c9 100644
--- a/stage0/stdlib/Lean/Meta/Sym/ProofInstInfo.c
+++ b/stage0/stdlib/Lean/Meta/Sym/ProofInstInfo.c
@@ -2418,14 +2418,16 @@ return x_14;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_22 = lean_ctor_get(x_17, 0);
 x_23 = lean_ctor_get(x_17, 1);
 x_24 = lean_ctor_get(x_17, 2);
 x_25 = lean_ctor_get(x_17, 3);
 x_26 = lean_ctor_get(x_17, 4);
 x_27 = lean_ctor_get(x_17, 5);
-x_28 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_28 = lean_ctor_get(x_17, 6);
+x_29 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
+lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
@@ -2434,69 +2436,74 @@ lean_inc(x_23);
 lean_inc(x_22);
 lean_dec(x_17);
 lean_inc(x_16);
-x_29 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getProofInstInfo_x3f_spec__1___redArg(x_24, x_1, x_16);
-x_30 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_30, 0, x_22);
-lean_ctor_set(x_30, 1, x_23);
-lean_ctor_set(x_30, 2, x_29);
-lean_ctor_set(x_30, 3, x_25);
-lean_ctor_set(x_30, 4, x_26);
-lean_ctor_set(x_30, 5, x_27);
-lean_ctor_set_uint8(x_30, sizeof(void*)*6, x_28);
-x_31 = lean_st_ref_set(x_2, x_30);
+x_30 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getProofInstInfo_x3f_spec__1___redArg(x_24, x_1, x_16);
+x_31 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_31, 0, x_22);
+lean_ctor_set(x_31, 1, x_23);
+lean_ctor_set(x_31, 2, x_30);
+lean_ctor_set(x_31, 3, x_25);
+lean_ctor_set(x_31, 4, x_26);
+lean_ctor_set(x_31, 5, x_27);
+lean_ctor_set(x_31, 6, x_28);
+lean_ctor_set_uint8(x_31, sizeof(void*)*7, x_29);
+x_32 = lean_st_ref_set(x_2, x_31);
 return x_14;
 }
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_32 = lean_ctor_get(x_14, 0);
-lean_inc(x_32);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_33 = lean_ctor_get(x_14, 0);
+lean_inc(x_33);
 lean_dec(x_14);
-x_33 = lean_st_ref_take(x_2);
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc_ref(x_34);
-x_35 = lean_ctor_get(x_33, 1);
+x_34 = lean_st_ref_take(x_2);
+x_35 = lean_ctor_get(x_34, 0);
 lean_inc_ref(x_35);
-x_36 = lean_ctor_get(x_33, 2);
+x_36 = lean_ctor_get(x_34, 1);
 lean_inc_ref(x_36);
-x_37 = lean_ctor_get(x_33, 3);
+x_37 = lean_ctor_get(x_34, 2);
 lean_inc_ref(x_37);
-x_38 = lean_ctor_get(x_33, 4);
+x_38 = lean_ctor_get(x_34, 3);
 lean_inc_ref(x_38);
-x_39 = lean_ctor_get(x_33, 5);
+x_39 = lean_ctor_get(x_34, 4);
 lean_inc_ref(x_39);
-x_40 = lean_ctor_get_uint8(x_33, sizeof(void*)*6);
-if (lean_is_exclusive(x_33)) {
- lean_ctor_release(x_33, 0);
- lean_ctor_release(x_33, 1);
- lean_ctor_release(x_33, 2);
- lean_ctor_release(x_33, 3);
- lean_ctor_release(x_33, 4);
- lean_ctor_release(x_33, 5);
- x_41 = x_33;
+x_40 = lean_ctor_get(x_34, 5);
+lean_inc_ref(x_40);
+x_41 = lean_ctor_get(x_34, 6);
+lean_inc_ref(x_41);
+x_42 = lean_ctor_get_uint8(x_34, sizeof(void*)*7);
+if (lean_is_exclusive(x_34)) {
+ lean_ctor_release(x_34, 0);
+ lean_ctor_release(x_34, 1);
+ lean_ctor_release(x_34, 2);
+ lean_ctor_release(x_34, 3);
+ lean_ctor_release(x_34, 4);
+ lean_ctor_release(x_34, 5);
+ lean_ctor_release(x_34, 6);
+ x_43 = x_34;
 } else {
- lean_dec_ref(x_33);
- x_41 = lean_box(0);
+ lean_dec_ref(x_34);
+ x_43 = lean_box(0);
 }
-lean_inc(x_32);
-x_42 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getProofInstInfo_x3f_spec__1___redArg(x_36, x_1, x_32);
-if (lean_is_scalar(x_41)) {
- x_43 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_33);
+x_44 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getProofInstInfo_x3f_spec__1___redArg(x_37, x_1, x_33);
+if (lean_is_scalar(x_43)) {
+ x_45 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_43 = x_41;
+ x_45 = x_43;
 }
-lean_ctor_set(x_43, 0, x_34);
-lean_ctor_set(x_43, 1, x_35);
-lean_ctor_set(x_43, 2, x_42);
-lean_ctor_set(x_43, 3, x_37);
-lean_ctor_set(x_43, 4, x_38);
-lean_ctor_set(x_43, 5, x_39);
-lean_ctor_set_uint8(x_43, sizeof(void*)*6, x_40);
-x_44 = lean_st_ref_set(x_2, x_43);
-x_45 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_45, 0, x_32);
-return x_45;
+lean_ctor_set(x_45, 0, x_35);
+lean_ctor_set(x_45, 1, x_36);
+lean_ctor_set(x_45, 2, x_44);
+lean_ctor_set(x_45, 3, x_38);
+lean_ctor_set(x_45, 4, x_39);
+lean_ctor_set(x_45, 5, x_40);
+lean_ctor_set(x_45, 6, x_41);
+lean_ctor_set_uint8(x_45, sizeof(void*)*7, x_42);
+x_46 = lean_st_ref_set(x_2, x_45);
+x_47 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_47, 0, x_33);
+return x_47;
 }
 }
 else
diff --git a/stage0/stdlib/Lean/Meta/Sym/ReplaceS.c b/stage0/stdlib/Lean/Meta/Sym/ReplaceS.c
index c0914bb1de..982b0eca96 100644
--- a/stage0/stdlib/Lean/Meta/Sym/ReplaceS.c
+++ b/stage0/stdlib/Lean/Meta/Sym/ReplaceS.c
@@ -3223,129 +3223,129 @@ x_5 = lean_st_ref_take(x_3);
 x_6 = !lean_is_exclusive(x_5);
 if (x_6 == 0)
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
 x_7 = lean_ctor_get(x_5, 0);
 x_8 = l_Lean_Meta_Sym_replaceS___redArg___closed__2;
 lean_ctor_set(x_5, 0, x_8);
 x_9 = lean_st_ref_set(x_3, x_5);
 x_10 = lean_st_ref_get(x_3);
-x_28 = lean_ctor_get_uint8(x_10, sizeof(void*)*6);
+x_29 = lean_ctor_get_uint8(x_10, sizeof(void*)*7);
 lean_dec(x_10);
-x_29 = lean_unsigned_to_nat(0u);
-x_30 = lean_box(x_28);
+x_30 = lean_unsigned_to_nat(0u);
+x_31 = lean_box(x_29);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_31 = lean_apply_4(x_2, x_1, x_29, x_30, x_7);
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-if (lean_obj_tag(x_32) == 1)
+x_32 = lean_apply_4(x_2, x_1, x_30, x_31, x_7);
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+if (lean_obj_tag(x_33) == 1)
 {
-lean_object* x_33; lean_object* x_34; 
+lean_object* x_34; lean_object* x_35; 
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_33 = lean_ctor_get(x_31, 1);
-lean_inc(x_33);
-lean_dec_ref(x_31);
-x_34 = lean_ctor_get(x_32, 0);
+x_34 = lean_ctor_get(x_32, 1);
 lean_inc(x_34);
 lean_dec_ref(x_32);
-x_11 = x_34;
-x_12 = x_33;
-goto block_27;
+x_35 = lean_ctor_get(x_33, 0);
+lean_inc(x_35);
+lean_dec_ref(x_33);
+x_11 = x_35;
+x_12 = x_34;
+goto block_28;
 }
 else
 {
-lean_dec(x_32);
+lean_dec(x_33);
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_object* x_35; 
+lean_object* x_36; 
 lean_dec_ref(x_2);
-x_35 = lean_ctor_get(x_31, 1);
-lean_inc(x_35);
-lean_dec_ref(x_31);
+x_36 = lean_ctor_get(x_32, 1);
+lean_inc(x_36);
+lean_dec_ref(x_32);
 x_11 = x_1;
-x_12 = x_35;
-goto block_27;
+x_12 = x_36;
+goto block_28;
 }
 case 2:
 {
-lean_object* x_36; 
+lean_object* x_37; 
 lean_dec_ref(x_2);
-x_36 = lean_ctor_get(x_31, 1);
-lean_inc(x_36);
-lean_dec_ref(x_31);
+x_37 = lean_ctor_get(x_32, 1);
+lean_inc(x_37);
+lean_dec_ref(x_32);
 x_11 = x_1;
-x_12 = x_36;
-goto block_27;
+x_12 = x_37;
+goto block_28;
 }
 case 0:
 {
-lean_object* x_37; 
+lean_object* x_38; 
 lean_dec_ref(x_2);
-x_37 = lean_ctor_get(x_31, 1);
-lean_inc(x_37);
-lean_dec_ref(x_31);
+x_38 = lean_ctor_get(x_32, 1);
+lean_inc(x_38);
+lean_dec_ref(x_32);
 x_11 = x_1;
-x_12 = x_37;
-goto block_27;
+x_12 = x_38;
+goto block_28;
 }
 case 1:
 {
-lean_object* x_38; 
+lean_object* x_39; 
 lean_dec_ref(x_2);
-x_38 = lean_ctor_get(x_31, 1);
-lean_inc(x_38);
-lean_dec_ref(x_31);
+x_39 = lean_ctor_get(x_32, 1);
+lean_inc(x_39);
+lean_dec_ref(x_32);
 x_11 = x_1;
-x_12 = x_38;
-goto block_27;
+x_12 = x_39;
+goto block_28;
 }
 case 4:
 {
-lean_object* x_39; 
+lean_object* x_40; 
 lean_dec_ref(x_2);
-x_39 = lean_ctor_get(x_31, 1);
-lean_inc(x_39);
-lean_dec_ref(x_31);
+x_40 = lean_ctor_get(x_32, 1);
+lean_inc(x_40);
+lean_dec_ref(x_32);
 x_11 = x_1;
-x_12 = x_39;
-goto block_27;
+x_12 = x_40;
+goto block_28;
 }
 case 3:
 {
-lean_object* x_40; 
+lean_object* x_41; 
 lean_dec_ref(x_2);
-x_40 = lean_ctor_get(x_31, 1);
-lean_inc(x_40);
-lean_dec_ref(x_31);
+x_41 = lean_ctor_get(x_32, 1);
+lean_inc(x_41);
+lean_dec_ref(x_32);
 x_11 = x_1;
-x_12 = x_40;
-goto block_27;
+x_12 = x_41;
+goto block_28;
 }
 default: 
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_41 = lean_ctor_get(x_31, 1);
-lean_inc(x_41);
-lean_dec_ref(x_31);
-x_42 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
-x_43 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_29, x_2, x_42, x_28, x_41);
-x_44 = lean_ctor_get(x_43, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_43, 1);
+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_42 = lean_ctor_get(x_32, 1);
+lean_inc(x_42);
+lean_dec_ref(x_32);
+x_43 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
+x_44 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_30, x_2, x_43, x_29, x_42);
+x_45 = lean_ctor_get(x_44, 0);
 lean_inc(x_45);
-lean_dec_ref(x_43);
-x_46 = lean_ctor_get(x_44, 0);
+x_46 = lean_ctor_get(x_44, 1);
 lean_inc(x_46);
-lean_dec(x_44);
-x_11 = x_46;
-x_12 = x_45;
-goto block_27;
+lean_dec_ref(x_44);
+x_47 = lean_ctor_get(x_45, 0);
+lean_inc(x_47);
+lean_dec(x_45);
+x_11 = x_47;
+x_12 = x_46;
+goto block_28;
 }
 }
 }
-block_27:
+block_28:
 {
 lean_object* x_13; uint8_t x_14; 
 x_13 = lean_st_ref_take(x_3);
@@ -3363,221 +3363,231 @@ return x_17;
 }
 else
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
 x_18 = lean_ctor_get(x_13, 1);
 x_19 = lean_ctor_get(x_13, 2);
 x_20 = lean_ctor_get(x_13, 3);
 x_21 = lean_ctor_get(x_13, 4);
 x_22 = lean_ctor_get(x_13, 5);
-x_23 = lean_ctor_get_uint8(x_13, sizeof(void*)*6);
+x_23 = lean_ctor_get(x_13, 6);
+x_24 = lean_ctor_get_uint8(x_13, sizeof(void*)*7);
+lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
 lean_dec(x_13);
-x_24 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_24, 0, x_12);
-lean_ctor_set(x_24, 1, x_18);
-lean_ctor_set(x_24, 2, x_19);
-lean_ctor_set(x_24, 3, x_20);
-lean_ctor_set(x_24, 4, x_21);
-lean_ctor_set(x_24, 5, x_22);
-lean_ctor_set_uint8(x_24, sizeof(void*)*6, x_23);
-x_25 = lean_st_ref_set(x_3, x_24);
-x_26 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_26, 0, x_11);
-return x_26;
+x_25 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_25, 0, x_12);
+lean_ctor_set(x_25, 1, x_18);
+lean_ctor_set(x_25, 2, x_19);
+lean_ctor_set(x_25, 3, x_20);
+lean_ctor_set(x_25, 4, x_21);
+lean_ctor_set(x_25, 5, x_22);
+lean_ctor_set(x_25, 6, x_23);
+lean_ctor_set_uint8(x_25, sizeof(void*)*7, x_24);
+x_26 = lean_st_ref_set(x_3, x_25);
+x_27 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_27, 0, x_11);
+return x_27;
 }
 }
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_47 = lean_ctor_get(x_5, 0);
-x_48 = lean_ctor_get(x_5, 1);
-x_49 = lean_ctor_get(x_5, 2);
-x_50 = lean_ctor_get(x_5, 3);
-x_51 = lean_ctor_get(x_5, 4);
-x_52 = lean_ctor_get(x_5, 5);
-x_53 = lean_ctor_get_uint8(x_5, sizeof(void*)*6);
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_48 = lean_ctor_get(x_5, 0);
+x_49 = lean_ctor_get(x_5, 1);
+x_50 = lean_ctor_get(x_5, 2);
+x_51 = lean_ctor_get(x_5, 3);
+x_52 = lean_ctor_get(x_5, 4);
+x_53 = lean_ctor_get(x_5, 5);
+x_54 = lean_ctor_get(x_5, 6);
+x_55 = lean_ctor_get_uint8(x_5, sizeof(void*)*7);
+lean_inc(x_54);
+lean_inc(x_53);
 lean_inc(x_52);
 lean_inc(x_51);
 lean_inc(x_50);
 lean_inc(x_49);
 lean_inc(x_48);
-lean_inc(x_47);
 lean_dec(x_5);
-x_54 = l_Lean_Meta_Sym_replaceS___redArg___closed__2;
-x_55 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_48);
-lean_ctor_set(x_55, 2, x_49);
-lean_ctor_set(x_55, 3, x_50);
-lean_ctor_set(x_55, 4, x_51);
-lean_ctor_set(x_55, 5, x_52);
-lean_ctor_set_uint8(x_55, sizeof(void*)*6, x_53);
-x_56 = lean_st_ref_set(x_3, x_55);
-x_57 = lean_st_ref_get(x_3);
-x_72 = lean_ctor_get_uint8(x_57, sizeof(void*)*6);
-lean_dec(x_57);
-x_73 = lean_unsigned_to_nat(0u);
-x_74 = lean_box(x_72);
+x_56 = l_Lean_Meta_Sym_replaceS___redArg___closed__2;
+x_57 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_49);
+lean_ctor_set(x_57, 2, x_50);
+lean_ctor_set(x_57, 3, x_51);
+lean_ctor_set(x_57, 4, x_52);
+lean_ctor_set(x_57, 5, x_53);
+lean_ctor_set(x_57, 6, x_54);
+lean_ctor_set_uint8(x_57, sizeof(void*)*7, x_55);
+x_58 = lean_st_ref_set(x_3, x_57);
+x_59 = lean_st_ref_get(x_3);
+x_75 = lean_ctor_get_uint8(x_59, sizeof(void*)*7);
+lean_dec(x_59);
+x_76 = lean_unsigned_to_nat(0u);
+x_77 = lean_box(x_75);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_75 = lean_apply_4(x_2, x_1, x_73, x_74, x_47);
-x_76 = lean_ctor_get(x_75, 0);
-lean_inc(x_76);
-if (lean_obj_tag(x_76) == 1)
+x_78 = lean_apply_4(x_2, x_1, x_76, x_77, x_48);
+x_79 = lean_ctor_get(x_78, 0);
+lean_inc(x_79);
+if (lean_obj_tag(x_79) == 1)
 {
-lean_object* x_77; lean_object* x_78; 
+lean_object* x_80; lean_object* x_81; 
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_77 = lean_ctor_get(x_75, 1);
-lean_inc(x_77);
-lean_dec_ref(x_75);
-x_78 = lean_ctor_get(x_76, 0);
-lean_inc(x_78);
-lean_dec_ref(x_76);
-x_58 = x_78;
-x_59 = x_77;
-goto block_71;
+x_80 = lean_ctor_get(x_78, 1);
+lean_inc(x_80);
+lean_dec_ref(x_78);
+x_81 = lean_ctor_get(x_79, 0);
+lean_inc(x_81);
+lean_dec_ref(x_79);
+x_60 = x_81;
+x_61 = x_80;
+goto block_74;
 }
 else
 {
-lean_dec(x_76);
+lean_dec(x_79);
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_object* x_79; 
+lean_object* x_82; 
 lean_dec_ref(x_2);
-x_79 = lean_ctor_get(x_75, 1);
-lean_inc(x_79);
-lean_dec_ref(x_75);
-x_58 = x_1;
-x_59 = x_79;
-goto block_71;
+x_82 = lean_ctor_get(x_78, 1);
+lean_inc(x_82);
+lean_dec_ref(x_78);
+x_60 = x_1;
+x_61 = x_82;
+goto block_74;
 }
 case 2:
 {
-lean_object* x_80; 
+lean_object* x_83; 
 lean_dec_ref(x_2);
-x_80 = lean_ctor_get(x_75, 1);
-lean_inc(x_80);
-lean_dec_ref(x_75);
-x_58 = x_1;
-x_59 = x_80;
-goto block_71;
+x_83 = lean_ctor_get(x_78, 1);
+lean_inc(x_83);
+lean_dec_ref(x_78);
+x_60 = x_1;
+x_61 = x_83;
+goto block_74;
 }
 case 0:
 {
-lean_object* x_81; 
+lean_object* x_84; 
 lean_dec_ref(x_2);
-x_81 = lean_ctor_get(x_75, 1);
-lean_inc(x_81);
-lean_dec_ref(x_75);
-x_58 = x_1;
-x_59 = x_81;
-goto block_71;
+x_84 = lean_ctor_get(x_78, 1);
+lean_inc(x_84);
+lean_dec_ref(x_78);
+x_60 = x_1;
+x_61 = x_84;
+goto block_74;
 }
 case 1:
 {
-lean_object* x_82; 
+lean_object* x_85; 
 lean_dec_ref(x_2);
-x_82 = lean_ctor_get(x_75, 1);
-lean_inc(x_82);
-lean_dec_ref(x_75);
-x_58 = x_1;
-x_59 = x_82;
-goto block_71;
+x_85 = lean_ctor_get(x_78, 1);
+lean_inc(x_85);
+lean_dec_ref(x_78);
+x_60 = x_1;
+x_61 = x_85;
+goto block_74;
 }
 case 4:
 {
-lean_object* x_83; 
+lean_object* x_86; 
 lean_dec_ref(x_2);
-x_83 = lean_ctor_get(x_75, 1);
-lean_inc(x_83);
-lean_dec_ref(x_75);
-x_58 = x_1;
-x_59 = x_83;
-goto block_71;
+x_86 = lean_ctor_get(x_78, 1);
+lean_inc(x_86);
+lean_dec_ref(x_78);
+x_60 = x_1;
+x_61 = x_86;
+goto block_74;
 }
 case 3:
 {
-lean_object* x_84; 
+lean_object* x_87; 
 lean_dec_ref(x_2);
-x_84 = lean_ctor_get(x_75, 1);
-lean_inc(x_84);
-lean_dec_ref(x_75);
-x_58 = x_1;
-x_59 = x_84;
-goto block_71;
+x_87 = lean_ctor_get(x_78, 1);
+lean_inc(x_87);
+lean_dec_ref(x_78);
+x_60 = x_1;
+x_61 = x_87;
+goto block_74;
 }
 default: 
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_85 = lean_ctor_get(x_75, 1);
-lean_inc(x_85);
-lean_dec_ref(x_75);
-x_86 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
-x_87 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_73, x_2, x_86, x_72, x_85);
-x_88 = lean_ctor_get(x_87, 0);
+lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_88 = lean_ctor_get(x_78, 1);
 lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
-lean_inc(x_89);
-lean_dec_ref(x_87);
-x_90 = lean_ctor_get(x_88, 0);
-lean_inc(x_90);
-lean_dec(x_88);
-x_58 = x_90;
-x_59 = x_89;
-goto block_71;
+lean_dec_ref(x_78);
+x_89 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
+x_90 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_76, x_2, x_89, x_75, x_88);
+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_ref(x_90);
+x_93 = lean_ctor_get(x_91, 0);
+lean_inc(x_93);
+lean_dec(x_91);
+x_60 = x_93;
+x_61 = x_92;
+goto block_74;
 }
 }
 }
-block_71:
+block_74:
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_60 = lean_st_ref_take(x_3);
-x_61 = lean_ctor_get(x_60, 1);
-lean_inc_ref(x_61);
-x_62 = lean_ctor_get(x_60, 2);
-lean_inc_ref(x_62);
-x_63 = lean_ctor_get(x_60, 3);
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; uint8_t x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_62 = lean_st_ref_take(x_3);
+x_63 = lean_ctor_get(x_62, 1);
 lean_inc_ref(x_63);
-x_64 = lean_ctor_get(x_60, 4);
+x_64 = lean_ctor_get(x_62, 2);
 lean_inc_ref(x_64);
-x_65 = lean_ctor_get(x_60, 5);
+x_65 = lean_ctor_get(x_62, 3);
 lean_inc_ref(x_65);
-x_66 = lean_ctor_get_uint8(x_60, sizeof(void*)*6);
-if (lean_is_exclusive(x_60)) {
- lean_ctor_release(x_60, 0);
- lean_ctor_release(x_60, 1);
- lean_ctor_release(x_60, 2);
- lean_ctor_release(x_60, 3);
- lean_ctor_release(x_60, 4);
- lean_ctor_release(x_60, 5);
- x_67 = x_60;
+x_66 = lean_ctor_get(x_62, 4);
+lean_inc_ref(x_66);
+x_67 = lean_ctor_get(x_62, 5);
+lean_inc_ref(x_67);
+x_68 = lean_ctor_get(x_62, 6);
+lean_inc_ref(x_68);
+x_69 = lean_ctor_get_uint8(x_62, sizeof(void*)*7);
+if (lean_is_exclusive(x_62)) {
+ lean_ctor_release(x_62, 0);
+ lean_ctor_release(x_62, 1);
+ lean_ctor_release(x_62, 2);
+ lean_ctor_release(x_62, 3);
+ lean_ctor_release(x_62, 4);
+ lean_ctor_release(x_62, 5);
+ lean_ctor_release(x_62, 6);
+ x_70 = x_62;
 } else {
- lean_dec_ref(x_60);
- x_67 = lean_box(0);
+ lean_dec_ref(x_62);
+ x_70 = lean_box(0);
 }
-if (lean_is_scalar(x_67)) {
- x_68 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_70)) {
+ x_71 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_68 = x_67;
+ x_71 = x_70;
 }
-lean_ctor_set(x_68, 0, x_59);
-lean_ctor_set(x_68, 1, x_61);
-lean_ctor_set(x_68, 2, x_62);
-lean_ctor_set(x_68, 3, x_63);
-lean_ctor_set(x_68, 4, x_64);
-lean_ctor_set(x_68, 5, x_65);
-lean_ctor_set_uint8(x_68, sizeof(void*)*6, x_66);
-x_69 = lean_st_ref_set(x_3, x_68);
-x_70 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_70, 0, x_58);
-return x_70;
+lean_ctor_set(x_71, 0, x_61);
+lean_ctor_set(x_71, 1, x_63);
+lean_ctor_set(x_71, 2, x_64);
+lean_ctor_set(x_71, 3, x_65);
+lean_ctor_set(x_71, 4, x_66);
+lean_ctor_set(x_71, 5, x_67);
+lean_ctor_set(x_71, 6, x_68);
+lean_ctor_set_uint8(x_71, sizeof(void*)*7, x_69);
+x_72 = lean_st_ref_set(x_3, x_71);
+x_73 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_73, 0, x_60);
+return x_73;
 }
 }
 }
@@ -3599,129 +3609,129 @@ x_10 = lean_st_ref_take(x_4);
 x_11 = !lean_is_exclusive(x_10);
 if (x_11 == 0)
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
 x_12 = lean_ctor_get(x_10, 0);
 x_13 = l_Lean_Meta_Sym_replaceS___redArg___closed__2;
 lean_ctor_set(x_10, 0, x_13);
 x_14 = lean_st_ref_set(x_4, x_10);
 x_15 = lean_st_ref_get(x_4);
-x_33 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_34 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
-x_34 = lean_unsigned_to_nat(0u);
-x_35 = lean_box(x_33);
+x_35 = lean_unsigned_to_nat(0u);
+x_36 = lean_box(x_34);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_36 = lean_apply_4(x_2, x_1, x_34, x_35, x_12);
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-if (lean_obj_tag(x_37) == 1)
+x_37 = lean_apply_4(x_2, x_1, x_35, x_36, x_12);
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+if (lean_obj_tag(x_38) == 1)
 {
-lean_object* x_38; lean_object* x_39; 
+lean_object* x_39; lean_object* x_40; 
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_38 = lean_ctor_get(x_36, 1);
-lean_inc(x_38);
-lean_dec_ref(x_36);
-x_39 = lean_ctor_get(x_37, 0);
+x_39 = lean_ctor_get(x_37, 1);
 lean_inc(x_39);
 lean_dec_ref(x_37);
-x_16 = x_39;
-x_17 = x_38;
-goto block_32;
+x_40 = lean_ctor_get(x_38, 0);
+lean_inc(x_40);
+lean_dec_ref(x_38);
+x_16 = x_40;
+x_17 = x_39;
+goto block_33;
 }
 else
 {
-lean_dec(x_37);
+lean_dec(x_38);
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_object* x_40; 
+lean_object* x_41; 
 lean_dec_ref(x_2);
-x_40 = lean_ctor_get(x_36, 1);
-lean_inc(x_40);
-lean_dec_ref(x_36);
+x_41 = lean_ctor_get(x_37, 1);
+lean_inc(x_41);
+lean_dec_ref(x_37);
 x_16 = x_1;
-x_17 = x_40;
-goto block_32;
+x_17 = x_41;
+goto block_33;
 }
 case 2:
 {
-lean_object* x_41; 
+lean_object* x_42; 
 lean_dec_ref(x_2);
-x_41 = lean_ctor_get(x_36, 1);
-lean_inc(x_41);
-lean_dec_ref(x_36);
+x_42 = lean_ctor_get(x_37, 1);
+lean_inc(x_42);
+lean_dec_ref(x_37);
 x_16 = x_1;
-x_17 = x_41;
-goto block_32;
+x_17 = x_42;
+goto block_33;
 }
 case 0:
 {
-lean_object* x_42; 
+lean_object* x_43; 
 lean_dec_ref(x_2);
-x_42 = lean_ctor_get(x_36, 1);
-lean_inc(x_42);
-lean_dec_ref(x_36);
+x_43 = lean_ctor_get(x_37, 1);
+lean_inc(x_43);
+lean_dec_ref(x_37);
 x_16 = x_1;
-x_17 = x_42;
-goto block_32;
+x_17 = x_43;
+goto block_33;
 }
 case 1:
 {
-lean_object* x_43; 
+lean_object* x_44; 
 lean_dec_ref(x_2);
-x_43 = lean_ctor_get(x_36, 1);
-lean_inc(x_43);
-lean_dec_ref(x_36);
+x_44 = lean_ctor_get(x_37, 1);
+lean_inc(x_44);
+lean_dec_ref(x_37);
 x_16 = x_1;
-x_17 = x_43;
-goto block_32;
+x_17 = x_44;
+goto block_33;
 }
 case 4:
 {
-lean_object* x_44; 
+lean_object* x_45; 
 lean_dec_ref(x_2);
-x_44 = lean_ctor_get(x_36, 1);
-lean_inc(x_44);
-lean_dec_ref(x_36);
+x_45 = lean_ctor_get(x_37, 1);
+lean_inc(x_45);
+lean_dec_ref(x_37);
 x_16 = x_1;
-x_17 = x_44;
-goto block_32;
+x_17 = x_45;
+goto block_33;
 }
 case 3:
 {
-lean_object* x_45; 
+lean_object* x_46; 
 lean_dec_ref(x_2);
-x_45 = lean_ctor_get(x_36, 1);
-lean_inc(x_45);
-lean_dec_ref(x_36);
+x_46 = lean_ctor_get(x_37, 1);
+lean_inc(x_46);
+lean_dec_ref(x_37);
 x_16 = x_1;
-x_17 = x_45;
-goto block_32;
+x_17 = x_46;
+goto block_33;
 }
 default: 
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_46 = lean_ctor_get(x_36, 1);
-lean_inc(x_46);
-lean_dec_ref(x_36);
-x_47 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
-x_48 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_34, x_2, x_47, x_33, x_46);
-x_49 = lean_ctor_get(x_48, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_48, 1);
+lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_47 = lean_ctor_get(x_37, 1);
+lean_inc(x_47);
+lean_dec_ref(x_37);
+x_48 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
+x_49 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_35, x_2, x_48, x_34, x_47);
+x_50 = lean_ctor_get(x_49, 0);
 lean_inc(x_50);
-lean_dec_ref(x_48);
-x_51 = lean_ctor_get(x_49, 0);
+x_51 = lean_ctor_get(x_49, 1);
 lean_inc(x_51);
-lean_dec(x_49);
-x_16 = x_51;
-x_17 = x_50;
-goto block_32;
+lean_dec_ref(x_49);
+x_52 = lean_ctor_get(x_50, 0);
+lean_inc(x_52);
+lean_dec(x_50);
+x_16 = x_52;
+x_17 = x_51;
+goto block_33;
 }
 }
 }
-block_32:
+block_33:
 {
 lean_object* x_18; uint8_t x_19; 
 x_18 = lean_st_ref_take(x_4);
@@ -3739,221 +3749,231 @@ return x_22;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_23 = lean_ctor_get(x_18, 1);
 x_24 = lean_ctor_get(x_18, 2);
 x_25 = lean_ctor_get(x_18, 3);
 x_26 = lean_ctor_get(x_18, 4);
 x_27 = lean_ctor_get(x_18, 5);
-x_28 = lean_ctor_get_uint8(x_18, sizeof(void*)*6);
+x_28 = lean_ctor_get(x_18, 6);
+x_29 = lean_ctor_get_uint8(x_18, sizeof(void*)*7);
+lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_dec(x_18);
-x_29 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_29, 0, x_17);
-lean_ctor_set(x_29, 1, x_23);
-lean_ctor_set(x_29, 2, x_24);
-lean_ctor_set(x_29, 3, x_25);
-lean_ctor_set(x_29, 4, x_26);
-lean_ctor_set(x_29, 5, x_27);
-lean_ctor_set_uint8(x_29, sizeof(void*)*6, x_28);
-x_30 = lean_st_ref_set(x_4, x_29);
-x_31 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_31, 0, x_16);
-return x_31;
+x_30 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_30, 0, x_17);
+lean_ctor_set(x_30, 1, x_23);
+lean_ctor_set(x_30, 2, x_24);
+lean_ctor_set(x_30, 3, x_25);
+lean_ctor_set(x_30, 4, x_26);
+lean_ctor_set(x_30, 5, x_27);
+lean_ctor_set(x_30, 6, x_28);
+lean_ctor_set_uint8(x_30, sizeof(void*)*7, x_29);
+x_31 = lean_st_ref_set(x_4, x_30);
+x_32 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_32, 0, x_16);
+return x_32;
 }
 }
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; uint8_t x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_52 = lean_ctor_get(x_10, 0);
-x_53 = lean_ctor_get(x_10, 1);
-x_54 = lean_ctor_get(x_10, 2);
-x_55 = lean_ctor_get(x_10, 3);
-x_56 = lean_ctor_get(x_10, 4);
-x_57 = lean_ctor_get(x_10, 5);
-x_58 = lean_ctor_get_uint8(x_10, sizeof(void*)*6);
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_53 = lean_ctor_get(x_10, 0);
+x_54 = lean_ctor_get(x_10, 1);
+x_55 = lean_ctor_get(x_10, 2);
+x_56 = lean_ctor_get(x_10, 3);
+x_57 = lean_ctor_get(x_10, 4);
+x_58 = lean_ctor_get(x_10, 5);
+x_59 = lean_ctor_get(x_10, 6);
+x_60 = lean_ctor_get_uint8(x_10, sizeof(void*)*7);
+lean_inc(x_59);
+lean_inc(x_58);
 lean_inc(x_57);
 lean_inc(x_56);
 lean_inc(x_55);
 lean_inc(x_54);
 lean_inc(x_53);
-lean_inc(x_52);
 lean_dec(x_10);
-x_59 = l_Lean_Meta_Sym_replaceS___redArg___closed__2;
-x_60 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_53);
-lean_ctor_set(x_60, 2, x_54);
-lean_ctor_set(x_60, 3, x_55);
-lean_ctor_set(x_60, 4, x_56);
-lean_ctor_set(x_60, 5, x_57);
-lean_ctor_set_uint8(x_60, sizeof(void*)*6, x_58);
-x_61 = lean_st_ref_set(x_4, x_60);
-x_62 = lean_st_ref_get(x_4);
-x_77 = lean_ctor_get_uint8(x_62, sizeof(void*)*6);
-lean_dec(x_62);
-x_78 = lean_unsigned_to_nat(0u);
-x_79 = lean_box(x_77);
+x_61 = l_Lean_Meta_Sym_replaceS___redArg___closed__2;
+x_62 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_62, 0, x_61);
+lean_ctor_set(x_62, 1, x_54);
+lean_ctor_set(x_62, 2, x_55);
+lean_ctor_set(x_62, 3, x_56);
+lean_ctor_set(x_62, 4, x_57);
+lean_ctor_set(x_62, 5, x_58);
+lean_ctor_set(x_62, 6, x_59);
+lean_ctor_set_uint8(x_62, sizeof(void*)*7, x_60);
+x_63 = lean_st_ref_set(x_4, x_62);
+x_64 = lean_st_ref_get(x_4);
+x_80 = lean_ctor_get_uint8(x_64, sizeof(void*)*7);
+lean_dec(x_64);
+x_81 = lean_unsigned_to_nat(0u);
+x_82 = lean_box(x_80);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_80 = lean_apply_4(x_2, x_1, x_78, x_79, x_52);
-x_81 = lean_ctor_get(x_80, 0);
-lean_inc(x_81);
-if (lean_obj_tag(x_81) == 1)
+x_83 = lean_apply_4(x_2, x_1, x_81, x_82, x_53);
+x_84 = lean_ctor_get(x_83, 0);
+lean_inc(x_84);
+if (lean_obj_tag(x_84) == 1)
 {
-lean_object* x_82; lean_object* x_83; 
+lean_object* x_85; lean_object* x_86; 
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_82 = lean_ctor_get(x_80, 1);
-lean_inc(x_82);
-lean_dec_ref(x_80);
-x_83 = lean_ctor_get(x_81, 0);
-lean_inc(x_83);
-lean_dec_ref(x_81);
-x_63 = x_83;
-x_64 = x_82;
-goto block_76;
+x_85 = lean_ctor_get(x_83, 1);
+lean_inc(x_85);
+lean_dec_ref(x_83);
+x_86 = lean_ctor_get(x_84, 0);
+lean_inc(x_86);
+lean_dec_ref(x_84);
+x_65 = x_86;
+x_66 = x_85;
+goto block_79;
 }
 else
 {
-lean_dec(x_81);
+lean_dec(x_84);
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-lean_object* x_84; 
+lean_object* x_87; 
 lean_dec_ref(x_2);
-x_84 = lean_ctor_get(x_80, 1);
-lean_inc(x_84);
-lean_dec_ref(x_80);
-x_63 = x_1;
-x_64 = x_84;
-goto block_76;
+x_87 = lean_ctor_get(x_83, 1);
+lean_inc(x_87);
+lean_dec_ref(x_83);
+x_65 = x_1;
+x_66 = x_87;
+goto block_79;
 }
 case 2:
 {
-lean_object* x_85; 
+lean_object* x_88; 
 lean_dec_ref(x_2);
-x_85 = lean_ctor_get(x_80, 1);
-lean_inc(x_85);
-lean_dec_ref(x_80);
-x_63 = x_1;
-x_64 = x_85;
-goto block_76;
+x_88 = lean_ctor_get(x_83, 1);
+lean_inc(x_88);
+lean_dec_ref(x_83);
+x_65 = x_1;
+x_66 = x_88;
+goto block_79;
 }
 case 0:
 {
-lean_object* x_86; 
+lean_object* x_89; 
 lean_dec_ref(x_2);
-x_86 = lean_ctor_get(x_80, 1);
-lean_inc(x_86);
-lean_dec_ref(x_80);
-x_63 = x_1;
-x_64 = x_86;
-goto block_76;
+x_89 = lean_ctor_get(x_83, 1);
+lean_inc(x_89);
+lean_dec_ref(x_83);
+x_65 = x_1;
+x_66 = x_89;
+goto block_79;
 }
 case 1:
 {
-lean_object* x_87; 
+lean_object* x_90; 
 lean_dec_ref(x_2);
-x_87 = lean_ctor_get(x_80, 1);
-lean_inc(x_87);
-lean_dec_ref(x_80);
-x_63 = x_1;
-x_64 = x_87;
-goto block_76;
+x_90 = lean_ctor_get(x_83, 1);
+lean_inc(x_90);
+lean_dec_ref(x_83);
+x_65 = x_1;
+x_66 = x_90;
+goto block_79;
 }
 case 4:
 {
-lean_object* x_88; 
+lean_object* x_91; 
 lean_dec_ref(x_2);
-x_88 = lean_ctor_get(x_80, 1);
-lean_inc(x_88);
-lean_dec_ref(x_80);
-x_63 = x_1;
-x_64 = x_88;
-goto block_76;
+x_91 = lean_ctor_get(x_83, 1);
+lean_inc(x_91);
+lean_dec_ref(x_83);
+x_65 = x_1;
+x_66 = x_91;
+goto block_79;
 }
 case 3:
 {
-lean_object* x_89; 
+lean_object* x_92; 
 lean_dec_ref(x_2);
-x_89 = lean_ctor_get(x_80, 1);
-lean_inc(x_89);
-lean_dec_ref(x_80);
-x_63 = x_1;
-x_64 = x_89;
-goto block_76;
+x_92 = lean_ctor_get(x_83, 1);
+lean_inc(x_92);
+lean_dec_ref(x_83);
+x_65 = x_1;
+x_66 = x_92;
+goto block_79;
 }
 default: 
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_90 = lean_ctor_get(x_80, 1);
-lean_inc(x_90);
-lean_dec_ref(x_80);
-x_91 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
-x_92 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_78, x_2, x_91, x_77, x_90);
-x_93 = lean_ctor_get(x_92, 0);
+lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_93 = lean_ctor_get(x_83, 1);
 lean_inc(x_93);
-x_94 = lean_ctor_get(x_92, 1);
-lean_inc(x_94);
-lean_dec_ref(x_92);
-x_95 = lean_ctor_get(x_93, 0);
-lean_inc(x_95);
-lean_dec(x_93);
-x_63 = x_95;
-x_64 = x_94;
-goto block_76;
+lean_dec_ref(x_83);
+x_94 = l_Lean_Meta_Sym_replaceS_x27___closed__1;
+x_95 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit(x_1, x_81, x_2, x_94, x_80, x_93);
+x_96 = lean_ctor_get(x_95, 0);
+lean_inc(x_96);
+x_97 = lean_ctor_get(x_95, 1);
+lean_inc(x_97);
+lean_dec_ref(x_95);
+x_98 = lean_ctor_get(x_96, 0);
+lean_inc(x_98);
+lean_dec(x_96);
+x_65 = x_98;
+x_66 = x_97;
+goto block_79;
 }
 }
 }
-block_76:
+block_79:
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; uint8_t x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-x_65 = lean_st_ref_take(x_4);
-x_66 = lean_ctor_get(x_65, 1);
-lean_inc_ref(x_66);
-x_67 = lean_ctor_get(x_65, 2);
-lean_inc_ref(x_67);
-x_68 = lean_ctor_get(x_65, 3);
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_67 = lean_st_ref_take(x_4);
+x_68 = lean_ctor_get(x_67, 1);
 lean_inc_ref(x_68);
-x_69 = lean_ctor_get(x_65, 4);
+x_69 = lean_ctor_get(x_67, 2);
 lean_inc_ref(x_69);
-x_70 = lean_ctor_get(x_65, 5);
+x_70 = lean_ctor_get(x_67, 3);
 lean_inc_ref(x_70);
-x_71 = lean_ctor_get_uint8(x_65, sizeof(void*)*6);
-if (lean_is_exclusive(x_65)) {
- lean_ctor_release(x_65, 0);
- lean_ctor_release(x_65, 1);
- lean_ctor_release(x_65, 2);
- lean_ctor_release(x_65, 3);
- lean_ctor_release(x_65, 4);
- lean_ctor_release(x_65, 5);
- x_72 = x_65;
+x_71 = lean_ctor_get(x_67, 4);
+lean_inc_ref(x_71);
+x_72 = lean_ctor_get(x_67, 5);
+lean_inc_ref(x_72);
+x_73 = lean_ctor_get(x_67, 6);
+lean_inc_ref(x_73);
+x_74 = lean_ctor_get_uint8(x_67, sizeof(void*)*7);
+if (lean_is_exclusive(x_67)) {
+ lean_ctor_release(x_67, 0);
+ lean_ctor_release(x_67, 1);
+ lean_ctor_release(x_67, 2);
+ lean_ctor_release(x_67, 3);
+ lean_ctor_release(x_67, 4);
+ lean_ctor_release(x_67, 5);
+ lean_ctor_release(x_67, 6);
+ x_75 = x_67;
 } else {
- lean_dec_ref(x_65);
- x_72 = lean_box(0);
+ lean_dec_ref(x_67);
+ x_75 = lean_box(0);
 }
-if (lean_is_scalar(x_72)) {
- x_73 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_75)) {
+ x_76 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_73 = x_72;
+ x_76 = x_75;
 }
-lean_ctor_set(x_73, 0, x_64);
-lean_ctor_set(x_73, 1, x_66);
-lean_ctor_set(x_73, 2, x_67);
-lean_ctor_set(x_73, 3, x_68);
-lean_ctor_set(x_73, 4, x_69);
-lean_ctor_set(x_73, 5, x_70);
-lean_ctor_set_uint8(x_73, sizeof(void*)*6, x_71);
-x_74 = lean_st_ref_set(x_4, x_73);
-x_75 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_75, 0, x_63);
-return x_75;
+lean_ctor_set(x_76, 0, x_66);
+lean_ctor_set(x_76, 1, x_68);
+lean_ctor_set(x_76, 2, x_69);
+lean_ctor_set(x_76, 3, x_70);
+lean_ctor_set(x_76, 4, x_71);
+lean_ctor_set(x_76, 5, x_72);
+lean_ctor_set(x_76, 6, x_73);
+lean_ctor_set_uint8(x_76, sizeof(void*)*7, x_74);
+x_77 = lean_st_ref_set(x_4, x_76);
+x_78 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_78, 0, x_65);
+return x_78;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/App.c b/stage0/stdlib/Lean/Meta/Sym/Simp/App.c
index 58bc4f9a59..ace3b82d20 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/App.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/App.c
@@ -211,7 +211,7 @@ lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bindingBody_x21(lean_object*);
 lean_object* l_Lean_Expr_bindingDomain_x21(lean_object*);
 lean_object* lean_expr_instantiate_rev(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_isDefEqI(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Sym_isDefEqI___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_Sym_Simp_instInhabitedResult_default;
 lean_object* l_Lean_Meta_Sym_mkEqRefl___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -265,7 +265,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
@@ -3304,7 +3304,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
@@ -7748,7 +7748,7 @@ lean_inc_ref(x_13);
 lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc_ref(x_100);
-x_101 = l_Lean_Meta_isDefEqI(x_98, x_100, x_11, x_12, x_13, x_14);
+x_101 = l_Lean_Meta_Sym_isDefEqI___redArg(x_98, x_100, x_10, x_11, x_12, x_13, x_14);
 if (lean_obj_tag(x_101) == 0)
 {
 lean_object* x_102; uint8_t x_103; 
@@ -8366,7 +8366,7 @@ lean_inc_ref(x_13);
 lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc_ref(x_210);
-x_211 = l_Lean_Meta_isDefEqI(x_208, x_210, x_11, x_12, x_13, x_14);
+x_211 = l_Lean_Meta_Sym_isDefEqI___redArg(x_208, x_210, x_10, x_11, x_12, x_13, x_14);
 if (lean_obj_tag(x_211) == 0)
 {
 lean_object* x_212; uint8_t x_213; 
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/CongrInfo.c b/stage0/stdlib/Lean/Meta/Sym/Simp/CongrInfo.c
index 609759bbc7..911df60d5d 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/CongrInfo.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/CongrInfo.c
@@ -2516,14 +2516,16 @@ return x_14;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_22 = lean_ctor_get(x_17, 0);
 x_23 = lean_ctor_get(x_17, 1);
 x_24 = lean_ctor_get(x_17, 2);
 x_25 = lean_ctor_get(x_17, 3);
 x_26 = lean_ctor_get(x_17, 4);
 x_27 = lean_ctor_get(x_17, 5);
-x_28 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_28 = lean_ctor_get(x_17, 6);
+x_29 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
+lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
@@ -2532,69 +2534,74 @@ lean_inc(x_23);
 lean_inc(x_22);
 lean_dec(x_17);
 lean_inc(x_16);
-x_29 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getCongrInfo_spec__1___redArg(x_27, x_1, x_16);
-x_30 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_30, 0, x_22);
-lean_ctor_set(x_30, 1, x_23);
-lean_ctor_set(x_30, 2, x_24);
-lean_ctor_set(x_30, 3, x_25);
-lean_ctor_set(x_30, 4, x_26);
-lean_ctor_set(x_30, 5, x_29);
-lean_ctor_set_uint8(x_30, sizeof(void*)*6, x_28);
-x_31 = lean_st_ref_set(x_2, x_30);
+x_30 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getCongrInfo_spec__1___redArg(x_27, x_1, x_16);
+x_31 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_31, 0, x_22);
+lean_ctor_set(x_31, 1, x_23);
+lean_ctor_set(x_31, 2, x_24);
+lean_ctor_set(x_31, 3, x_25);
+lean_ctor_set(x_31, 4, x_26);
+lean_ctor_set(x_31, 5, x_30);
+lean_ctor_set(x_31, 6, x_28);
+lean_ctor_set_uint8(x_31, sizeof(void*)*7, x_29);
+x_32 = lean_st_ref_set(x_2, x_31);
 return x_14;
 }
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_32 = lean_ctor_get(x_14, 0);
-lean_inc(x_32);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_33 = lean_ctor_get(x_14, 0);
+lean_inc(x_33);
 lean_dec(x_14);
-x_33 = lean_st_ref_take(x_2);
-x_34 = lean_ctor_get(x_33, 0);
-lean_inc_ref(x_34);
-x_35 = lean_ctor_get(x_33, 1);
+x_34 = lean_st_ref_take(x_2);
+x_35 = lean_ctor_get(x_34, 0);
 lean_inc_ref(x_35);
-x_36 = lean_ctor_get(x_33, 2);
+x_36 = lean_ctor_get(x_34, 1);
 lean_inc_ref(x_36);
-x_37 = lean_ctor_get(x_33, 3);
+x_37 = lean_ctor_get(x_34, 2);
 lean_inc_ref(x_37);
-x_38 = lean_ctor_get(x_33, 4);
+x_38 = lean_ctor_get(x_34, 3);
 lean_inc_ref(x_38);
-x_39 = lean_ctor_get(x_33, 5);
+x_39 = lean_ctor_get(x_34, 4);
 lean_inc_ref(x_39);
-x_40 = lean_ctor_get_uint8(x_33, sizeof(void*)*6);
-if (lean_is_exclusive(x_33)) {
- lean_ctor_release(x_33, 0);
- lean_ctor_release(x_33, 1);
- lean_ctor_release(x_33, 2);
- lean_ctor_release(x_33, 3);
- lean_ctor_release(x_33, 4);
- lean_ctor_release(x_33, 5);
- x_41 = x_33;
+x_40 = lean_ctor_get(x_34, 5);
+lean_inc_ref(x_40);
+x_41 = lean_ctor_get(x_34, 6);
+lean_inc_ref(x_41);
+x_42 = lean_ctor_get_uint8(x_34, sizeof(void*)*7);
+if (lean_is_exclusive(x_34)) {
+ lean_ctor_release(x_34, 0);
+ lean_ctor_release(x_34, 1);
+ lean_ctor_release(x_34, 2);
+ lean_ctor_release(x_34, 3);
+ lean_ctor_release(x_34, 4);
+ lean_ctor_release(x_34, 5);
+ lean_ctor_release(x_34, 6);
+ x_43 = x_34;
 } else {
- lean_dec_ref(x_33);
- x_41 = lean_box(0);
+ lean_dec_ref(x_34);
+ x_43 = lean_box(0);
 }
-lean_inc(x_32);
-x_42 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getCongrInfo_spec__1___redArg(x_39, x_1, x_32);
-if (lean_is_scalar(x_41)) {
- x_43 = lean_alloc_ctor(0, 6, 1);
+lean_inc(x_33);
+x_44 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_getCongrInfo_spec__1___redArg(x_40, x_1, x_33);
+if (lean_is_scalar(x_43)) {
+ x_45 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_43 = x_41;
+ x_45 = x_43;
 }
-lean_ctor_set(x_43, 0, x_34);
-lean_ctor_set(x_43, 1, x_35);
-lean_ctor_set(x_43, 2, x_36);
-lean_ctor_set(x_43, 3, x_37);
-lean_ctor_set(x_43, 4, x_38);
-lean_ctor_set(x_43, 5, x_42);
-lean_ctor_set_uint8(x_43, sizeof(void*)*6, x_40);
-x_44 = lean_st_ref_set(x_2, x_43);
-x_45 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_45, 0, x_32);
-return x_45;
+lean_ctor_set(x_45, 0, x_35);
+lean_ctor_set(x_45, 1, x_36);
+lean_ctor_set(x_45, 2, x_37);
+lean_ctor_set(x_45, 3, x_38);
+lean_ctor_set(x_45, 4, x_39);
+lean_ctor_set(x_45, 5, x_44);
+lean_ctor_set(x_45, 6, x_41);
+lean_ctor_set_uint8(x_45, sizeof(void*)*7, x_42);
+x_46 = lean_st_ref_set(x_2, x_45);
+x_47 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_47, 0, x_33);
+return x_47;
 }
 }
 else
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/ControlFlow.c b/stage0/stdlib/Lean/Meta/Sym/Simp/ControlFlow.c
index 9fc28671b1..74baed3472 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/ControlFlow.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/ControlFlow.c
@@ -224,7 +224,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/EvalGround.c b/stage0/stdlib/Lean/Meta/Sym/Simp/EvalGround.c
index 0ad40a0779..bb60d5e91c 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/EvalGround.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/EvalGround.c
@@ -4357,7 +4357,7 @@ lean_inc(x_6);
 lean_dec_ref(x_5);
 x_7 = lean_apply_1(x_1, x_6);
 x_8 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_9 = lean_uint64_to_nat(x_8);
 x_10 = l_Lean_mkRawNatLit(x_9);
 x_11 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryUInt8___redArg___closed__3;
@@ -4459,7 +4459,7 @@ lean_inc(x_14);
 lean_dec_ref(x_13);
 x_15 = lean_apply_1(x_1, x_14);
 x_16 = lean_unbox_uint64(x_15);
-lean_dec(x_15);
+lean_dec_ref(x_15);
 x_17 = lean_uint64_to_nat(x_16);
 x_18 = l_Lean_mkRawNatLit(x_17);
 x_19 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryUInt8___redArg___closed__3;
@@ -5528,7 +5528,7 @@ x_31 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnary
 x_32 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__4;
 x_33 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__6;
 x_34 = lean_unbox_uint64(x_27);
-lean_dec(x_27);
+lean_dec_ref(x_27);
 x_35 = lean_int64_to_int_sint(x_34);
 x_36 = lean_int_neg(x_35);
 lean_dec(x_35);
@@ -5543,7 +5543,7 @@ else
 {
 uint64_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
 x_40 = lean_unbox_uint64(x_27);
-lean_dec(x_27);
+lean_dec_ref(x_27);
 x_41 = lean_int64_to_int_sint(x_40);
 x_42 = l_Int_toNat(x_41);
 lean_dec(x_41);
@@ -5659,7 +5659,7 @@ x_39 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnary
 x_40 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__4;
 x_41 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__6;
 x_42 = lean_unbox_uint64(x_35);
-lean_dec(x_35);
+lean_dec_ref(x_35);
 x_43 = lean_int64_to_int_sint(x_42);
 x_44 = lean_int_neg(x_43);
 lean_dec(x_43);
@@ -5674,7 +5674,7 @@ else
 {
 uint64_t x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
 x_48 = lean_unbox_uint64(x_35);
-lean_dec(x_35);
+lean_dec_ref(x_35);
 x_49 = lean_int64_to_int_sint(x_48);
 x_50 = l_Int_toNat(x_49);
 lean_dec(x_49);
@@ -9257,7 +9257,7 @@ lean_inc(x_10);
 lean_dec_ref(x_9);
 x_11 = lean_apply_2(x_1, x_8, x_10);
 x_12 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_13 = lean_uint64_to_nat(x_12);
 x_14 = l_Lean_mkRawNatLit(x_13);
 x_15 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryUInt8___redArg___closed__3;
@@ -9352,7 +9352,7 @@ lean_inc(x_39);
 lean_dec_ref(x_38);
 x_40 = lean_apply_2(x_1, x_37, x_39);
 x_41 = lean_unbox_uint64(x_40);
-lean_dec(x_40);
+lean_dec_ref(x_40);
 x_42 = lean_uint64_to_nat(x_41);
 x_43 = l_Lean_mkRawNatLit(x_42);
 x_44 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryUInt8___redArg___closed__3;
@@ -9469,7 +9469,7 @@ lean_inc(x_18);
 lean_dec_ref(x_17);
 x_19 = lean_apply_2(x_1, x_16, x_18);
 x_20 = lean_unbox_uint64(x_19);
-lean_dec(x_19);
+lean_dec_ref(x_19);
 x_21 = lean_uint64_to_nat(x_20);
 x_22 = l_Lean_mkRawNatLit(x_21);
 x_23 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryUInt8___redArg___closed__3;
@@ -9564,7 +9564,7 @@ lean_inc(x_47);
 lean_dec_ref(x_46);
 x_48 = lean_apply_2(x_1, x_45, x_47);
 x_49 = lean_unbox_uint64(x_48);
-lean_dec(x_48);
+lean_dec_ref(x_48);
 x_50 = lean_uint64_to_nat(x_49);
 x_51 = l_Lean_mkRawNatLit(x_50);
 x_52 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryUInt8___redArg___closed__3;
@@ -10980,7 +10980,7 @@ x_35 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnary
 x_36 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__4;
 x_37 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__6;
 x_38 = lean_unbox_uint64(x_31);
-lean_dec(x_31);
+lean_dec_ref(x_31);
 x_39 = lean_int64_to_int_sint(x_38);
 x_40 = lean_int_neg(x_39);
 lean_dec(x_39);
@@ -10995,7 +10995,7 @@ else
 {
 uint64_t x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
 x_44 = lean_unbox_uint64(x_31);
-lean_dec(x_31);
+lean_dec_ref(x_31);
 x_45 = lean_int64_to_int_sint(x_44);
 x_46 = l_Int_toNat(x_45);
 lean_dec(x_45);
@@ -11040,7 +11040,7 @@ x_56 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnary
 x_57 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__4;
 x_58 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__6;
 x_59 = lean_unbox_uint64(x_52);
-lean_dec(x_52);
+lean_dec_ref(x_52);
 x_60 = lean_int64_to_int_sint(x_59);
 x_61 = lean_int_neg(x_60);
 lean_dec(x_60);
@@ -11055,7 +11055,7 @@ else
 {
 uint64_t x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
 x_65 = lean_unbox_uint64(x_52);
-lean_dec(x_52);
+lean_dec_ref(x_52);
 x_66 = lean_int64_to_int_sint(x_65);
 x_67 = l_Int_toNat(x_66);
 lean_dec(x_66);
@@ -11195,7 +11195,7 @@ x_43 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnary
 x_44 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__4;
 x_45 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__6;
 x_46 = lean_unbox_uint64(x_39);
-lean_dec(x_39);
+lean_dec_ref(x_39);
 x_47 = lean_int64_to_int_sint(x_46);
 x_48 = lean_int_neg(x_47);
 lean_dec(x_47);
@@ -11210,7 +11210,7 @@ else
 {
 uint64_t x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
 x_52 = lean_unbox_uint64(x_39);
-lean_dec(x_39);
+lean_dec_ref(x_39);
 x_53 = lean_int64_to_int_sint(x_52);
 x_54 = l_Int_toNat(x_53);
 lean_dec(x_53);
@@ -11255,7 +11255,7 @@ x_64 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnary
 x_65 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__4;
 x_66 = l___private_Lean_Meta_Sym_Simp_EvalGround_0__Lean_Meta_Sym_Simp_evalUnaryInt64___redArg___closed__6;
 x_67 = lean_unbox_uint64(x_60);
-lean_dec(x_60);
+lean_dec_ref(x_60);
 x_68 = lean_int64_to_int_sint(x_67);
 x_69 = lean_int_neg(x_68);
 lean_dec(x_68);
@@ -11270,7 +11270,7 @@ else
 {
 uint64_t x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
 x_73 = lean_unbox_uint64(x_60);
-lean_dec(x_60);
+lean_dec_ref(x_60);
 x_74 = lean_int64_to_int_sint(x_73);
 x_75 = l_Int_toNat(x_74);
 lean_dec(x_74);
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/Forall.c b/stage0/stdlib/Lean/Meta/Sym/Simp/Forall.c
index f7f9b52882..0b1c40040d 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/Forall.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/Forall.c
@@ -1210,7 +1210,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
@@ -1843,7 +1843,7 @@ _start:
 {
 lean_object* x_12; lean_object* x_13; lean_object* x_17; uint8_t x_18; 
 x_17 = lean_st_ref_get(x_6);
-x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -2102,7 +2102,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
@@ -6247,7 +6247,7 @@ _start:
 {
 lean_object* x_12; lean_object* x_13; lean_object* x_17; uint8_t x_18; 
 x_17 = lean_st_ref_get(x_6);
-x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
 lean_dec(x_17);
 if (x_18 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/Have.c b/stage0/stdlib/Lean/Meta/Sym/Simp/Have.c
index e8beeac19e..0a3f1fef48 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/Have.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/Have.c
@@ -924,7 +924,7 @@ _start:
 {
 lean_object* x_12; lean_object* x_13; lean_object* x_17; uint8_t x_18; 
 x_17 = lean_st_ref_get(x_6);
-x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*6);
+x_18 = lean_ctor_get_uint8(x_17, sizeof(void*)*7);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -4476,191 +4476,191 @@ x_6 = lean_st_ref_take(x_4);
 x_7 = !lean_is_exclusive(x_6);
 if (x_7 == 0)
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
+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_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
 x_8 = lean_ctor_get(x_6, 0);
 x_9 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__0;
 lean_ctor_set(x_6, 0, x_9);
 x_10 = lean_st_ref_set(x_4, x_6);
 x_11 = lean_st_ref_get(x_4);
-x_29 = lean_ctor_get_uint8(x_11, sizeof(void*)*6);
+x_30 = lean_ctor_get_uint8(x_11, sizeof(void*)*7);
 lean_dec(x_11);
-x_30 = lean_unsigned_to_nat(0u);
-x_31 = l_Lean_Expr_looseBVarRange(x_1);
-x_32 = lean_nat_dec_le(x_31, x_30);
-lean_dec(x_31);
-if (x_32 == 0)
+x_31 = lean_unsigned_to_nat(0u);
+x_32 = l_Lean_Expr_looseBVarRange(x_1);
+x_33 = lean_nat_dec_le(x_32, x_31);
+lean_dec(x_32);
+if (x_33 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_41; 
-x_33 = lean_array_get_size(x_2);
-x_41 = l_Lean_Expr_getAppFn(x_1);
-if (lean_obj_tag(x_41) == 0)
+lean_object* x_34; lean_object* x_35; lean_object* x_42; 
+x_34 = lean_array_get_size(x_2);
+x_42 = l_Lean_Expr_getAppFn(x_1);
+if (lean_obj_tag(x_42) == 0)
 {
-lean_object* x_42; uint8_t x_43; 
-x_42 = lean_ctor_get(x_41, 0);
-lean_inc(x_42);
-lean_dec_ref(x_41);
-x_43 = lean_nat_dec_le(x_30, x_42);
-if (x_43 == 0)
-{
-lean_dec(x_42);
-x_12 = x_1;
-x_13 = x_8;
-goto block_28;
-}
-else
-{
-uint8_t x_44; 
-x_44 = lean_nat_dec_lt(x_42, x_33);
+lean_object* x_43; uint8_t x_44; 
+x_43 = lean_ctor_get(x_42, 0);
+lean_inc(x_43);
+lean_dec_ref(x_42);
+x_44 = lean_nat_dec_le(x_31, x_43);
 if (x_44 == 0)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-lean_dec_ref(x_1);
-x_45 = lean_nat_sub(x_42, x_33);
-lean_dec(x_42);
-x_46 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__1___redArg(x_45, x_8);
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_46, 1);
-lean_inc(x_48);
-lean_dec_ref(x_46);
-x_12 = x_47;
-x_13 = x_48;
-goto block_28;
+lean_dec(x_43);
+x_12 = x_1;
+x_13 = x_8;
+goto block_29;
 }
 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; uint8_t x_56; 
-x_49 = lean_nat_sub(x_33, x_42);
-lean_dec(x_42);
-x_50 = lean_unsigned_to_nat(1u);
-x_51 = lean_nat_sub(x_49, x_50);
-lean_dec(x_49);
-x_52 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__0;
-x_53 = lean_array_get_borrowed(x_52, x_3, x_51);
-x_54 = lean_array_get_size(x_53);
-x_55 = l_Lean_Expr_getAppNumArgs(x_1);
-x_56 = lean_nat_dec_lt(x_54, x_55);
-if (x_56 == 0)
+uint8_t x_45; 
+x_45 = lean_nat_dec_lt(x_43, x_34);
+if (x_45 == 0)
 {
-uint8_t x_57; 
-x_57 = lean_nat_dec_eq(x_55, x_54);
-lean_dec(x_55);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+lean_dec_ref(x_1);
+x_46 = lean_nat_sub(x_43, x_34);
+lean_dec(x_43);
+x_47 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__1___redArg(x_46, x_8);
+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_ref(x_47);
+x_12 = x_48;
+x_13 = x_49;
+goto block_29;
+}
+else
+{
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; uint8_t x_57; 
+x_50 = lean_nat_sub(x_34, x_43);
+lean_dec(x_43);
+x_51 = lean_unsigned_to_nat(1u);
+x_52 = lean_nat_sub(x_50, x_51);
+lean_dec(x_50);
+x_53 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__0;
+x_54 = lean_array_get_borrowed(x_53, x_3, x_52);
+x_55 = lean_array_get_size(x_54);
+x_56 = l_Lean_Expr_getAppNumArgs(x_1);
+x_57 = lean_nat_dec_lt(x_55, x_56);
 if (x_57 == 0)
 {
-lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-lean_dec(x_51);
-x_58 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__3;
-x_59 = l_panic___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__2(x_58, x_29, x_8);
-x_60 = lean_ctor_get(x_59, 0);
-lean_inc(x_60);
-if (lean_obj_tag(x_60) == 1)
+uint8_t x_58; 
+x_58 = lean_nat_dec_eq(x_56, x_55);
+lean_dec(x_56);
+if (x_58 == 0)
 {
-lean_object* x_61; lean_object* x_62; 
-lean_dec_ref(x_1);
-x_61 = lean_ctor_get(x_59, 1);
+lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+lean_dec(x_52);
+x_59 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__3;
+x_60 = l_panic___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__2(x_59, x_30, x_8);
+x_61 = lean_ctor_get(x_60, 0);
 lean_inc(x_61);
-lean_dec_ref(x_59);
-x_62 = lean_ctor_get(x_60, 0);
+if (lean_obj_tag(x_61) == 1)
+{
+lean_object* x_62; lean_object* x_63; 
+lean_dec_ref(x_1);
+x_62 = lean_ctor_get(x_60, 1);
 lean_inc(x_62);
 lean_dec_ref(x_60);
-x_12 = x_62;
-x_13 = x_61;
-goto block_28;
-}
-else
-{
-lean_object* x_63; 
-lean_dec(x_60);
-x_63 = lean_ctor_get(x_59, 1);
+x_63 = lean_ctor_get(x_61, 0);
 lean_inc(x_63);
-lean_dec_ref(x_59);
-x_34 = x_63;
-goto block_40;
-}
+lean_dec_ref(x_61);
+x_12 = x_63;
+x_13 = x_62;
+goto block_29;
 }
 else
 {
 lean_object* x_64; 
-lean_dec_ref(x_1);
-x_64 = lean_array_fget_borrowed(x_2, x_51);
-lean_dec(x_51);
+lean_dec(x_61);
+x_64 = lean_ctor_get(x_60, 1);
 lean_inc(x_64);
-x_12 = x_64;
+lean_dec_ref(x_60);
+x_35 = x_64;
+goto block_41;
+}
+}
+else
+{
+lean_object* x_65; 
+lean_dec_ref(x_1);
+x_65 = lean_array_fget_borrowed(x_2, x_52);
+lean_dec(x_52);
+lean_inc(x_65);
+x_12 = x_65;
 x_13 = x_8;
-goto block_28;
+goto block_29;
 }
 }
 else
 {
-lean_dec(x_55);
-lean_dec(x_51);
-x_34 = x_8;
-goto block_40;
+lean_dec(x_56);
+lean_dec(x_52);
+x_35 = x_8;
+goto block_41;
 }
 }
 }
 }
 else
 {
-lean_dec_ref(x_41);
-x_34 = x_8;
-goto block_40;
+lean_dec_ref(x_42);
+x_35 = x_8;
+goto block_41;
 }
-block_40:
+block_41:
 {
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
 x_12 = x_1;
-x_13 = x_34;
-goto block_28;
+x_13 = x_35;
+goto block_29;
 }
 case 2:
 {
 x_12 = x_1;
-x_13 = x_34;
-goto block_28;
+x_13 = x_35;
+goto block_29;
 }
 case 0:
 {
 x_12 = x_1;
-x_13 = x_34;
-goto block_28;
+x_13 = x_35;
+goto block_29;
 }
 case 1:
 {
 x_12 = x_1;
-x_13 = x_34;
-goto block_28;
+x_13 = x_35;
+goto block_29;
 }
 case 4:
 {
 x_12 = x_1;
-x_13 = x_34;
-goto block_28;
+x_13 = x_35;
+goto block_29;
 }
 case 3:
 {
 x_12 = x_1;
-x_13 = x_34;
-goto block_28;
+x_13 = x_35;
+goto block_29;
 }
 default: 
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_35 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__2;
-x_36 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3(x_33, x_3, x_2, x_1, x_30, x_35, x_29, x_34);
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_36 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__2;
+x_37 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3(x_34, x_3, x_2, x_1, x_31, x_36, x_30, x_35);
+x_38 = lean_ctor_get(x_37, 0);
 lean_inc(x_38);
-lean_dec_ref(x_36);
-x_39 = lean_ctor_get(x_37, 0);
+x_39 = lean_ctor_get(x_37, 1);
 lean_inc(x_39);
-lean_dec(x_37);
-x_12 = x_39;
-x_13 = x_38;
-goto block_28;
+lean_dec_ref(x_37);
+x_40 = lean_ctor_get(x_38, 0);
+lean_inc(x_40);
+lean_dec(x_38);
+x_12 = x_40;
+x_13 = x_39;
+goto block_29;
 }
 }
 }
@@ -4669,9 +4669,9 @@ else
 {
 x_12 = x_1;
 x_13 = x_8;
-goto block_28;
+goto block_29;
 }
-block_28:
+block_29:
 {
 lean_object* x_14; uint8_t x_15; 
 x_14 = lean_st_ref_take(x_4);
@@ -4689,294 +4689,304 @@ return x_18;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_19 = lean_ctor_get(x_14, 1);
 x_20 = lean_ctor_get(x_14, 2);
 x_21 = lean_ctor_get(x_14, 3);
 x_22 = lean_ctor_get(x_14, 4);
 x_23 = lean_ctor_get(x_14, 5);
-x_24 = lean_ctor_get_uint8(x_14, sizeof(void*)*6);
+x_24 = lean_ctor_get(x_14, 6);
+x_25 = lean_ctor_get_uint8(x_14, sizeof(void*)*7);
+lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_dec(x_14);
-x_25 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_25, 0, x_13);
-lean_ctor_set(x_25, 1, x_19);
-lean_ctor_set(x_25, 2, x_20);
-lean_ctor_set(x_25, 3, x_21);
-lean_ctor_set(x_25, 4, x_22);
-lean_ctor_set(x_25, 5, x_23);
-lean_ctor_set_uint8(x_25, sizeof(void*)*6, x_24);
-x_26 = lean_st_ref_set(x_4, x_25);
-x_27 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_27, 0, x_12);
-return x_27;
+x_26 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_26, 0, x_13);
+lean_ctor_set(x_26, 1, x_19);
+lean_ctor_set(x_26, 2, x_20);
+lean_ctor_set(x_26, 3, x_21);
+lean_ctor_set(x_26, 4, x_22);
+lean_ctor_set(x_26, 5, x_23);
+lean_ctor_set(x_26, 6, x_24);
+lean_ctor_set_uint8(x_26, sizeof(void*)*7, x_25);
+x_27 = lean_st_ref_set(x_4, x_26);
+x_28 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_28, 0, x_12);
+return x_28;
 }
 }
 }
 else
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; uint8_t x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; 
-x_65 = lean_ctor_get(x_6, 0);
-x_66 = lean_ctor_get(x_6, 1);
-x_67 = lean_ctor_get(x_6, 2);
-x_68 = lean_ctor_get(x_6, 3);
-x_69 = lean_ctor_get(x_6, 4);
-x_70 = lean_ctor_get(x_6, 5);
-x_71 = lean_ctor_get_uint8(x_6, sizeof(void*)*6);
+lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_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; uint8_t x_93; lean_object* x_94; lean_object* x_95; uint8_t x_96; 
+x_66 = lean_ctor_get(x_6, 0);
+x_67 = lean_ctor_get(x_6, 1);
+x_68 = lean_ctor_get(x_6, 2);
+x_69 = lean_ctor_get(x_6, 3);
+x_70 = lean_ctor_get(x_6, 4);
+x_71 = lean_ctor_get(x_6, 5);
+x_72 = lean_ctor_get(x_6, 6);
+x_73 = lean_ctor_get_uint8(x_6, sizeof(void*)*7);
+lean_inc(x_72);
+lean_inc(x_71);
 lean_inc(x_70);
 lean_inc(x_69);
 lean_inc(x_68);
 lean_inc(x_67);
 lean_inc(x_66);
-lean_inc(x_65);
 lean_dec(x_6);
-x_72 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__0;
-x_73 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_73, 0, x_72);
-lean_ctor_set(x_73, 1, x_66);
-lean_ctor_set(x_73, 2, x_67);
-lean_ctor_set(x_73, 3, x_68);
-lean_ctor_set(x_73, 4, x_69);
-lean_ctor_set(x_73, 5, x_70);
-lean_ctor_set_uint8(x_73, sizeof(void*)*6, x_71);
-x_74 = lean_st_ref_set(x_4, x_73);
-x_75 = lean_st_ref_get(x_4);
-x_90 = lean_ctor_get_uint8(x_75, sizeof(void*)*6);
-lean_dec(x_75);
-x_91 = lean_unsigned_to_nat(0u);
-x_92 = l_Lean_Expr_looseBVarRange(x_1);
-x_93 = lean_nat_dec_le(x_92, x_91);
-lean_dec(x_92);
-if (x_93 == 0)
+x_74 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__0;
+x_75 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_75, 0, x_74);
+lean_ctor_set(x_75, 1, x_67);
+lean_ctor_set(x_75, 2, x_68);
+lean_ctor_set(x_75, 3, x_69);
+lean_ctor_set(x_75, 4, x_70);
+lean_ctor_set(x_75, 5, x_71);
+lean_ctor_set(x_75, 6, x_72);
+lean_ctor_set_uint8(x_75, sizeof(void*)*7, x_73);
+x_76 = lean_st_ref_set(x_4, x_75);
+x_77 = lean_st_ref_get(x_4);
+x_93 = lean_ctor_get_uint8(x_77, sizeof(void*)*7);
+lean_dec(x_77);
+x_94 = lean_unsigned_to_nat(0u);
+x_95 = l_Lean_Expr_looseBVarRange(x_1);
+x_96 = lean_nat_dec_le(x_95, x_94);
+lean_dec(x_95);
+if (x_96 == 0)
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_102; 
-x_94 = lean_array_get_size(x_2);
-x_102 = l_Lean_Expr_getAppFn(x_1);
-if (lean_obj_tag(x_102) == 0)
+lean_object* x_97; lean_object* x_98; lean_object* x_105; 
+x_97 = lean_array_get_size(x_2);
+x_105 = l_Lean_Expr_getAppFn(x_1);
+if (lean_obj_tag(x_105) == 0)
 {
-lean_object* x_103; uint8_t x_104; 
-x_103 = lean_ctor_get(x_102, 0);
-lean_inc(x_103);
-lean_dec_ref(x_102);
-x_104 = lean_nat_dec_le(x_91, x_103);
-if (x_104 == 0)
+lean_object* x_106; uint8_t x_107; 
+x_106 = lean_ctor_get(x_105, 0);
+lean_inc(x_106);
+lean_dec_ref(x_105);
+x_107 = lean_nat_dec_le(x_94, x_106);
+if (x_107 == 0)
 {
-lean_dec(x_103);
-x_76 = x_1;
-x_77 = x_65;
-goto block_89;
+lean_dec(x_106);
+x_78 = x_1;
+x_79 = x_66;
+goto block_92;
 }
 else
 {
-uint8_t x_105; 
-x_105 = lean_nat_dec_lt(x_103, x_94);
-if (x_105 == 0)
+uint8_t x_108; 
+x_108 = lean_nat_dec_lt(x_106, x_97);
+if (x_108 == 0)
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; 
 lean_dec_ref(x_1);
-x_106 = lean_nat_sub(x_103, x_94);
-lean_dec(x_103);
-x_107 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__1___redArg(x_106, x_65);
-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_ref(x_107);
-x_76 = x_108;
-x_77 = x_109;
-goto block_89;
+x_109 = lean_nat_sub(x_106, x_97);
+lean_dec(x_106);
+x_110 = l_Lean_Meta_Sym_Internal_mkBVarS___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__1___redArg(x_109, x_66);
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_110, 1);
+lean_inc(x_112);
+lean_dec_ref(x_110);
+x_78 = x_111;
+x_79 = x_112;
+goto block_92;
 }
 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; uint8_t x_117; 
-x_110 = lean_nat_sub(x_94, x_103);
-lean_dec(x_103);
-x_111 = lean_unsigned_to_nat(1u);
-x_112 = lean_nat_sub(x_110, x_111);
-lean_dec(x_110);
-x_113 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__0;
-x_114 = lean_array_get_borrowed(x_113, x_3, x_112);
-x_115 = lean_array_get_size(x_114);
-x_116 = l_Lean_Expr_getAppNumArgs(x_1);
-x_117 = lean_nat_dec_lt(x_115, x_116);
-if (x_117 == 0)
+lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; uint8_t x_120; 
+x_113 = lean_nat_sub(x_97, x_106);
+lean_dec(x_106);
+x_114 = lean_unsigned_to_nat(1u);
+x_115 = lean_nat_sub(x_113, x_114);
+lean_dec(x_113);
+x_116 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__0;
+x_117 = lean_array_get_borrowed(x_116, x_3, x_115);
+x_118 = lean_array_get_size(x_117);
+x_119 = l_Lean_Expr_getAppNumArgs(x_1);
+x_120 = lean_nat_dec_lt(x_118, x_119);
+if (x_120 == 0)
 {
-uint8_t x_118; 
-x_118 = lean_nat_dec_eq(x_116, x_115);
-lean_dec(x_116);
-if (x_118 == 0)
+uint8_t x_121; 
+x_121 = lean_nat_dec_eq(x_119, x_118);
+lean_dec(x_119);
+if (x_121 == 0)
 {
-lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-lean_dec(x_112);
-x_119 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__3;
-x_120 = l_panic___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__2(x_119, x_90, x_65);
-x_121 = lean_ctor_get(x_120, 0);
-lean_inc(x_121);
-if (lean_obj_tag(x_121) == 1)
-{
-lean_object* x_122; lean_object* x_123; 
-lean_dec_ref(x_1);
-x_122 = lean_ctor_get(x_120, 1);
-lean_inc(x_122);
-lean_dec_ref(x_120);
-x_123 = lean_ctor_get(x_121, 0);
-lean_inc(x_123);
-lean_dec_ref(x_121);
-x_76 = x_123;
-x_77 = x_122;
-goto block_89;
-}
-else
-{
-lean_object* x_124; 
-lean_dec(x_121);
-x_124 = lean_ctor_get(x_120, 1);
+lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+lean_dec(x_115);
+x_122 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visitChild___at___00__private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3_spec__3___closed__3;
+x_123 = l_panic___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__2(x_122, x_93, x_66);
+x_124 = lean_ctor_get(x_123, 0);
 lean_inc(x_124);
-lean_dec_ref(x_120);
-x_95 = x_124;
-goto block_101;
-}
-}
-else
+if (lean_obj_tag(x_124) == 1)
 {
-lean_object* x_125; 
+lean_object* x_125; lean_object* x_126; 
 lean_dec_ref(x_1);
-x_125 = lean_array_fget_borrowed(x_2, x_112);
-lean_dec(x_112);
+x_125 = lean_ctor_get(x_123, 1);
 lean_inc(x_125);
-x_76 = x_125;
-x_77 = x_65;
-goto block_89;
+lean_dec_ref(x_123);
+x_126 = lean_ctor_get(x_124, 0);
+lean_inc(x_126);
+lean_dec_ref(x_124);
+x_78 = x_126;
+x_79 = x_125;
+goto block_92;
+}
+else
+{
+lean_object* x_127; 
+lean_dec(x_124);
+x_127 = lean_ctor_get(x_123, 1);
+lean_inc(x_127);
+lean_dec_ref(x_123);
+x_98 = x_127;
+goto block_104;
 }
 }
 else
 {
-lean_dec(x_116);
-lean_dec(x_112);
-x_95 = x_65;
-goto block_101;
+lean_object* x_128; 
+lean_dec_ref(x_1);
+x_128 = lean_array_fget_borrowed(x_2, x_115);
+lean_dec(x_115);
+lean_inc(x_128);
+x_78 = x_128;
+x_79 = x_66;
+goto block_92;
+}
+}
+else
+{
+lean_dec(x_119);
+lean_dec(x_115);
+x_98 = x_66;
+goto block_104;
 }
 }
 }
 }
 else
 {
-lean_dec_ref(x_102);
-x_95 = x_65;
-goto block_101;
+lean_dec_ref(x_105);
+x_98 = x_66;
+goto block_104;
 }
-block_101:
+block_104:
 {
 switch (lean_obj_tag(x_1)) {
 case 9:
 {
-x_76 = x_1;
-x_77 = x_95;
-goto block_89;
+x_78 = x_1;
+x_79 = x_98;
+goto block_92;
 }
 case 2:
 {
-x_76 = x_1;
-x_77 = x_95;
-goto block_89;
+x_78 = x_1;
+x_79 = x_98;
+goto block_92;
 }
 case 0:
 {
-x_76 = x_1;
-x_77 = x_95;
-goto block_89;
+x_78 = x_1;
+x_79 = x_98;
+goto block_92;
 }
 case 1:
 {
-x_76 = x_1;
-x_77 = x_95;
-goto block_89;
+x_78 = x_1;
+x_79 = x_98;
+goto block_92;
 }
 case 4:
 {
-x_76 = x_1;
-x_77 = x_95;
-goto block_89;
+x_78 = x_1;
+x_79 = x_98;
+goto block_92;
 }
 case 3:
 {
-x_76 = x_1;
-x_77 = x_95;
-goto block_89;
+x_78 = x_1;
+x_79 = x_98;
+goto block_92;
 }
 default: 
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_96 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__2;
-x_97 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3(x_94, x_3, x_2, x_1, x_91, x_96, x_90, x_95);
-x_98 = lean_ctor_get(x_97, 0);
-lean_inc(x_98);
-x_99 = lean_ctor_get(x_97, 1);
-lean_inc(x_99);
-lean_dec_ref(x_97);
-x_100 = lean_ctor_get(x_98, 0);
-lean_inc(x_100);
-lean_dec(x_98);
-x_76 = x_100;
-x_77 = x_99;
-goto block_89;
+lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_99 = l___private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps___redArg___closed__2;
+x_100 = l___private_Lean_Meta_Sym_ReplaceS_0__Lean_Meta_Sym_visit___at___00__private_Lean_Meta_Sym_Simp_Have_0__Lean_Meta_Sym_Simp_elimAuxApps_spec__3(x_97, x_3, x_2, x_1, x_94, x_99, x_93, x_98);
+x_101 = lean_ctor_get(x_100, 0);
+lean_inc(x_101);
+x_102 = lean_ctor_get(x_100, 1);
+lean_inc(x_102);
+lean_dec_ref(x_100);
+x_103 = lean_ctor_get(x_101, 0);
+lean_inc(x_103);
+lean_dec(x_101);
+x_78 = x_103;
+x_79 = x_102;
+goto block_92;
 }
 }
 }
 }
 else
 {
-x_76 = x_1;
-x_77 = x_65;
-goto block_89;
+x_78 = x_1;
+x_79 = x_66;
+goto block_92;
 }
-block_89:
+block_92:
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_78 = lean_st_ref_take(x_4);
-x_79 = lean_ctor_get(x_78, 1);
-lean_inc_ref(x_79);
-x_80 = lean_ctor_get(x_78, 2);
-lean_inc_ref(x_80);
-x_81 = lean_ctor_get(x_78, 3);
+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; uint8_t x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_80 = lean_st_ref_take(x_4);
+x_81 = lean_ctor_get(x_80, 1);
 lean_inc_ref(x_81);
-x_82 = lean_ctor_get(x_78, 4);
+x_82 = lean_ctor_get(x_80, 2);
 lean_inc_ref(x_82);
-x_83 = lean_ctor_get(x_78, 5);
+x_83 = lean_ctor_get(x_80, 3);
 lean_inc_ref(x_83);
-x_84 = lean_ctor_get_uint8(x_78, sizeof(void*)*6);
-if (lean_is_exclusive(x_78)) {
- lean_ctor_release(x_78, 0);
- lean_ctor_release(x_78, 1);
- lean_ctor_release(x_78, 2);
- lean_ctor_release(x_78, 3);
- lean_ctor_release(x_78, 4);
- lean_ctor_release(x_78, 5);
- x_85 = x_78;
+x_84 = lean_ctor_get(x_80, 4);
+lean_inc_ref(x_84);
+x_85 = lean_ctor_get(x_80, 5);
+lean_inc_ref(x_85);
+x_86 = lean_ctor_get(x_80, 6);
+lean_inc_ref(x_86);
+x_87 = lean_ctor_get_uint8(x_80, sizeof(void*)*7);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ lean_ctor_release(x_80, 2);
+ lean_ctor_release(x_80, 3);
+ lean_ctor_release(x_80, 4);
+ lean_ctor_release(x_80, 5);
+ lean_ctor_release(x_80, 6);
+ x_88 = x_80;
 } else {
- lean_dec_ref(x_78);
- x_85 = lean_box(0);
+ lean_dec_ref(x_80);
+ x_88 = lean_box(0);
 }
-if (lean_is_scalar(x_85)) {
- x_86 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_88)) {
+ x_89 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_86 = x_85;
+ x_89 = x_88;
 }
-lean_ctor_set(x_86, 0, x_77);
-lean_ctor_set(x_86, 1, x_79);
-lean_ctor_set(x_86, 2, x_80);
-lean_ctor_set(x_86, 3, x_81);
-lean_ctor_set(x_86, 4, x_82);
-lean_ctor_set(x_86, 5, x_83);
-lean_ctor_set_uint8(x_86, sizeof(void*)*6, x_84);
-x_87 = lean_st_ref_set(x_4, x_86);
-x_88 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_88, 0, x_76);
-return x_88;
+lean_ctor_set(x_89, 0, x_79);
+lean_ctor_set(x_89, 1, x_81);
+lean_ctor_set(x_89, 2, x_82);
+lean_ctor_set(x_89, 3, x_83);
+lean_ctor_set(x_89, 4, x_84);
+lean_ctor_set(x_89, 5, x_85);
+lean_ctor_set(x_89, 6, x_86);
+lean_ctor_set_uint8(x_89, sizeof(void*)*7, x_87);
+x_90 = lean_st_ref_set(x_4, x_89);
+x_91 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_91, 0, x_78);
+return x_91;
 }
 }
 }
@@ -6376,7 +6386,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Sym/Simp/Main.c b/stage0/stdlib/Lean/Meta/Sym/Simp/Main.c
index 4abde91fa4..f392638899 100644
--- a/stage0/stdlib/Lean/Meta/Sym/Simp/Main.c
+++ b/stage0/stdlib/Lean/Meta/Sym/Simp/Main.c
@@ -145,7 +145,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Sym/SymM.c b/stage0/stdlib/Lean/Meta/Sym/SymM.c
index bf1e0c5908..d2c624ad26 100644
--- a/stage0/stdlib/Lean/Meta/Sym/SymM.c
+++ b/stage0/stdlib/Lean/Meta/Sym/SymM.c
@@ -215,6 +215,49 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDebugEnabled___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDebugEnabled___redArg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDebugEnabled(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDebugEnabled___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg(lean_object*, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
+uint64_t l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(lean_object*);
+uint64_t lean_uint64_mix_hash(uint64_t, uint64_t);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at___00Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4_spec__5___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+lean_object* lean_array_push(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4___redArg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
+static lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0;
+lean_object* lean_array_fget(lean_object*, lean_object*);
+lean_object* l_Lean_PersistentHashMap_mkCollisionNode___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+size_t lean_usize_add(size_t, size_t);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg(size_t, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t lean_usize_dec_le(size_t, size_t);
+lean_object* l_Lean_PersistentHashMap_getCollisionNodeSize___redArg(lean_object*);
+size_t lean_usize_mul(size_t, size_t);
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1___redArg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_isDefEqI(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI___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_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0(lean_object*, lean_object*, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5(lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at___00Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4_spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Option_register___at___00Lean_Meta_Sym_initFn_00___x40_Lean_Meta_Sym_SymM_3481378630____hygCtx___hyg_4__spec__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -827,14 +870,15 @@ x_11 = lean_ctor_get(x_4, 2);
 x_12 = l_Lean_Meta_Sym_sym_debug;
 x_13 = l_Lean_Option_get___at___00Lean_Meta_Sym_SymM_run_spec__1(x_11, x_12);
 x_14 = l_Lean_Meta_Sym_SymM_run___redArg___closed__2;
-x_15 = lean_alloc_ctor(0, 6, 1);
+x_15 = lean_alloc_ctor(0, 7, 1);
 lean_ctor_set(x_15, 0, x_10);
 lean_ctor_set(x_15, 1, x_14);
 lean_ctor_set(x_15, 2, x_14);
 lean_ctor_set(x_15, 3, x_14);
 lean_ctor_set(x_15, 4, x_14);
 lean_ctor_set(x_15, 5, x_14);
-lean_ctor_set_uint8(x_15, sizeof(void*)*6, x_13);
+lean_ctor_set(x_15, 6, x_14);
+lean_ctor_set_uint8(x_15, sizeof(void*)*7, x_13);
 x_16 = lean_st_mk_ref(x_15);
 lean_inc(x_16);
 x_17 = lean_apply_7(x_1, x_9, x_16, x_2, x_3, x_4, x_5, lean_box(0));
@@ -1806,49 +1850,49 @@ x_4 = lean_st_ref_take(x_2);
 x_5 = !lean_is_exclusive(x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_26; 
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_27; 
 x_6 = lean_ctor_get(x_4, 0);
 x_7 = l_Lean_Meta_Sym_SymM_run___redArg___closed__0;
 lean_ctor_set(x_4, 0, x_7);
 x_8 = lean_st_ref_set(x_2, x_4);
 lean_inc_ref(x_1);
 lean_inc_ref(x_6);
-x_26 = l_Lean_PersistentHashMap_findEntry_x3f___at___00Lean_Meta_Sym_shareCommon_spec__0___redArg(x_6, x_1);
-if (lean_obj_tag(x_26) == 0)
+x_27 = l_Lean_PersistentHashMap_findEntry_x3f___at___00Lean_Meta_Sym_shareCommon_spec__0___redArg(x_6, x_1);
+if (lean_obj_tag(x_27) == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_27 = l_Lean_Meta_Sym_shareCommon___redArg___closed__1;
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_27);
-lean_ctor_set(x_28, 1, x_6);
-x_29 = l___private_Lean_Meta_Sym_AlphaShareCommon_0__Lean_Meta_Sym_go(x_1, x_28);
-x_30 = lean_ctor_get(x_29, 1);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 0);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_28 = l_Lean_Meta_Sym_shareCommon___redArg___closed__1;
+x_29 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_6);
+x_30 = l___private_Lean_Meta_Sym_AlphaShareCommon_0__Lean_Meta_Sym_go(x_1, x_29);
+x_31 = lean_ctor_get(x_30, 1);
 lean_inc(x_31);
-lean_dec_ref(x_29);
-x_32 = lean_ctor_get(x_30, 1);
-lean_inc_ref(x_32);
-lean_dec(x_30);
-x_9 = x_31;
-x_10 = x_32;
-goto block_25;
+x_32 = lean_ctor_get(x_30, 0);
+lean_inc(x_32);
+lean_dec_ref(x_30);
+x_33 = lean_ctor_get(x_31, 1);
+lean_inc_ref(x_33);
+lean_dec(x_31);
+x_9 = x_32;
+x_10 = x_33;
+goto block_26;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; 
+lean_object* x_34; lean_object* x_35; 
 lean_dec_ref(x_1);
-x_33 = lean_ctor_get(x_26, 0);
-lean_inc(x_33);
-lean_dec_ref(x_26);
-x_34 = lean_ctor_get(x_33, 0);
+x_34 = lean_ctor_get(x_27, 0);
 lean_inc(x_34);
-lean_dec(x_33);
-x_9 = x_34;
+lean_dec_ref(x_27);
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+lean_dec(x_34);
+x_9 = x_35;
 x_10 = x_6;
-goto block_25;
+goto block_26;
 }
-block_25:
+block_26:
 {
 lean_object* x_11; uint8_t x_12; 
 x_11 = lean_st_ref_take(x_2);
@@ -1866,141 +1910,151 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
 x_16 = lean_ctor_get(x_11, 1);
 x_17 = lean_ctor_get(x_11, 2);
 x_18 = lean_ctor_get(x_11, 3);
 x_19 = lean_ctor_get(x_11, 4);
 x_20 = lean_ctor_get(x_11, 5);
-x_21 = lean_ctor_get_uint8(x_11, sizeof(void*)*6);
+x_21 = lean_ctor_get(x_11, 6);
+x_22 = lean_ctor_get_uint8(x_11, sizeof(void*)*7);
+lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
 lean_dec(x_11);
-x_22 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_22, 0, x_10);
-lean_ctor_set(x_22, 1, x_16);
-lean_ctor_set(x_22, 2, x_17);
-lean_ctor_set(x_22, 3, x_18);
-lean_ctor_set(x_22, 4, x_19);
-lean_ctor_set(x_22, 5, x_20);
-lean_ctor_set_uint8(x_22, sizeof(void*)*6, x_21);
-x_23 = lean_st_ref_set(x_2, x_22);
-x_24 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_24, 0, x_9);
-return x_24;
+x_23 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_23, 0, x_10);
+lean_ctor_set(x_23, 1, x_16);
+lean_ctor_set(x_23, 2, x_17);
+lean_ctor_set(x_23, 3, x_18);
+lean_ctor_set(x_23, 4, x_19);
+lean_ctor_set(x_23, 5, x_20);
+lean_ctor_set(x_23, 6, x_21);
+lean_ctor_set_uint8(x_23, sizeof(void*)*7, x_22);
+x_24 = lean_st_ref_set(x_2, x_23);
+x_25 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_25, 0, x_9);
+return x_25;
 }
 }
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t 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_59; 
-x_35 = lean_ctor_get(x_4, 0);
-x_36 = lean_ctor_get(x_4, 1);
-x_37 = lean_ctor_get(x_4, 2);
-x_38 = lean_ctor_get(x_4, 3);
-x_39 = lean_ctor_get(x_4, 4);
-x_40 = lean_ctor_get(x_4, 5);
-x_41 = lean_ctor_get_uint8(x_4, sizeof(void*)*6);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_62; 
+x_36 = lean_ctor_get(x_4, 0);
+x_37 = lean_ctor_get(x_4, 1);
+x_38 = lean_ctor_get(x_4, 2);
+x_39 = lean_ctor_get(x_4, 3);
+x_40 = lean_ctor_get(x_4, 4);
+x_41 = lean_ctor_get(x_4, 5);
+x_42 = lean_ctor_get(x_4, 6);
+x_43 = lean_ctor_get_uint8(x_4, sizeof(void*)*7);
+lean_inc(x_42);
+lean_inc(x_41);
 lean_inc(x_40);
 lean_inc(x_39);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
-lean_inc(x_35);
 lean_dec(x_4);
-x_42 = l_Lean_Meta_Sym_SymM_run___redArg___closed__0;
-x_43 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_43, 0, x_42);
-lean_ctor_set(x_43, 1, x_36);
-lean_ctor_set(x_43, 2, x_37);
-lean_ctor_set(x_43, 3, x_38);
-lean_ctor_set(x_43, 4, x_39);
-lean_ctor_set(x_43, 5, x_40);
-lean_ctor_set_uint8(x_43, sizeof(void*)*6, x_41);
-x_44 = lean_st_ref_set(x_2, x_43);
+x_44 = l_Lean_Meta_Sym_SymM_run___redArg___closed__0;
+x_45 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_37);
+lean_ctor_set(x_45, 2, x_38);
+lean_ctor_set(x_45, 3, x_39);
+lean_ctor_set(x_45, 4, x_40);
+lean_ctor_set(x_45, 5, x_41);
+lean_ctor_set(x_45, 6, x_42);
+lean_ctor_set_uint8(x_45, sizeof(void*)*7, x_43);
+x_46 = lean_st_ref_set(x_2, x_45);
 lean_inc_ref(x_1);
-lean_inc_ref(x_35);
-x_59 = l_Lean_PersistentHashMap_findEntry_x3f___at___00Lean_Meta_Sym_shareCommon_spec__0___redArg(x_35, x_1);
-if (lean_obj_tag(x_59) == 0)
+lean_inc_ref(x_36);
+x_62 = l_Lean_PersistentHashMap_findEntry_x3f___at___00Lean_Meta_Sym_shareCommon_spec__0___redArg(x_36, x_1);
+if (lean_obj_tag(x_62) == 0)
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_60 = l_Lean_Meta_Sym_shareCommon___redArg___closed__1;
-x_61 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_61, 0, x_60);
-lean_ctor_set(x_61, 1, x_35);
-x_62 = l___private_Lean_Meta_Sym_AlphaShareCommon_0__Lean_Meta_Sym_go(x_1, x_61);
-x_63 = lean_ctor_get(x_62, 1);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_62, 0);
-lean_inc(x_64);
-lean_dec_ref(x_62);
-x_65 = lean_ctor_get(x_63, 1);
-lean_inc_ref(x_65);
-lean_dec(x_63);
-x_45 = x_64;
-x_46 = x_65;
-goto block_58;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_63 = l_Lean_Meta_Sym_shareCommon___redArg___closed__1;
+x_64 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_36);
+x_65 = l___private_Lean_Meta_Sym_AlphaShareCommon_0__Lean_Meta_Sym_go(x_1, x_64);
+x_66 = lean_ctor_get(x_65, 1);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_65, 0);
+lean_inc(x_67);
+lean_dec_ref(x_65);
+x_68 = lean_ctor_get(x_66, 1);
+lean_inc_ref(x_68);
+lean_dec(x_66);
+x_47 = x_67;
+x_48 = x_68;
+goto block_61;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; 
+lean_object* x_69; lean_object* x_70; 
 lean_dec_ref(x_1);
-x_66 = lean_ctor_get(x_59, 0);
-lean_inc(x_66);
-lean_dec_ref(x_59);
-x_67 = lean_ctor_get(x_66, 0);
-lean_inc(x_67);
-lean_dec(x_66);
-x_45 = x_67;
-x_46 = x_35;
-goto block_58;
+x_69 = lean_ctor_get(x_62, 0);
+lean_inc(x_69);
+lean_dec_ref(x_62);
+x_70 = lean_ctor_get(x_69, 0);
+lean_inc(x_70);
+lean_dec(x_69);
+x_47 = x_70;
+x_48 = x_36;
+goto block_61;
 }
-block_58:
+block_61:
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_47 = lean_st_ref_take(x_2);
-x_48 = lean_ctor_get(x_47, 1);
-lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_47, 2);
-lean_inc_ref(x_49);
-x_50 = lean_ctor_get(x_47, 3);
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_49 = lean_st_ref_take(x_2);
+x_50 = lean_ctor_get(x_49, 1);
 lean_inc_ref(x_50);
-x_51 = lean_ctor_get(x_47, 4);
+x_51 = lean_ctor_get(x_49, 2);
 lean_inc_ref(x_51);
-x_52 = lean_ctor_get(x_47, 5);
+x_52 = lean_ctor_get(x_49, 3);
 lean_inc_ref(x_52);
-x_53 = lean_ctor_get_uint8(x_47, sizeof(void*)*6);
-if (lean_is_exclusive(x_47)) {
- lean_ctor_release(x_47, 0);
- lean_ctor_release(x_47, 1);
- lean_ctor_release(x_47, 2);
- lean_ctor_release(x_47, 3);
- lean_ctor_release(x_47, 4);
- lean_ctor_release(x_47, 5);
- x_54 = x_47;
+x_53 = lean_ctor_get(x_49, 4);
+lean_inc_ref(x_53);
+x_54 = lean_ctor_get(x_49, 5);
+lean_inc_ref(x_54);
+x_55 = lean_ctor_get(x_49, 6);
+lean_inc_ref(x_55);
+x_56 = lean_ctor_get_uint8(x_49, sizeof(void*)*7);
+if (lean_is_exclusive(x_49)) {
+ lean_ctor_release(x_49, 0);
+ lean_ctor_release(x_49, 1);
+ lean_ctor_release(x_49, 2);
+ lean_ctor_release(x_49, 3);
+ lean_ctor_release(x_49, 4);
+ lean_ctor_release(x_49, 5);
+ lean_ctor_release(x_49, 6);
+ x_57 = x_49;
 } else {
- lean_dec_ref(x_47);
- x_54 = lean_box(0);
+ lean_dec_ref(x_49);
+ x_57 = lean_box(0);
 }
-if (lean_is_scalar(x_54)) {
- x_55 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_57)) {
+ x_58 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_55 = x_54;
+ x_58 = x_57;
 }
-lean_ctor_set(x_55, 0, x_46);
-lean_ctor_set(x_55, 1, x_48);
-lean_ctor_set(x_55, 2, x_49);
-lean_ctor_set(x_55, 3, x_50);
-lean_ctor_set(x_55, 4, x_51);
-lean_ctor_set(x_55, 5, x_52);
-lean_ctor_set_uint8(x_55, sizeof(void*)*6, x_53);
-x_56 = lean_st_ref_set(x_2, x_55);
-x_57 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_57, 0, x_45);
-return x_57;
+lean_ctor_set(x_58, 0, x_48);
+lean_ctor_set(x_58, 1, x_50);
+lean_ctor_set(x_58, 2, x_51);
+lean_ctor_set(x_58, 3, x_52);
+lean_ctor_set(x_58, 4, x_53);
+lean_ctor_set(x_58, 5, x_54);
+lean_ctor_set(x_58, 6, x_55);
+lean_ctor_set_uint8(x_58, sizeof(void*)*7, x_56);
+x_59 = lean_st_ref_set(x_2, x_58);
+x_60 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_60, 0, x_47);
+return x_60;
 }
 }
 }
@@ -2114,106 +2168,116 @@ return x_16;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
 x_17 = lean_ctor_get(x_12, 1);
 x_18 = lean_ctor_get(x_12, 2);
 x_19 = lean_ctor_get(x_12, 3);
 x_20 = lean_ctor_get(x_12, 4);
 x_21 = lean_ctor_get(x_12, 5);
-x_22 = lean_ctor_get_uint8(x_12, sizeof(void*)*6);
+x_22 = lean_ctor_get(x_12, 6);
+x_23 = lean_ctor_get_uint8(x_12, sizeof(void*)*7);
+lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_dec(x_12);
-x_23 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_23, 0, x_11);
-lean_ctor_set(x_23, 1, x_17);
-lean_ctor_set(x_23, 2, x_18);
-lean_ctor_set(x_23, 3, x_19);
-lean_ctor_set(x_23, 4, x_20);
-lean_ctor_set(x_23, 5, x_21);
-lean_ctor_set_uint8(x_23, sizeof(void*)*6, x_22);
-x_24 = lean_st_ref_set(x_2, x_23);
-x_25 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_25, 0, x_10);
-return x_25;
+x_24 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_24, 0, x_11);
+lean_ctor_set(x_24, 1, x_17);
+lean_ctor_set(x_24, 2, x_18);
+lean_ctor_set(x_24, 3, x_19);
+lean_ctor_set(x_24, 4, x_20);
+lean_ctor_set(x_24, 5, x_21);
+lean_ctor_set(x_24, 6, x_22);
+lean_ctor_set_uint8(x_24, sizeof(void*)*7, x_23);
+x_25 = lean_st_ref_set(x_2, x_24);
+x_26 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_26, 0, x_10);
+return x_26;
 }
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 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; uint8_t x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_26 = lean_ctor_get(x_4, 0);
-x_27 = lean_ctor_get(x_4, 1);
-x_28 = lean_ctor_get(x_4, 2);
-x_29 = lean_ctor_get(x_4, 3);
-x_30 = lean_ctor_get(x_4, 4);
-x_31 = lean_ctor_get(x_4, 5);
-x_32 = lean_ctor_get_uint8(x_4, sizeof(void*)*6);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_27 = lean_ctor_get(x_4, 0);
+x_28 = lean_ctor_get(x_4, 1);
+x_29 = lean_ctor_get(x_4, 2);
+x_30 = lean_ctor_get(x_4, 3);
+x_31 = lean_ctor_get(x_4, 4);
+x_32 = lean_ctor_get(x_4, 5);
+x_33 = lean_ctor_get(x_4, 6);
+x_34 = lean_ctor_get_uint8(x_4, sizeof(void*)*7);
+lean_inc(x_33);
+lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
-lean_inc(x_26);
 lean_dec(x_4);
-x_33 = l_Lean_Meta_Sym_SymM_run___redArg___closed__0;
-x_34 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_27);
-lean_ctor_set(x_34, 2, x_28);
-lean_ctor_set(x_34, 3, x_29);
-lean_ctor_set(x_34, 4, x_30);
-lean_ctor_set(x_34, 5, x_31);
-lean_ctor_set_uint8(x_34, sizeof(void*)*6, x_32);
-x_35 = lean_st_ref_set(x_2, x_34);
-x_36 = l___private_Lean_Meta_Sym_AlphaShareCommon_0__Lean_Meta_Sym_shareCommonAlphaInc_go(x_1, x_26);
-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_ref(x_36);
-x_39 = lean_st_ref_take(x_2);
-x_40 = lean_ctor_get(x_39, 1);
-lean_inc_ref(x_40);
-x_41 = lean_ctor_get(x_39, 2);
-lean_inc_ref(x_41);
-x_42 = lean_ctor_get(x_39, 3);
+x_35 = l_Lean_Meta_Sym_SymM_run___redArg___closed__0;
+x_36 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_28);
+lean_ctor_set(x_36, 2, x_29);
+lean_ctor_set(x_36, 3, x_30);
+lean_ctor_set(x_36, 4, x_31);
+lean_ctor_set(x_36, 5, x_32);
+lean_ctor_set(x_36, 6, x_33);
+lean_ctor_set_uint8(x_36, sizeof(void*)*7, x_34);
+x_37 = lean_st_ref_set(x_2, x_36);
+x_38 = l___private_Lean_Meta_Sym_AlphaShareCommon_0__Lean_Meta_Sym_shareCommonAlphaInc_go(x_1, x_27);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_38, 1);
+lean_inc(x_40);
+lean_dec_ref(x_38);
+x_41 = lean_st_ref_take(x_2);
+x_42 = lean_ctor_get(x_41, 1);
 lean_inc_ref(x_42);
-x_43 = lean_ctor_get(x_39, 4);
+x_43 = lean_ctor_get(x_41, 2);
 lean_inc_ref(x_43);
-x_44 = lean_ctor_get(x_39, 5);
+x_44 = lean_ctor_get(x_41, 3);
 lean_inc_ref(x_44);
-x_45 = lean_ctor_get_uint8(x_39, sizeof(void*)*6);
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- lean_ctor_release(x_39, 2);
- lean_ctor_release(x_39, 3);
- lean_ctor_release(x_39, 4);
- lean_ctor_release(x_39, 5);
- x_46 = x_39;
+x_45 = lean_ctor_get(x_41, 4);
+lean_inc_ref(x_45);
+x_46 = lean_ctor_get(x_41, 5);
+lean_inc_ref(x_46);
+x_47 = lean_ctor_get(x_41, 6);
+lean_inc_ref(x_47);
+x_48 = lean_ctor_get_uint8(x_41, sizeof(void*)*7);
+if (lean_is_exclusive(x_41)) {
+ lean_ctor_release(x_41, 0);
+ lean_ctor_release(x_41, 1);
+ lean_ctor_release(x_41, 2);
+ lean_ctor_release(x_41, 3);
+ lean_ctor_release(x_41, 4);
+ lean_ctor_release(x_41, 5);
+ lean_ctor_release(x_41, 6);
+ x_49 = x_41;
 } else {
- lean_dec_ref(x_39);
- x_46 = lean_box(0);
+ lean_dec_ref(x_41);
+ x_49 = lean_box(0);
 }
-if (lean_is_scalar(x_46)) {
- x_47 = lean_alloc_ctor(0, 6, 1);
+if (lean_is_scalar(x_49)) {
+ x_50 = lean_alloc_ctor(0, 7, 1);
 } else {
- x_47 = x_46;
+ x_50 = x_49;
 }
-lean_ctor_set(x_47, 0, x_38);
-lean_ctor_set(x_47, 1, x_40);
-lean_ctor_set(x_47, 2, x_41);
-lean_ctor_set(x_47, 3, x_42);
-lean_ctor_set(x_47, 4, x_43);
-lean_ctor_set(x_47, 5, x_44);
-lean_ctor_set_uint8(x_47, sizeof(void*)*6, x_45);
-x_48 = lean_st_ref_set(x_2, x_47);
-x_49 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_49, 0, x_37);
-return x_49;
+lean_ctor_set(x_50, 0, x_40);
+lean_ctor_set(x_50, 1, x_42);
+lean_ctor_set(x_50, 2, x_43);
+lean_ctor_set(x_50, 3, x_44);
+lean_ctor_set(x_50, 4, x_45);
+lean_ctor_set(x_50, 5, x_46);
+lean_ctor_set(x_50, 6, x_47);
+lean_ctor_set_uint8(x_50, sizeof(void*)*7, x_48);
+x_51 = lean_st_ref_set(x_2, x_50);
+x_52 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_52, 0, x_39);
+return x_52;
 }
 }
 }
@@ -2292,7 +2356,7 @@ _start:
 {
 lean_object* x_3; uint8_t x_4; lean_object* x_5; lean_object* x_6; 
 x_3 = lean_st_ref_get(x_1);
-x_4 = lean_ctor_get_uint8(x_3, sizeof(void*)*6);
+x_4 = lean_ctor_get_uint8(x_3, sizeof(void*)*7);
 lean_dec(x_3);
 x_5 = lean_box(x_4);
 x_6 = lean_alloc_ctor(0, 1, 0);
@@ -2314,7 +2378,7 @@ _start:
 {
 lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; 
 x_8 = lean_st_ref_get(x_2);
-x_9 = lean_ctor_get_uint8(x_8, sizeof(void*)*6);
+x_9 = lean_ctor_get_uint8(x_8, sizeof(void*)*7);
 lean_dec(x_8);
 x_10 = lean_box(x_9);
 x_11 = lean_alloc_ctor(0, 1, 0);
@@ -2336,6 +2400,975 @@ lean_dec_ref(x_1);
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_12; uint8_t x_13; 
+x_12 = lean_array_get_size(x_1);
+x_13 = lean_nat_dec_lt(x_3, x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_3);
+x_14 = lean_box(0);
+return x_14;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_15 = lean_ctor_get(x_4, 0);
+x_16 = lean_ctor_get(x_4, 1);
+x_17 = lean_array_fget_borrowed(x_1, x_3);
+x_18 = lean_ctor_get(x_17, 0);
+x_19 = lean_ctor_get(x_17, 1);
+x_20 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_15, x_18);
+if (x_20 == 0)
+{
+x_5 = x_20;
+goto block_11;
+}
+else
+{
+uint8_t x_21; 
+x_21 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_16, x_19);
+x_5 = x_21;
+goto block_11;
+}
+}
+block_11:
+{
+if (x_5 == 0)
+{
+lean_object* x_6; lean_object* x_7; 
+x_6 = lean_unsigned_to_nat(1u);
+x_7 = lean_nat_add(x_3, x_6);
+lean_dec(x_3);
+x_3 = x_7;
+goto _start;
+}
+else
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_array_fget_borrowed(x_2, x_3);
+lean_dec(x_3);
+lean_inc(x_9);
+x_10 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_10, 0, x_9);
+return x_10;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg(x_1, x_2, x_3, x_4);
+lean_dec_ref(x_4);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg(lean_object* x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; 
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc_ref(x_4);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_5 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_5 = lean_box(0);
+}
+x_6 = lean_box(2);
+x_7 = 5;
+x_8 = l_Lean_PersistentHashMap_findEntryAux___at___00Lean_PersistentHashMap_findEntry_x3f___at___00Lean_Meta_Sym_shareCommon_spec__0_spec__0___redArg___closed__1;
+x_9 = lean_usize_land(x_2, x_8);
+x_10 = lean_usize_to_nat(x_9);
+x_11 = lean_array_get(x_6, x_4, x_10);
+lean_dec(x_10);
+lean_dec_ref(x_4);
+switch (lean_obj_tag(x_11)) {
+case 0:
+{
+lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get(x_11, 1);
+lean_inc(x_13);
+lean_dec_ref(x_11);
+x_18 = lean_ctor_get(x_3, 0);
+x_19 = lean_ctor_get(x_3, 1);
+x_20 = lean_ctor_get(x_12, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_12, 1);
+lean_inc(x_21);
+lean_dec(x_12);
+x_22 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_18, x_20);
+lean_dec(x_20);
+if (x_22 == 0)
+{
+lean_dec(x_21);
+x_14 = x_22;
+goto block_17;
+}
+else
+{
+uint8_t x_23; 
+x_23 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_19, x_21);
+lean_dec(x_21);
+x_14 = x_23;
+goto block_17;
+}
+block_17:
+{
+if (x_14 == 0)
+{
+lean_object* x_15; 
+lean_dec(x_13);
+lean_dec(x_5);
+x_15 = lean_box(0);
+return x_15;
+}
+else
+{
+lean_object* x_16; 
+if (lean_is_scalar(x_5)) {
+ x_16 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_16 = x_5;
+ lean_ctor_set_tag(x_16, 1);
+}
+lean_ctor_set(x_16, 0, x_13);
+return x_16;
+}
+}
+}
+case 1:
+{
+lean_object* x_24; size_t x_25; 
+lean_dec(x_5);
+x_24 = lean_ctor_get(x_11, 0);
+lean_inc(x_24);
+lean_dec_ref(x_11);
+x_25 = lean_usize_shift_right(x_2, x_7);
+x_1 = x_24;
+x_2 = x_25;
+goto _start;
+}
+default: 
+{
+lean_object* x_27; 
+lean_dec(x_5);
+x_27 = lean_box(0);
+return x_27;
+}
+}
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_28 = lean_ctor_get(x_1, 0);
+lean_inc_ref(x_28);
+x_29 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_29);
+lean_dec_ref(x_1);
+x_30 = lean_unsigned_to_nat(0u);
+x_31 = l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg(x_28, x_29, x_30, x_3);
+lean_dec_ref(x_29);
+lean_dec_ref(x_28);
+return x_31;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; lean_object* x_5; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg(x_1, x_4, x_3);
+lean_dec_ref(x_3);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; uint64_t x_5; uint64_t x_6; uint64_t x_7; size_t x_8; lean_object* x_9; 
+x_3 = lean_ctor_get(x_2, 0);
+x_4 = lean_ctor_get(x_2, 1);
+x_5 = l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(x_3);
+x_6 = l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(x_4);
+x_7 = lean_uint64_mix_hash(x_5, x_6);
+x_8 = lean_uint64_to_usize(x_7);
+x_9 = l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg(x_1, x_8, x_2);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg(x_1, x_2);
+lean_dec_ref(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at___00Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4_spec__5___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; lean_object* x_17; uint8_t x_18; 
+x_5 = lean_ctor_get(x_1, 0);
+lean_inc_ref(x_5);
+x_6 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_6);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ lean_ctor_release(x_1, 1);
+ x_7 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_7 = lean_box(0);
+}
+x_17 = lean_array_get_size(x_5);
+x_18 = lean_nat_dec_lt(x_2, x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+lean_dec(x_7);
+lean_dec(x_2);
+x_19 = lean_array_push(x_5, x_3);
+x_20 = lean_array_push(x_6, x_4);
+x_21 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+return x_21;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; 
+x_22 = lean_ctor_get(x_3, 0);
+x_23 = lean_ctor_get(x_3, 1);
+x_24 = lean_array_fget_borrowed(x_5, x_2);
+x_25 = lean_ctor_get(x_24, 0);
+x_26 = lean_ctor_get(x_24, 1);
+x_27 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_22, x_25);
+if (x_27 == 0)
+{
+x_8 = x_27;
+goto block_16;
+}
+else
+{
+uint8_t x_28; 
+x_28 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_23, x_26);
+x_8 = x_28;
+goto block_16;
+}
+}
+block_16:
+{
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+if (lean_is_scalar(x_7)) {
+ x_9 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_9 = x_7;
+}
+lean_ctor_set(x_9, 0, x_5);
+lean_ctor_set(x_9, 1, x_6);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_2, x_10);
+lean_dec(x_2);
+x_1 = x_9;
+x_2 = x_11;
+goto _start;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_array_fset(x_5, x_2, x_3);
+x_14 = lean_array_fset(x_6, x_2, x_4);
+lean_dec(x_2);
+if (lean_is_scalar(x_7)) {
+ x_15 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_15 = x_7;
+}
+lean_ctor_set(x_15, 0, x_13);
+lean_ctor_set(x_15, 1, x_14);
+return x_15;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at___00Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4_spec__5___redArg(x_1, x_4, x_2, x_3);
+return x_5;
+}
+}
+static lean_object* _init_l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_PersistentHashMap_mkEmptyEntries(lean_box(0), lean_box(0));
+return x_1;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_6; size_t x_7; size_t x_8; size_t x_9; size_t x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_6 = lean_ctor_get(x_1, 0);
+x_7 = 5;
+x_8 = 1;
+x_9 = l_Lean_PersistentHashMap_findEntryAux___at___00Lean_PersistentHashMap_findEntry_x3f___at___00Lean_Meta_Sym_shareCommon_spec__0_spec__0___redArg___closed__1;
+x_10 = lean_usize_land(x_2, x_9);
+x_11 = lean_usize_to_nat(x_10);
+x_12 = lean_array_get_size(x_6);
+x_13 = lean_nat_dec_lt(x_11, x_12);
+if (x_13 == 0)
+{
+lean_dec(x_11);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+return x_1;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_inc_ref(x_6);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_14 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_14 = lean_box(0);
+}
+x_15 = lean_array_fget(x_6, x_11);
+x_16 = lean_box(0);
+x_17 = lean_array_fset(x_6, x_11, x_16);
+switch (lean_obj_tag(x_15)) {
+case 0:
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_22 = lean_ctor_get(x_15, 0);
+lean_inc(x_22);
+x_23 = lean_ctor_get(x_15, 1);
+lean_inc(x_23);
+if (lean_is_exclusive(x_15)) {
+ lean_ctor_release(x_15, 0);
+ lean_ctor_release(x_15, 1);
+ x_24 = x_15;
+} else {
+ lean_dec_ref(x_15);
+ x_24 = lean_box(0);
+}
+x_30 = lean_ctor_get(x_4, 0);
+x_31 = lean_ctor_get(x_4, 1);
+x_32 = lean_ctor_get(x_22, 0);
+x_33 = lean_ctor_get(x_22, 1);
+x_34 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_30, x_32);
+if (x_34 == 0)
+{
+x_25 = x_34;
+goto block_29;
+}
+else
+{
+uint8_t x_35; 
+x_35 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_31, x_33);
+x_25 = x_35;
+goto block_29;
+}
+block_29:
+{
+if (x_25 == 0)
+{
+lean_object* x_26; lean_object* x_27; 
+lean_dec(x_24);
+x_26 = l_Lean_PersistentHashMap_mkCollisionNode___redArg(x_22, x_23, x_4, x_5);
+x_27 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_27, 0, x_26);
+x_18 = x_27;
+goto block_21;
+}
+else
+{
+lean_object* x_28; 
+lean_dec(x_23);
+lean_dec(x_22);
+if (lean_is_scalar(x_24)) {
+ x_28 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_28 = x_24;
+}
+lean_ctor_set(x_28, 0, x_4);
+lean_ctor_set(x_28, 1, x_5);
+x_18 = x_28;
+goto block_21;
+}
+}
+}
+case 1:
+{
+uint8_t x_36; 
+x_36 = !lean_is_exclusive(x_15);
+if (x_36 == 0)
+{
+lean_object* x_37; size_t x_38; size_t x_39; lean_object* x_40; 
+x_37 = lean_ctor_get(x_15, 0);
+x_38 = lean_usize_shift_right(x_2, x_7);
+x_39 = lean_usize_add(x_3, x_8);
+x_40 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(x_37, x_38, x_39, x_4, x_5);
+lean_ctor_set(x_15, 0, x_40);
+x_18 = x_15;
+goto block_21;
+}
+else
+{
+lean_object* x_41; size_t x_42; size_t x_43; lean_object* x_44; lean_object* x_45; 
+x_41 = lean_ctor_get(x_15, 0);
+lean_inc(x_41);
+lean_dec(x_15);
+x_42 = lean_usize_shift_right(x_2, x_7);
+x_43 = lean_usize_add(x_3, x_8);
+x_44 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(x_41, x_42, x_43, x_4, x_5);
+x_45 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_45, 0, x_44);
+x_18 = x_45;
+goto block_21;
+}
+}
+default: 
+{
+lean_object* x_46; 
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_4);
+lean_ctor_set(x_46, 1, x_5);
+x_18 = x_46;
+goto block_21;
+}
+}
+block_21:
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_array_fset(x_17, x_11, x_18);
+lean_dec(x_11);
+if (lean_is_scalar(x_14)) {
+ x_20 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_20 = x_14;
+}
+lean_ctor_set(x_20, 0, x_19);
+return x_20;
+}
+}
+}
+else
+{
+uint8_t x_47; 
+x_47 = !lean_is_exclusive(x_1);
+if (x_47 == 0)
+{
+lean_object* x_48; uint8_t x_49; size_t x_56; uint8_t x_57; 
+x_48 = l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4___redArg(x_1, x_4, x_5);
+x_56 = 7;
+x_57 = lean_usize_dec_le(x_56, x_3);
+if (x_57 == 0)
+{
+lean_object* x_58; lean_object* x_59; uint8_t x_60; 
+x_58 = l_Lean_PersistentHashMap_getCollisionNodeSize___redArg(x_48);
+x_59 = lean_unsigned_to_nat(4u);
+x_60 = lean_nat_dec_lt(x_58, x_59);
+lean_dec(x_58);
+x_49 = x_60;
+goto block_55;
+}
+else
+{
+x_49 = x_57;
+goto block_55;
+}
+block_55:
+{
+if (x_49 == 0)
+{
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_50 = lean_ctor_get(x_48, 0);
+lean_inc_ref(x_50);
+x_51 = lean_ctor_get(x_48, 1);
+lean_inc_ref(x_51);
+lean_dec_ref(x_48);
+x_52 = lean_unsigned_to_nat(0u);
+x_53 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0;
+x_54 = l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg(x_3, x_50, x_51, x_52, x_53);
+lean_dec_ref(x_51);
+lean_dec_ref(x_50);
+return x_54;
+}
+else
+{
+return x_48;
+}
+}
+}
+else
+{
+lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; uint8_t x_65; size_t x_72; uint8_t x_73; 
+x_61 = lean_ctor_get(x_1, 0);
+x_62 = lean_ctor_get(x_1, 1);
+lean_inc(x_62);
+lean_inc(x_61);
+lean_dec(x_1);
+x_63 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+x_64 = l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4___redArg(x_63, x_4, x_5);
+x_72 = 7;
+x_73 = lean_usize_dec_le(x_72, x_3);
+if (x_73 == 0)
+{
+lean_object* x_74; lean_object* x_75; uint8_t x_76; 
+x_74 = l_Lean_PersistentHashMap_getCollisionNodeSize___redArg(x_64);
+x_75 = lean_unsigned_to_nat(4u);
+x_76 = lean_nat_dec_lt(x_74, x_75);
+lean_dec(x_74);
+x_65 = x_76;
+goto block_71;
+}
+else
+{
+x_65 = x_73;
+goto block_71;
+}
+block_71:
+{
+if (x_65 == 0)
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_66 = lean_ctor_get(x_64, 0);
+lean_inc_ref(x_66);
+x_67 = lean_ctor_get(x_64, 1);
+lean_inc_ref(x_67);
+lean_dec_ref(x_64);
+x_68 = lean_unsigned_to_nat(0u);
+x_69 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0;
+x_70 = l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg(x_3, x_66, x_67, x_68, x_69);
+lean_dec_ref(x_67);
+lean_dec_ref(x_66);
+return x_70;
+}
+else
+{
+return x_64;
+}
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_get_size(x_2);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+if (x_7 == 0)
+{
+lean_dec(x_4);
+return x_5;
+}
+else
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint64_t x_12; uint64_t x_13; uint64_t x_14; size_t x_15; size_t x_16; lean_object* x_17; size_t x_18; size_t x_19; size_t x_20; size_t x_21; lean_object* x_22; lean_object* x_23; 
+x_8 = lean_array_fget_borrowed(x_2, x_4);
+x_9 = lean_ctor_get(x_8, 0);
+x_10 = lean_ctor_get(x_8, 1);
+x_11 = lean_array_fget_borrowed(x_3, x_4);
+x_12 = l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(x_9);
+x_13 = l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(x_10);
+x_14 = lean_uint64_mix_hash(x_12, x_13);
+x_15 = lean_uint64_to_usize(x_14);
+x_16 = 5;
+x_17 = lean_unsigned_to_nat(1u);
+x_18 = 1;
+x_19 = lean_usize_sub(x_1, x_18);
+x_20 = lean_usize_mul(x_16, x_19);
+x_21 = lean_usize_shift_right(x_15, x_20);
+x_22 = lean_nat_add(x_4, x_17);
+lean_dec(x_4);
+lean_inc(x_11);
+lean_inc(x_8);
+x_23 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(x_5, x_21, x_1, x_8, x_11);
+x_4 = x_22;
+x_5 = x_23;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg___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; lean_object* x_7; 
+x_6 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_7 = l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg(x_6, x_2, x_3, x_4, x_5);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___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_2);
+lean_dec(x_2);
+x_7 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_8 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(x_1, x_6, x_7, x_4, x_5);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; uint64_t x_6; uint64_t x_7; uint64_t x_8; size_t x_9; size_t x_10; lean_object* x_11; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 1);
+x_6 = l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(x_4);
+x_7 = l_Lean_Meta_Sym_hashPtrExpr_unsafe__1(x_5);
+x_8 = lean_uint64_mix_hash(x_6, x_7);
+x_9 = lean_uint64_to_usize(x_8);
+x_10 = 1;
+x_11 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(x_1, x_9, x_10, x_2, x_3);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_9 = lean_st_ref_get(x_3);
+x_10 = lean_ctor_get(x_9, 6);
+lean_inc_ref(x_10);
+lean_dec(x_9);
+lean_inc_ref(x_2);
+lean_inc_ref(x_1);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_1);
+lean_ctor_set(x_11, 1, x_2);
+x_12 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg(x_10, x_11);
+if (lean_obj_tag(x_12) == 1)
+{
+uint8_t x_13; 
+lean_dec_ref(x_11);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_13 = !lean_is_exclusive(x_12);
+if (x_13 == 0)
+{
+lean_ctor_set_tag(x_12, 0);
+return x_12;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_ctor_get(x_12, 0);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+return x_15;
+}
+}
+else
+{
+lean_object* x_16; 
+lean_dec(x_12);
+x_16 = l_Lean_Meta_isDefEqI(x_1, x_2, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_16) == 0)
+{
+uint8_t x_17; 
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_18 = lean_ctor_get(x_16, 0);
+x_19 = lean_st_ref_take(x_3);
+x_20 = !lean_is_exclusive(x_19);
+if (x_20 == 0)
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_19, 6);
+lean_inc(x_18);
+x_22 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1___redArg(x_21, x_11, x_18);
+lean_ctor_set(x_19, 6, x_22);
+x_23 = lean_st_ref_set(x_3, x_19);
+return x_16;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_24 = lean_ctor_get(x_19, 0);
+x_25 = lean_ctor_get(x_19, 1);
+x_26 = lean_ctor_get(x_19, 2);
+x_27 = lean_ctor_get(x_19, 3);
+x_28 = lean_ctor_get(x_19, 4);
+x_29 = lean_ctor_get(x_19, 5);
+x_30 = lean_ctor_get(x_19, 6);
+x_31 = lean_ctor_get_uint8(x_19, sizeof(void*)*7);
+lean_inc(x_30);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_dec(x_19);
+lean_inc(x_18);
+x_32 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1___redArg(x_30, x_11, x_18);
+x_33 = lean_alloc_ctor(0, 7, 1);
+lean_ctor_set(x_33, 0, x_24);
+lean_ctor_set(x_33, 1, x_25);
+lean_ctor_set(x_33, 2, x_26);
+lean_ctor_set(x_33, 3, x_27);
+lean_ctor_set(x_33, 4, x_28);
+lean_ctor_set(x_33, 5, x_29);
+lean_ctor_set(x_33, 6, x_32);
+lean_ctor_set_uint8(x_33, sizeof(void*)*7, x_31);
+x_34 = lean_st_ref_set(x_3, x_33);
+return x_16;
+}
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_35 = lean_ctor_get(x_16, 0);
+lean_inc(x_35);
+lean_dec(x_16);
+x_36 = lean_st_ref_take(x_3);
+x_37 = lean_ctor_get(x_36, 0);
+lean_inc_ref(x_37);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc_ref(x_38);
+x_39 = lean_ctor_get(x_36, 2);
+lean_inc_ref(x_39);
+x_40 = lean_ctor_get(x_36, 3);
+lean_inc_ref(x_40);
+x_41 = lean_ctor_get(x_36, 4);
+lean_inc_ref(x_41);
+x_42 = lean_ctor_get(x_36, 5);
+lean_inc_ref(x_42);
+x_43 = lean_ctor_get(x_36, 6);
+lean_inc_ref(x_43);
+x_44 = lean_ctor_get_uint8(x_36, sizeof(void*)*7);
+if (lean_is_exclusive(x_36)) {
+ lean_ctor_release(x_36, 0);
+ lean_ctor_release(x_36, 1);
+ lean_ctor_release(x_36, 2);
+ lean_ctor_release(x_36, 3);
+ lean_ctor_release(x_36, 4);
+ lean_ctor_release(x_36, 5);
+ lean_ctor_release(x_36, 6);
+ x_45 = x_36;
+} else {
+ lean_dec_ref(x_36);
+ x_45 = lean_box(0);
+}
+lean_inc(x_35);
+x_46 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1___redArg(x_43, x_11, x_35);
+if (lean_is_scalar(x_45)) {
+ x_47 = lean_alloc_ctor(0, 7, 1);
+} else {
+ x_47 = x_45;
+}
+lean_ctor_set(x_47, 0, x_37);
+lean_ctor_set(x_47, 1, x_38);
+lean_ctor_set(x_47, 2, x_39);
+lean_ctor_set(x_47, 3, x_40);
+lean_ctor_set(x_47, 4, x_41);
+lean_ctor_set(x_47, 5, x_42);
+lean_ctor_set(x_47, 6, x_46);
+lean_ctor_set_uint8(x_47, sizeof(void*)*7, x_44);
+x_48 = lean_st_ref_set(x_3, x_47);
+x_49 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_49, 0, x_35);
+return x_49;
+}
+}
+else
+{
+lean_dec_ref(x_11);
+return x_16;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_Meta_Sym_isDefEqI___redArg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_3);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI(lean_object* x_1, lean_object* x_2, 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_10; 
+x_10 = l_Lean_Meta_Sym_isDefEqI___redArg(x_1, x_2, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Sym_isDefEqI___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l_Lean_Meta_Sym_isDefEqI(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___redArg(x_2, x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0(x_1, x_2, x_3);
+lean_dec_ref(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1___redArg(x_2, x_3, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0(lean_object* x_1, lean_object* x_2, size_t x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___redArg(x_2, x_3, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+size_t x_5; lean_object* x_6; 
+x_5 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_6 = l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0(x_1, x_2, x_5, x_4);
+lean_dec_ref(x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg(x_2, x_3, x_4, x_5, x_6);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_8 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_9 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2(x_1, x_2, x_7, x_8, x_5, x_6);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___redArg(x_2, x_3, x_5, x_6);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_PersistentHashMap_findAtAux___at___00Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_Meta_Sym_isDefEqI_spec__0_spec__0_spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec_ref(x_6);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4___redArg(x_2, x_3, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5(lean_object* x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___redArg(x_2, x_3, x_4, x_6, x_7);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+size_t x_8; lean_object* x_9; 
+x_8 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_9 = l___private_Lean_Data_PersistentHashMap_0__Lean_PersistentHashMap_insertAux_traverse___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__5(x_1, x_8, x_3, x_4, x_5, x_6, x_7);
+lean_dec_ref(x_4);
+lean_dec_ref(x_3);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at___00Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4_spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at___00Lean_PersistentHashMap_insertAtCollisionNode___at___00Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2_spec__4_spec__5___redArg(x_2, x_3, x_4, x_5);
+return x_6;
+}
+}
 lean_object* initialize_Lean_Meta_Sym_AlphaShareCommon(uint8_t builtin);
 lean_object* initialize_Lean_Meta_CongrTheorems(uint8_t builtin);
 static bool _G_initialized = false;
@@ -2390,6 +3423,8 @@ l_Lean_Meta_Sym_shareCommon___redArg___closed__0 = _init_l_Lean_Meta_Sym_shareCo
 lean_mark_persistent(l_Lean_Meta_Sym_shareCommon___redArg___closed__0);
 l_Lean_Meta_Sym_shareCommon___redArg___closed__1 = _init_l_Lean_Meta_Sym_shareCommon___redArg___closed__1();
 lean_mark_persistent(l_Lean_Meta_Sym_shareCommon___redArg___closed__1);
+l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0 = _init_l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0();
+lean_mark_persistent(l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_Meta_Sym_isDefEqI_spec__1_spec__2___redArg___closed__0);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Cbv/ControlFlow.c b/stage0/stdlib/Lean/Meta/Tactic/Cbv/ControlFlow.c
index d3e55d6a38..643a30d90f 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Cbv/ControlFlow.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Cbv/ControlFlow.c
@@ -239,7 +239,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Cbv/Main.c b/stage0/stdlib/Lean/Meta/Tactic/Cbv/Main.c
index 0884b8e0ee..8061103c93 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Cbv/Main.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Cbv/Main.c
@@ -4047,7 +4047,7 @@ _start:
 {
 lean_object* x_11; lean_object* x_12; lean_object* x_16; uint8_t x_17; 
 x_16 = lean_st_ref_get(x_5);
-x_17 = lean_ctor_get_uint8(x_16, sizeof(void*)*6);
+x_17 = lean_ctor_get_uint8(x_16, sizeof(void*)*7);
 lean_dec(x_16);
 if (x_17 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Cbv/Util.c b/stage0/stdlib/Lean/Meta/Tactic/Cbv/Util.c
index 3f7cf4a8a2..9fc6e042c6 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Cbv/Util.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Cbv/Util.c
@@ -196,7 +196,7 @@ _start:
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_15; uint8_t x_16; 
 x_15 = lean_st_ref_get(x_4);
-x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*6);
+x_16 = lean_ctor_get_uint8(x_15, sizeof(void*)*7);
 lean_dec(x_15);
 if (x_16 == 0)
 {
diff --git a/stage0/stdlib/Lean/Meta/Tactic/ElimInfo.c b/stage0/stdlib/Lean/Meta/Tactic/ElimInfo.c
index 5f9db0470f..10b38e1def 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/ElimInfo.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/ElimInfo.c
@@ -6616,7 +6616,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_PersistentHashMap_insert___at___00Lean_SMap_insert___at___00Lean_Meta_addCustomEliminatorEntry_spec__0_spec__0_spec__2(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Ext.c b/stage0/stdlib/Lean/Meta/Tactic/Ext.c
index 257240e391..0eeb4b0be1 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Ext.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Ext.c
@@ -939,7 +939,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Lean_Meta_Ext_instHashableExtTheorem_hash_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/FunInd.c b/stage0/stdlib/Lean/Meta/Tactic/FunInd.c
index f7d6e18721..80f7711093 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/FunInd.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/FunInd.c
@@ -1172,7 +1172,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Uns
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5_spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5_spec__10(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5_spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed__const__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1452,7 +1451,6 @@ static lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_ab
 static const lean_string_object l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__5_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 19, .m_capacity = 19, .m_length = 18, .m_data = ", original mvars: "};
 static const lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__5 = (const lean_object*)&l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__5_value;
 static lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__6;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1;
 lean_object* l_Array_ofFn___redArg(lean_object*, lean_object*);
 lean_object* l_Array_zip___redArg(lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_ofList(lean_object*);
@@ -2154,7 +2152,6 @@ static const lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_Fun
 static lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__1;
 static const lean_closure_object l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___lam__0___boxed, .m_arity = 1, .m_num_fixed = 0, .m_objs = {} };
 static const lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__2 = (const lean_object*)&l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__2_value;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___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_mapFinIdxM_map___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize_spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -64150,15 +64147,6 @@ x_14 = l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map___at___00Lean_M
 return x_14;
 }
 }
-static lean_object* _init_l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5(lean_object* x_1, uint8_t x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
@@ -71746,7 +71734,7 @@ x_1406 = lean_ctor_get(x_1403, 1);
 lean_inc(x_1406);
 lean_dec(x_1403);
 x_1407 = lean_box(x_3);
-x_1408 = l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed__const__1;
+x_1408 = l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_foldAndCollect_spec__11___boxed__const__1;
 lean_inc_ref(x_22);
 lean_inc(x_1405);
 lean_inc_ref(x_17);
@@ -90342,15 +90330,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars(lean_object* x_1, 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:
 {
@@ -90503,7 +90482,7 @@ x_44 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_FunInd_0__
 x_45 = lean_ctor_get(x_44, 0);
 lean_inc(x_45);
 lean_dec_ref(x_44);
-x_46 = l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1;
+x_46 = l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_foldAndCollect_spec__11___boxed__const__1;
 lean_inc(x_43);
 x_47 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___lam__1___boxed), 9, 3);
 lean_closure_set(x_47, 0, x_43);
@@ -90750,7 +90729,7 @@ x_111 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_FunInd_0_
 x_112 = lean_ctor_get(x_111, 0);
 lean_inc(x_112);
 lean_dec_ref(x_111);
-x_113 = l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1;
+x_113 = l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_foldAndCollect_spec__11___boxed__const__1;
 lean_inc(x_110);
 x_114 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___lam__1___boxed), 9, 3);
 lean_closure_set(x_114, 0, x_110);
@@ -116497,15 +116476,6 @@ x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
@@ -116560,7 +116530,7 @@ x_27 = lean_ctor_get(x_22, 2);
 x_28 = ((lean_object*)(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__2));
 x_29 = l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_setNaryFunIndInfo___closed__2;
 x_30 = lean_array_get(x_29, x_19, x_14);
-x_31 = l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1;
+x_31 = l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_foldAndCollect_spec__11___boxed__const__1;
 x_32 = lean_box(x_1);
 lean_inc_ref(x_2);
 lean_inc(x_30);
@@ -117368,7 +117338,7 @@ lean_dec(x_22);
 x_184 = ((lean_object*)(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__2));
 x_185 = l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_setNaryFunIndInfo___closed__2;
 x_186 = lean_array_get(x_185, x_19, x_14);
-x_187 = l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1;
+x_187 = l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_foldAndCollect_spec__11___boxed__const__1;
 x_188 = lean_box(x_1);
 lean_inc_ref(x_2);
 lean_inc(x_186);
@@ -123288,8 +123258,6 @@ l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___l
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__27___closed__3);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__27___closed__5 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__27___closed__5();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__27___closed__5);
-l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed__const__1 = _init_l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed__const__1();
-lean_mark_persistent(l_Lean_Meta_MatcherApp_transform___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody_spec__5___boxed__const__1);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__33___closed__6 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__33___closed__6();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__33___closed__6);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__33___closed__4 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_buildInductionBody___lam__33___closed__4();
@@ -123318,8 +123286,6 @@ l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVa
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__4);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__6 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__6();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___closed__6);
-l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_abstractIndependentMVars___boxed__const__1);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveUnaryInduction_doRealize___lam__1___closed__1 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveUnaryInduction_doRealize___lam__1___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveUnaryInduction_doRealize___lam__1___closed__1);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveUnaryInduction_doRealize___lam__5___closed__1 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveUnaryInduction_doRealize___lam__5___closed__1();
@@ -123478,8 +123444,6 @@ l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructu
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___lam__6___closed__18);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__1 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___closed__1);
-l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_deriveInductionStructural_doRealize___boxed__const__1);
 l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_refinedArguments_spec__2___redArg___closed__0 = _init_l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_refinedArguments_spec__2___redArg___closed__0();
 lean_mark_persistent(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_refinedArguments_spec__2___redArg___closed__0);
 l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_refinedArguments___closed__3 = _init_l___private_Lean_Meta_Tactic_FunInd_0__Lean_Tactic_FunInd_refinedArguments___closed__3();
diff --git a/stage0/stdlib/Lean/Meta/Tactic/FunIndCollect.c b/stage0/stdlib/Lean/Meta/Tactic/FunIndCollect.c
index 1309196800..f5e3f6bef5 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/FunIndCollect.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/FunIndCollect.c
@@ -458,7 +458,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00Lean_Meta_FunInd_SeenCalls_push_spec__1_spec__2(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/AC/Proof.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/AC/Proof.c
index c3d07381bb..7d2471f8a9 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/AC/Proof.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/AC/Proof.c
@@ -9506,7 +9506,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__0_spec__2___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -9544,7 +9544,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -9818,7 +9818,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__0___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -9861,7 +9861,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__1_spec__4___redArg(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -9895,7 +9895,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__1___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -14245,7 +14245,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__0(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -14263,7 +14263,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__1(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 return x_5;
@@ -14282,7 +14282,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -14310,7 +14310,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__0_spec__2(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -14328,7 +14328,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_AC_EqCnstr_toExprProof_spec__1_spec__4(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Anchor.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Anchor.c
index 5d64338301..75b9731f49 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Anchor.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Anchor.c
@@ -149,17 +149,17 @@ static const lean_ctor_object l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_
 static const lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__12 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__12_value;
 static const lean_ctor_object l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__13_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__12_value),((lean_object*)&l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__10_value)}};
 static const lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__13 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__13_value;
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__2;
 static lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__3;
 static lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__14;
 lean_object* lean_nat_mul(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_array_size(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg(lean_object*, lean_object*, lean_object*);
 uint8_t l_Std_DHashMap_Internal_Raw_u2080_contains___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go_match__1_splitter___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go_match__1_splitter(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -322,9 +322,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_mix(x_3, x_4);
 x_6 = lean_box_uint64(x_5);
 return x_6;
@@ -1887,7 +1887,7 @@ _start:
 {
 uint64_t x_16; lean_object* x_17; 
 x_16 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_17 = l_WellFounded_opaqueFix_u2083___at___00Lean_Meta_Grind_getAnchor_spec__0___redArg(x_1, x_2, x_3, x_4, x_16, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
 lean_dec(x_10);
 lean_dec_ref(x_9);
@@ -1957,7 +1957,7 @@ _start:
 {
 uint64_t x_19; lean_object* x_20; 
 x_19 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_20 = l_WellFounded_opaqueFix_u2083___at___00Lean_Meta_Grind_getAnchor_spec__0(x_1, x_2, x_3, x_4, x_5, x_6, x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
 lean_dec(x_13);
 lean_dec_ref(x_12);
@@ -2110,7 +2110,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Meta_Grind_AnchorRef_matches(x_1, x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
@@ -2127,16 +2127,6 @@ lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
-{
-lean_object* x_11; 
-x_11 = l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_6);
-lean_dec(x_2);
-return x_11;
-}
-}
 static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___closed__2() {
 _start:
 {
@@ -2197,7 +2187,7 @@ x_11 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Gr
 x_12 = lean_box(0);
 lean_inc_ref(x_2);
 lean_inc(x_3);
-x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0___boxed), 10, 7);
+x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0), 10, 7);
 lean_closure_set(x_13, 0, x_1);
 lean_closure_set(x_13, 1, x_8);
 lean_closure_set(x_13, 2, x_9);
@@ -2243,7 +2233,7 @@ lean_inc_ref(x_1);
 x_14 = lean_apply_1(x_1, x_8);
 x_15 = lean_uint64_of_nat(x_2);
 x_16 = lean_unbox_uint64(x_14);
-lean_dec(x_14);
+lean_dec_ref(x_14);
 x_17 = lean_uint64_shift_right(x_16, x_15);
 x_18 = lean_box_uint64(x_17);
 lean_inc_ref(x_4);
@@ -2290,7 +2280,7 @@ lean_inc_ref(x_1);
 x_30 = lean_apply_1(x_1, x_8);
 x_31 = lean_uint64_of_nat(x_2);
 x_32 = lean_unbox_uint64(x_30);
-lean_dec(x_30);
+lean_dec_ref(x_30);
 x_33 = lean_uint64_shift_right(x_32, x_31);
 x_34 = lean_box_uint64(x_33);
 lean_inc_ref(x_4);
@@ -2332,6 +2322,16 @@ return x_46;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
+x_11 = l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_6);
+lean_dec(x_2);
+return x_11;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -2449,7 +2449,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Lean_Meta_Grind_mkAnchorSyntaxFromPrefix___redArg(x_1, x_5, x_3);
 lean_dec_ref(x_3);
 lean_dec(x_1);
@@ -2469,7 +2469,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Lean_Meta_Grind_mkAnchorSyntaxFromPrefix(x_1, x_6, x_3, x_4);
 lean_dec(x_4);
 lean_dec_ref(x_3);
@@ -2496,7 +2496,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Lean_Meta_Grind_mkAnchorSyntax___redArg(x_1, x_5, x_3);
 lean_dec_ref(x_3);
 lean_dec(x_1);
@@ -2516,7 +2516,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Lean_Meta_Grind_mkAnchorSyntax(x_1, x_6, x_3, x_4);
 lean_dec(x_4);
 lean_dec_ref(x_3);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Proof.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Proof.c
index d0a650dee8..35fdb3fe4d 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Proof.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Proof.c
@@ -13074,7 +13074,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -13279,7 +13279,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__0_spec__2___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -13434,7 +13434,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__0___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -13477,7 +13477,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__1_spec__4___redArg(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -13511,7 +13511,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__1___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -15661,7 +15661,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__0(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -15679,7 +15679,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__1(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 return x_5;
@@ -15698,7 +15698,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -15726,7 +15726,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__0_spec__2(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -15744,7 +15744,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_CommRing_EqCnstr_toExprProof_spec__1_spec__4(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Reify.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Reify.c
index bafcac42d1..38f885f95c 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Reify.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/CommRing/Reify.c
@@ -495,7 +495,6 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__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_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Grind_Arith_CommRing_getPowFn_x27___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Grind_Arith_CommRing_getAddFn_x27___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -503,6 +502,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify
 lean_object* l_Lean_Meta_Grind_Arith_CommRing_getMulFn_x27___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Grind_Arith_CommRing_getNatCastFn_x27___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Grind_Arith_CommRing_mkSVarCore___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f___redArg___lam__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -22486,16 +22486,6 @@ return x_18;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
-_start:
-{
-lean_object* x_14; 
-x_14 = l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec_ref(x_13);
-lean_dec_ref(x_1);
-return x_14;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
@@ -22514,7 +22504,7 @@ lean_inc_ref(x_8);
 lean_inc_ref(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
-x_16 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed), 13, 12);
+x_16 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0), 13, 12);
 lean_closure_set(x_16, 0, x_2);
 lean_closure_set(x_16, 1, x_3);
 lean_closure_set(x_16, 2, x_4);
@@ -22769,7 +22759,7 @@ lean_inc_ref(x_7);
 lean_inc_ref(x_6);
 lean_inc_ref(x_5);
 lean_inc(x_4);
-x_48 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed), 13, 12);
+x_48 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0), 13, 12);
 lean_closure_set(x_48, 0, x_25);
 lean_closure_set(x_48, 1, x_9);
 lean_closure_set(x_48, 2, x_2);
@@ -22816,7 +22806,7 @@ lean_inc_ref(x_7);
 lean_inc_ref(x_6);
 lean_inc_ref(x_5);
 lean_inc(x_4);
-x_52 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed), 13, 12);
+x_52 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0), 13, 12);
 lean_closure_set(x_52, 0, x_25);
 lean_closure_set(x_52, 1, x_9);
 lean_closure_set(x_52, 2, x_2);
@@ -22964,6 +22954,16 @@ x_14 = lean_apply_4(x_10, lean_box(0), lean_box(0), x_13, x_12);
 return x_14;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+_start:
+{
+lean_object* x_14; 
+x_14 = l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec_ref(x_13);
+lean_dec_ref(x_1);
+return x_14;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Arith_CommRing_Reify_0__Lean_Meta_Grind_Arith_CommRing_sreifyCore_x3f_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Cutsat/Proof.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Cutsat/Proof.c
index 3d3812a63f..2ee73545ad 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Cutsat/Proof.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Cutsat/Proof.c
@@ -2870,7 +2870,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -2904,7 +2904,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__0___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -3060,7 +3060,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__1_spec__2___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -3148,7 +3148,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__1_spec__4___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -3303,7 +3303,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__1___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -3528,7 +3528,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__0(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 return x_5;
@@ -3547,7 +3547,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__1(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -3565,7 +3565,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
@@ -3584,7 +3584,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__1_spec__2(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -3612,7 +3612,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00__private_Lean_Meta_Tactic_Grind_Arith_Cutsat_Proof_0__Lean_Meta_Grind_Arith_Cutsat_caching_spec__1_spec__4(x_1, x_5, x_3, x_4);
 return x_6;
 }
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Linear/Proof.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Linear/Proof.c
index 39664aa601..e06284c993 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Linear/Proof.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Linear/Proof.c
@@ -17576,7 +17576,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__1_spec__4___redArg(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -17610,7 +17610,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__1___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -17902,7 +17902,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__0_spec__2___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -17940,7 +17940,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -18097,7 +18097,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__0___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -19373,7 +19373,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__0(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -19391,7 +19391,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__1(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 return x_5;
@@ -19439,7 +19439,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -19467,7 +19467,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DHashMap_Internal_AssocList_replace___at___00Std_DHashMap_Internal_Raw_u2080_insert___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__0_spec__2(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -19485,7 +19485,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_get_x3f___at___00Std_DHashMap_Internal_Raw_u2080_Const_get_x3f___at___00Lean_Meta_Grind_Arith_Linear_EqCnstr_toExprProof_spec__1_spec__4(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Util.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Util.c
index d7201acef7..3f06f3c85c 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Util.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Arith/Util.c
@@ -1649,7 +1649,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00Lean_Meta_Grind_Arith_CollectDecVars_alreadyVisited_spec__0_spec__0___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -1684,7 +1684,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00Lean_Meta_Grind_Arith_CollectDecVars_alreadyVisited_spec__0___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
@@ -1926,7 +1926,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00Lean_Meta_Grind_Arith_CollectDecVars_alreadyVisited_spec__1___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -2028,7 +2028,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00Lean_Meta_Grind_Arith_CollectDecVars_alreadyVisited_spec__0(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 x_6 = lean_box(x_5);
@@ -2048,7 +2048,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00Lean_Meta_Grind_Arith_CollectDecVars_alreadyVisited_spec__1(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -2066,7 +2066,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00Lean_Meta_Grind_Arith_CollectDecVars_alreadyVisited_spec__0_spec__0(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Core.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Core.c
index 5fe349d409..a1e0f6c092 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Core.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Core.c
@@ -409,6 +409,7 @@ lean_object* l_Lean_Meta_Grind_checkInvariants(uint8_t, lean_object*, lean_objec
 lean_object* l_Lean_Meta_Grind_Goal_ppState(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Grind_propagateCtor(lean_object*, 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_Grind_markAsInconsistent___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Grind_hasSameType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkHEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___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*);
@@ -10586,7 +10587,7 @@ return x_2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, uint8_t x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19) {
 _start:
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; uint8_t x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; uint8_t 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; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; uint8_t x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; lean_object* x_129; lean_object* x_130; lean_object* x_131; uint8_t 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; uint8_t x_139; lean_object* x_140; lean_object* x_141; uint8_t x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; uint8_t x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; uint8_t x_150; lean_object* x_151; lean_object* x_152; uint8_t x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; uint8_t x_165; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; uint8_t x_171; uint8_t x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_457; lean_object* x_458; uint8_t x_459; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; lean_object* x_79; uint8_t x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; uint8_t x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; uint8_t x_133; uint8_t x_134; uint8_t x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; uint8_t x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; uint8_t x_159; 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_167; lean_object* x_168; uint8_t x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; uint8_t x_176; 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_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_457; lean_object* x_458; uint8_t x_459; 
 x_260 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go___closed__0));
 x_457 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__1___redArg(x_260, x_18);
 x_458 = lean_ctor_get(x_457, 0);
@@ -10806,8 +10807,8 @@ if (x_41 == 0)
 {
 lean_object* x_42; lean_object* x_43; lean_object* x_44; 
 lean_free_object(x_38);
-x_42 = l_Lean_Meta_Grind_ParentSet_elems(x_23);
-lean_dec(x_23);
+x_42 = l_Lean_Meta_Grind_ParentSet_elems(x_21);
+lean_dec(x_21);
 x_43 = lean_box(0);
 lean_inc(x_36);
 lean_inc_ref(x_35);
@@ -10850,8 +10851,8 @@ lean_inc(x_30);
 lean_inc_ref(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
-x_46 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_propagateUnitConstFuns(x_22, x_26, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
-lean_dec_ref(x_26);
+x_46 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_propagateUnitConstFuns(x_22, x_24, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
+lean_dec_ref(x_24);
 lean_dec_ref(x_22);
 if (lean_obj_tag(x_46) == 0)
 {
@@ -10867,7 +10868,7 @@ lean_inc(x_30);
 lean_inc_ref(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
-x_47 = l_Lean_Meta_Grind_PendingSolverPropagations_propagate(x_24, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
+x_47 = l_Lean_Meta_Grind_PendingSolverPropagations_propagate(x_23, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
 if (lean_obj_tag(x_47) == 0)
 {
 uint8_t x_48; 
@@ -10877,7 +10878,7 @@ if (x_48 == 0)
 lean_object* x_49; uint8_t x_50; 
 x_49 = lean_ctor_get(x_47, 0);
 lean_dec(x_49);
-x_50 = l_Lean_Expr_isTrue(x_21);
+x_50 = l_Lean_Expr_isTrue(x_26);
 if (x_50 == 0)
 {
 lean_dec(x_36);
@@ -10907,7 +10908,7 @@ else
 {
 uint8_t x_52; 
 lean_dec(x_47);
-x_52 = l_Lean_Expr_isTrue(x_21);
+x_52 = l_Lean_Expr_isTrue(x_26);
 if (x_52 == 0)
 {
 lean_object* x_53; 
@@ -10947,8 +10948,8 @@ lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec(x_28);
 lean_dec(x_27);
+lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec_ref(x_21);
 return x_47;
 }
 }
@@ -10964,9 +10965,9 @@ lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec(x_28);
 lean_dec(x_27);
+lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
-lean_dec_ref(x_21);
+lean_dec(x_23);
 return x_46;
 }
 }
@@ -10984,9 +10985,9 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
+lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
 return x_45;
 }
 }
@@ -11004,9 +11005,9 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
+lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
 return x_44;
 }
 }
@@ -11025,10 +11026,10 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
 lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
+lean_dec(x_21);
 x_55 = lean_box(0);
 lean_ctor_set(x_38, 0, x_55);
 return x_38;
@@ -11045,8 +11046,8 @@ lean_dec(x_56);
 if (x_57 == 0)
 {
 lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = l_Lean_Meta_Grind_ParentSet_elems(x_23);
-lean_dec(x_23);
+x_58 = l_Lean_Meta_Grind_ParentSet_elems(x_21);
+lean_dec(x_21);
 x_59 = lean_box(0);
 lean_inc(x_36);
 lean_inc_ref(x_35);
@@ -11089,8 +11090,8 @@ lean_inc(x_30);
 lean_inc_ref(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
-x_62 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_propagateUnitConstFuns(x_22, x_26, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
-lean_dec_ref(x_26);
+x_62 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_propagateUnitConstFuns(x_22, x_24, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
+lean_dec_ref(x_24);
 lean_dec_ref(x_22);
 if (lean_obj_tag(x_62) == 0)
 {
@@ -11106,7 +11107,7 @@ lean_inc(x_30);
 lean_inc_ref(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
-x_63 = l_Lean_Meta_Grind_PendingSolverPropagations_propagate(x_24, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
+x_63 = l_Lean_Meta_Grind_PendingSolverPropagations_propagate(x_23, x_27, x_28, x_29, x_30, x_31, x_32, x_33, x_34, x_35, x_36);
 if (lean_obj_tag(x_63) == 0)
 {
 lean_object* x_64; uint8_t x_65; 
@@ -11117,7 +11118,7 @@ if (lean_is_exclusive(x_63)) {
  lean_dec_ref(x_63);
  x_64 = lean_box(0);
 }
-x_65 = l_Lean_Expr_isTrue(x_21);
+x_65 = l_Lean_Expr_isTrue(x_26);
 if (x_65 == 0)
 {
 lean_object* x_66; 
@@ -11161,8 +11162,8 @@ lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec(x_28);
 lean_dec(x_27);
+lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec_ref(x_21);
 return x_63;
 }
 }
@@ -11178,9 +11179,9 @@ lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec(x_28);
 lean_dec(x_27);
+lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
-lean_dec_ref(x_21);
+lean_dec(x_23);
 return x_62;
 }
 }
@@ -11198,9 +11199,9 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
+lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
 return x_61;
 }
 }
@@ -11218,9 +11219,9 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
+lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
 return x_60;
 }
 }
@@ -11239,10 +11240,10 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
 lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
+lean_dec(x_21);
 x_68 = lean_box(0);
 x_69 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_69, 0, x_68);
@@ -11265,10 +11266,10 @@ lean_dec(x_28);
 lean_dec(x_27);
 lean_dec_ref(x_26);
 lean_dec(x_25);
-lean_dec(x_24);
+lean_dec_ref(x_24);
 lean_dec(x_23);
 lean_dec_ref(x_22);
-lean_dec_ref(x_21);
+lean_dec(x_21);
 x_70 = !lean_is_exclusive(x_38);
 if (x_70 == 0)
 {
@@ -11289,84 +11290,84 @@ return x_72;
 block_128:
 {
 lean_object* x_110; lean_object* x_111; 
-lean_inc_ref(x_91);
+lean_inc_ref(x_98);
 x_110 = lean_alloc_ctor(0, 11, 6);
-lean_ctor_set(x_110, 0, x_91);
-lean_ctor_set(x_110, 1, x_80);
-lean_ctor_set(x_110, 2, x_84);
-lean_ctor_set(x_110, 3, x_105);
-lean_ctor_set(x_110, 4, x_95);
-lean_ctor_set(x_110, 5, x_83);
-lean_ctor_set(x_110, 6, x_87);
-lean_ctor_set(x_110, 7, x_101);
-lean_ctor_set(x_110, 8, x_93);
-lean_ctor_set(x_110, 9, x_107);
-lean_ctor_set(x_110, 10, x_100);
-lean_ctor_set_uint8(x_110, sizeof(void*)*11, x_90);
-lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 1, x_82);
-lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 2, x_86);
-lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 3, x_103);
+lean_ctor_set(x_110, 0, x_98);
+lean_ctor_set(x_110, 1, x_88);
+lean_ctor_set(x_110, 2, x_95);
+lean_ctor_set(x_110, 3, x_82);
+lean_ctor_set(x_110, 4, x_97);
+lean_ctor_set(x_110, 5, x_99);
+lean_ctor_set(x_110, 6, x_84);
+lean_ctor_set(x_110, 7, x_108);
+lean_ctor_set(x_110, 8, x_76);
+lean_ctor_set(x_110, 9, x_104);
+lean_ctor_set(x_110, 10, x_74);
+lean_ctor_set_uint8(x_110, sizeof(void*)*11, x_92);
+lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 1, x_80);
+lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 2, x_105);
+lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 3, x_101);
 lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 4, x_109);
-lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 5, x_96);
-lean_inc_ref(x_75);
-x_111 = l_Lean_Meta_Grind_setENode___redArg(x_75, x_110, x_92);
+lean_ctor_set_uint8(x_110, sizeof(void*)*11 + 5, x_78);
+lean_inc_ref(x_103);
+x_111 = l_Lean_Meta_Grind_setENode___redArg(x_103, x_110, x_102);
 if (lean_obj_tag(x_111) == 0)
 {
 lean_object* x_112; 
 lean_dec_ref(x_111);
-lean_inc(x_94);
-lean_inc_ref(x_89);
-lean_inc(x_79);
-lean_inc_ref(x_76);
-lean_inc(x_99);
-lean_inc_ref(x_88);
-lean_inc(x_108);
+lean_inc(x_107);
+lean_inc_ref(x_87);
+lean_inc(x_81);
+lean_inc_ref(x_94);
+lean_inc(x_75);
+lean_inc_ref(x_106);
+lean_inc(x_93);
 lean_inc_ref(x_77);
-lean_inc(x_97);
-lean_inc(x_92);
+lean_inc(x_89);
+lean_inc(x_102);
 lean_inc_ref(x_85);
-x_112 = l_Lean_Meta_Grind_propagateBeta(x_85, x_81, x_92, x_97, x_77, x_108, x_88, x_99, x_76, x_79, x_89, x_94);
+x_112 = l_Lean_Meta_Grind_propagateBeta(x_85, x_100, x_102, x_89, x_77, x_93, x_106, x_75, x_94, x_81, x_87, x_107);
 if (lean_obj_tag(x_112) == 0)
 {
 lean_object* x_113; 
 lean_dec_ref(x_112);
-lean_inc(x_94);
-lean_inc_ref(x_89);
-lean_inc(x_79);
-lean_inc_ref(x_76);
-lean_inc(x_99);
-lean_inc_ref(x_88);
-lean_inc(x_108);
+lean_inc(x_107);
+lean_inc_ref(x_87);
+lean_inc(x_81);
+lean_inc_ref(x_94);
+lean_inc(x_75);
+lean_inc_ref(x_106);
+lean_inc(x_93);
 lean_inc_ref(x_77);
-lean_inc(x_97);
-lean_inc(x_92);
-lean_inc_ref(x_102);
-x_113 = l_Lean_Meta_Grind_propagateBeta(x_102, x_104, x_92, x_97, x_77, x_108, x_88, x_99, x_76, x_79, x_89, x_94);
+lean_inc(x_89);
+lean_inc(x_102);
+lean_inc_ref(x_90);
+x_113 = l_Lean_Meta_Grind_propagateBeta(x_90, x_83, x_102, x_89, x_77, x_93, x_106, x_75, x_94, x_81, x_87, x_107);
 if (lean_obj_tag(x_113) == 0)
 {
 lean_object* x_114; 
 lean_dec_ref(x_113);
-x_114 = l_Lean_Meta_Grind_Solvers_mergeTerms___redArg(x_8, x_7, x_92, x_76, x_79, x_89, x_94);
+x_114 = l_Lean_Meta_Grind_Solvers_mergeTerms___redArg(x_8, x_7, x_102, x_94, x_81, x_87, x_107);
 if (lean_obj_tag(x_114) == 0)
 {
 lean_object* x_115; lean_object* x_116; 
 x_115 = lean_ctor_get(x_114, 0);
 lean_inc(x_115);
 lean_dec_ref(x_114);
-x_116 = l_Lean_Meta_Grind_resetParentsOf___redArg(x_78, x_92);
-lean_dec_ref(x_78);
+x_116 = l_Lean_Meta_Grind_resetParentsOf___redArg(x_79, x_102);
+lean_dec_ref(x_79);
 if (lean_obj_tag(x_116) == 0)
 {
 lean_object* x_117; 
 lean_dec_ref(x_116);
-lean_inc_ref(x_75);
-lean_inc(x_74);
-x_117 = l_Lean_Meta_Grind_copyParentsTo(x_74, x_75, x_92, x_97, x_77, x_108, x_88, x_99, x_76, x_79, x_89, x_94);
+lean_inc_ref(x_103);
+lean_inc(x_96);
+x_117 = l_Lean_Meta_Grind_copyParentsTo(x_96, x_103, x_102, x_89, x_77, x_93, x_106, x_75, x_94, x_81, x_87, x_107);
 if (lean_obj_tag(x_117) == 0)
 {
 lean_object* x_118; 
 lean_dec_ref(x_117);
-x_118 = l_Lean_Meta_Grind_isInconsistent___redArg(x_92);
+x_118 = l_Lean_Meta_Grind_isInconsistent___redArg(x_102);
 if (lean_obj_tag(x_118) == 0)
 {
 lean_object* x_119; uint8_t x_120; 
@@ -11378,70 +11379,70 @@ lean_dec(x_119);
 if (x_120 == 0)
 {
 lean_object* x_121; 
-x_121 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_updateMT(x_91, x_92, x_97, x_77, x_108, x_88, x_99, x_76, x_79, x_89, x_94);
-lean_dec_ref(x_91);
+x_121 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_updateMT(x_98, x_102, x_89, x_77, x_93, x_106, x_75, x_94, x_81, x_87, x_107);
+lean_dec_ref(x_98);
 if (lean_obj_tag(x_121) == 0)
 {
 lean_dec_ref(x_121);
-x_21 = x_75;
+x_21 = x_96;
 x_22 = x_85;
-x_23 = x_74;
-x_24 = x_115;
-x_25 = x_98;
-x_26 = x_102;
-x_27 = x_92;
-x_28 = x_97;
+x_23 = x_115;
+x_24 = x_90;
+x_25 = x_91;
+x_26 = x_103;
+x_27 = x_102;
+x_28 = x_89;
 x_29 = x_77;
-x_30 = x_108;
-x_31 = x_88;
-x_32 = x_99;
-x_33 = x_76;
-x_34 = x_79;
-x_35 = x_89;
-x_36 = x_94;
+x_30 = x_93;
+x_31 = x_106;
+x_32 = x_75;
+x_33 = x_94;
+x_34 = x_81;
+x_35 = x_87;
+x_36 = x_107;
 x_37 = lean_box(0);
 goto block_73;
 }
 else
 {
 lean_dec(x_115);
-lean_dec(x_108);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
+lean_dec(x_81);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 return x_121;
 }
 }
 else
 {
-lean_dec_ref(x_91);
-x_21 = x_75;
+lean_dec_ref(x_98);
+x_21 = x_96;
 x_22 = x_85;
-x_23 = x_74;
-x_24 = x_115;
-x_25 = x_98;
-x_26 = x_102;
-x_27 = x_92;
-x_28 = x_97;
+x_23 = x_115;
+x_24 = x_90;
+x_25 = x_91;
+x_26 = x_103;
+x_27 = x_102;
+x_28 = x_89;
 x_29 = x_77;
-x_30 = x_108;
-x_31 = x_88;
-x_32 = x_99;
-x_33 = x_76;
-x_34 = x_79;
-x_35 = x_89;
-x_36 = x_94;
+x_30 = x_93;
+x_31 = x_106;
+x_32 = x_75;
+x_33 = x_94;
+x_34 = x_81;
+x_35 = x_87;
+x_36 = x_107;
 x_37 = lean_box(0);
 goto block_73;
 }
@@ -11450,22 +11451,22 @@ else
 {
 uint8_t x_122; 
 lean_dec(x_115);
-lean_dec(x_108);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
+lean_dec(x_81);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 x_122 = !lean_is_exclusive(x_118);
 if (x_122 == 0)
 {
@@ -11486,67 +11487,67 @@ return x_124;
 else
 {
 lean_dec(x_115);
-lean_dec(x_108);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
+lean_dec(x_81);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 return x_117;
 }
 }
 else
 {
 lean_dec(x_115);
-lean_dec(x_108);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
+lean_dec(x_81);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 return x_116;
 }
 }
 else
 {
 uint8_t x_125; 
-lean_dec(x_108);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
-lean_dec_ref(x_78);
+lean_dec(x_81);
+lean_dec_ref(x_79);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 x_125 = !lean_is_exclusive(x_114);
 if (x_125 == 0)
 {
@@ -11566,23 +11567,23 @@ return x_127;
 }
 else
 {
-lean_dec(x_108);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
-lean_dec_ref(x_78);
+lean_dec(x_81);
+lean_dec_ref(x_79);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
 return x_113;
@@ -11590,24 +11591,24 @@ return x_113;
 }
 else
 {
-lean_dec(x_108);
-lean_dec_ref(x_104);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec(x_79);
-lean_dec_ref(x_78);
+lean_dec_ref(x_83);
+lean_dec(x_81);
+lean_dec_ref(x_79);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
 return x_112;
@@ -11615,25 +11616,25 @@ return x_112;
 }
 else
 {
-lean_dec(x_108);
-lean_dec_ref(x_104);
-lean_dec_ref(x_102);
-lean_dec(x_99);
-lean_dec(x_98);
-lean_dec(x_97);
-lean_dec(x_94);
-lean_dec(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_89);
-lean_dec_ref(x_88);
+lean_dec(x_107);
+lean_dec_ref(x_106);
+lean_dec_ref(x_103);
+lean_dec(x_102);
+lean_dec_ref(x_100);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec_ref(x_94);
+lean_dec(x_93);
+lean_dec(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec_ref(x_87);
 lean_dec_ref(x_85);
-lean_dec_ref(x_81);
-lean_dec(x_79);
-lean_dec_ref(x_78);
+lean_dec_ref(x_83);
+lean_dec(x_81);
+lean_dec_ref(x_79);
 lean_dec_ref(x_77);
-lean_dec_ref(x_76);
-lean_dec_ref(x_75);
-lean_dec(x_74);
+lean_dec(x_75);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
 return x_111;
@@ -11643,21 +11644,21 @@ block_166:
 {
 if (x_2 == 0)
 {
-if (x_150 == 0)
+if (x_159 == 0)
 {
-x_74 = x_130;
-x_75 = x_129;
+x_74 = x_129;
+x_75 = x_130;
 x_76 = x_131;
-x_77 = x_133;
-x_78 = x_135;
-x_79 = x_134;
-x_80 = x_137;
-x_81 = x_136;
-x_82 = x_139;
-x_83 = x_138;
-x_84 = x_141;
-x_85 = x_140;
-x_86 = x_142;
+x_77 = x_132;
+x_78 = x_133;
+x_79 = x_136;
+x_80 = x_135;
+x_81 = x_138;
+x_82 = x_137;
+x_83 = x_139;
+x_84 = x_140;
+x_85 = x_141;
+x_86 = lean_box(0);
 x_87 = x_143;
 x_88 = x_144;
 x_89 = x_145;
@@ -11665,39 +11666,39 @@ x_90 = x_146;
 x_91 = x_147;
 x_92 = x_148;
 x_93 = x_149;
-x_94 = x_151;
-x_95 = x_152;
-x_96 = x_153;
-x_97 = x_154;
-x_98 = x_157;
-x_99 = x_156;
-x_100 = x_155;
-x_101 = x_158;
-x_102 = x_159;
-x_103 = x_165;
+x_94 = x_150;
+x_95 = x_151;
+x_96 = x_152;
+x_97 = x_153;
+x_98 = x_154;
+x_99 = x_155;
+x_100 = x_156;
+x_101 = x_165;
+x_102 = x_157;
+x_103 = x_158;
 x_104 = x_160;
 x_105 = x_161;
-x_106 = lean_box(0);
+x_106 = x_162;
 x_107 = x_163;
 x_108 = x_164;
-x_109 = x_132;
+x_109 = x_134;
 goto block_128;
 }
 else
 {
-x_74 = x_130;
-x_75 = x_129;
+x_74 = x_129;
+x_75 = x_130;
 x_76 = x_131;
-x_77 = x_133;
-x_78 = x_135;
-x_79 = x_134;
-x_80 = x_137;
-x_81 = x_136;
-x_82 = x_139;
-x_83 = x_138;
-x_84 = x_141;
-x_85 = x_140;
-x_86 = x_142;
+x_77 = x_132;
+x_78 = x_133;
+x_79 = x_136;
+x_80 = x_135;
+x_81 = x_138;
+x_82 = x_137;
+x_83 = x_139;
+x_84 = x_140;
+x_85 = x_141;
+x_86 = lean_box(0);
 x_87 = x_143;
 x_88 = x_144;
 x_89 = x_145;
@@ -11705,40 +11706,40 @@ x_90 = x_146;
 x_91 = x_147;
 x_92 = x_148;
 x_93 = x_149;
-x_94 = x_151;
-x_95 = x_152;
-x_96 = x_153;
-x_97 = x_154;
-x_98 = x_157;
-x_99 = x_156;
-x_100 = x_155;
-x_101 = x_158;
-x_102 = x_159;
-x_103 = x_165;
+x_94 = x_150;
+x_95 = x_151;
+x_96 = x_152;
+x_97 = x_153;
+x_98 = x_154;
+x_99 = x_155;
+x_100 = x_156;
+x_101 = x_165;
+x_102 = x_157;
+x_103 = x_158;
 x_104 = x_160;
 x_105 = x_161;
-x_106 = lean_box(0);
+x_106 = x_162;
 x_107 = x_163;
 x_108 = x_164;
-x_109 = x_150;
+x_109 = x_159;
 goto block_128;
 }
 }
 else
 {
-x_74 = x_130;
-x_75 = x_129;
+x_74 = x_129;
+x_75 = x_130;
 x_76 = x_131;
-x_77 = x_133;
-x_78 = x_135;
-x_79 = x_134;
-x_80 = x_137;
-x_81 = x_136;
-x_82 = x_139;
-x_83 = x_138;
-x_84 = x_141;
-x_85 = x_140;
-x_86 = x_142;
+x_77 = x_132;
+x_78 = x_133;
+x_79 = x_136;
+x_80 = x_135;
+x_81 = x_138;
+x_82 = x_137;
+x_83 = x_139;
+x_84 = x_140;
+x_85 = x_141;
+x_86 = lean_box(0);
 x_87 = x_143;
 x_88 = x_144;
 x_89 = x_145;
@@ -11746,19 +11747,19 @@ x_90 = x_146;
 x_91 = x_147;
 x_92 = x_148;
 x_93 = x_149;
-x_94 = x_151;
-x_95 = x_152;
-x_96 = x_153;
-x_97 = x_154;
-x_98 = x_157;
-x_99 = x_156;
-x_100 = x_155;
-x_101 = x_158;
-x_102 = x_159;
-x_103 = x_165;
+x_94 = x_150;
+x_95 = x_151;
+x_96 = x_152;
+x_97 = x_153;
+x_98 = x_154;
+x_99 = x_155;
+x_100 = x_156;
+x_101 = x_165;
+x_102 = x_157;
+x_103 = x_158;
 x_104 = x_160;
 x_105 = x_161;
-x_106 = lean_box(0);
+x_106 = x_162;
 x_107 = x_163;
 x_108 = x_164;
 x_109 = x_2;
@@ -11772,15 +11773,15 @@ lean_inc(x_188);
 lean_inc_ref(x_187);
 lean_inc(x_186);
 lean_inc_ref(x_185);
-x_190 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_reinsertParents(x_169, x_179, x_180, x_181, x_182, x_183, x_184, x_185, x_186, x_187, x_188);
+x_190 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_reinsertParents(x_168, x_179, x_180, x_181, x_182, x_183, x_184, x_185, x_186, x_187, x_188);
 if (lean_obj_tag(x_190) == 0)
 {
 lean_object* x_191; lean_object* x_192; lean_object* x_193; 
 lean_dec_ref(x_190);
 x_191 = lean_st_ref_get(x_179);
 x_192 = lean_st_ref_get(x_179);
-lean_inc_ref(x_174);
-x_193 = l_Lean_Meta_Grind_Goal_getENode(x_192, x_174, x_185, x_186, x_187, x_188);
+lean_inc_ref(x_178);
+x_193 = l_Lean_Meta_Grind_Goal_getENode(x_192, x_178, x_185, x_186, x_187, x_188);
 if (lean_obj_tag(x_193) == 0)
 {
 lean_object* x_194; uint8_t x_195; 
@@ -11812,112 +11813,112 @@ x_212 = lean_ctor_get(x_8, 10);
 x_213 = lean_ctor_get_uint8(x_8, sizeof(void*)*11 + 5);
 lean_inc_ref(x_198);
 lean_ctor_set(x_194, 1, x_198);
-x_214 = l_Lean_Meta_Grind_setENode___redArg(x_177, x_194, x_179);
+x_214 = l_Lean_Meta_Grind_setENode___redArg(x_175, x_194, x_179);
 if (lean_obj_tag(x_214) == 0)
 {
 uint8_t x_215; lean_object* x_216; lean_object* x_217; 
 lean_dec_ref(x_214);
 x_215 = 0;
 x_216 = l_Lean_Meta_Grind_Goal_getEqc(x_191, x_3, x_215);
-x_217 = lean_nat_add(x_204, x_173);
-lean_dec(x_173);
+x_217 = lean_nat_add(x_204, x_174);
+lean_dec(x_174);
 if (x_207 == 0)
 {
-lean_inc(x_211);
-lean_inc_ref(x_200);
 lean_inc(x_209);
-lean_inc(x_212);
-lean_inc(x_201);
-lean_inc(x_210);
-lean_inc_ref(x_197);
-lean_inc_ref(x_199);
+lean_inc(x_211);
 lean_inc(x_202);
-x_129 = x_168;
-x_130 = x_169;
-x_131 = x_185;
-x_132 = x_171;
-x_133 = x_181;
-x_134 = x_186;
-x_135 = x_174;
-x_136 = x_176;
-x_137 = x_175;
-x_138 = x_202;
-x_139 = x_205;
-x_140 = x_167;
-x_141 = x_199;
-x_142 = x_206;
-x_143 = x_217;
-x_144 = x_183;
-x_145 = x_187;
-x_146 = x_203;
-x_147 = x_197;
-x_148 = x_179;
-x_149 = x_210;
-x_150 = x_208;
-x_151 = x_188;
-x_152 = x_201;
-x_153 = x_213;
-x_154 = x_180;
-x_155 = x_212;
-x_156 = x_184;
-x_157 = x_216;
-x_158 = x_209;
-x_159 = x_178;
-x_160 = x_170;
-x_161 = x_200;
-x_162 = lean_box(0);
-x_163 = x_211;
-x_164 = x_182;
-x_165 = x_172;
+lean_inc_ref(x_197);
+lean_inc(x_201);
+lean_inc_ref(x_199);
+lean_inc_ref(x_200);
+lean_inc(x_210);
+lean_inc(x_212);
+x_129 = x_212;
+x_130 = x_184;
+x_131 = x_210;
+x_132 = x_181;
+x_133 = x_213;
+x_134 = x_176;
+x_135 = x_205;
+x_136 = x_178;
+x_137 = x_200;
+x_138 = x_186;
+x_139 = x_167;
+x_140 = x_217;
+x_141 = x_171;
+x_142 = lean_box(0);
+x_143 = x_187;
+x_144 = x_172;
+x_145 = x_180;
+x_146 = x_173;
+x_147 = x_216;
+x_148 = x_203;
+x_149 = x_182;
+x_150 = x_185;
+x_151 = x_199;
+x_152 = x_168;
+x_153 = x_201;
+x_154 = x_197;
+x_155 = x_202;
+x_156 = x_170;
+x_157 = x_179;
+x_158 = x_177;
+x_159 = x_208;
+x_160 = x_211;
+x_161 = x_206;
+x_162 = x_183;
+x_163 = x_188;
+x_164 = x_209;
+x_165 = x_169;
 goto block_166;
 }
 else
 {
-lean_inc(x_211);
-lean_inc_ref(x_200);
 lean_inc(x_209);
-lean_inc(x_212);
-lean_inc(x_201);
-lean_inc(x_210);
-lean_inc_ref(x_197);
-lean_inc_ref(x_199);
+lean_inc(x_211);
 lean_inc(x_202);
-x_129 = x_168;
-x_130 = x_169;
-x_131 = x_185;
-x_132 = x_171;
-x_133 = x_181;
-x_134 = x_186;
-x_135 = x_174;
-x_136 = x_176;
-x_137 = x_175;
-x_138 = x_202;
-x_139 = x_205;
-x_140 = x_167;
-x_141 = x_199;
-x_142 = x_206;
-x_143 = x_217;
-x_144 = x_183;
-x_145 = x_187;
-x_146 = x_203;
-x_147 = x_197;
-x_148 = x_179;
-x_149 = x_210;
-x_150 = x_208;
-x_151 = x_188;
-x_152 = x_201;
-x_153 = x_213;
-x_154 = x_180;
-x_155 = x_212;
-x_156 = x_184;
-x_157 = x_216;
-x_158 = x_209;
-x_159 = x_178;
-x_160 = x_170;
-x_161 = x_200;
-x_162 = lean_box(0);
-x_163 = x_211;
-x_164 = x_182;
+lean_inc_ref(x_197);
+lean_inc(x_201);
+lean_inc_ref(x_199);
+lean_inc_ref(x_200);
+lean_inc(x_210);
+lean_inc(x_212);
+x_129 = x_212;
+x_130 = x_184;
+x_131 = x_210;
+x_132 = x_181;
+x_133 = x_213;
+x_134 = x_176;
+x_135 = x_205;
+x_136 = x_178;
+x_137 = x_200;
+x_138 = x_186;
+x_139 = x_167;
+x_140 = x_217;
+x_141 = x_171;
+x_142 = lean_box(0);
+x_143 = x_187;
+x_144 = x_172;
+x_145 = x_180;
+x_146 = x_173;
+x_147 = x_216;
+x_148 = x_203;
+x_149 = x_182;
+x_150 = x_185;
+x_151 = x_199;
+x_152 = x_168;
+x_153 = x_201;
+x_154 = x_197;
+x_155 = x_202;
+x_156 = x_170;
+x_157 = x_179;
+x_158 = x_177;
+x_159 = x_208;
+x_160 = x_211;
+x_161 = x_206;
+x_162 = x_183;
+x_163 = x_188;
+x_164 = x_209;
 x_165 = x_207;
 goto block_166;
 }
@@ -11936,13 +11937,13 @@ lean_dec_ref(x_181);
 lean_dec(x_180);
 lean_dec(x_179);
 lean_dec_ref(x_178);
-lean_dec_ref(x_176);
-lean_dec_ref(x_175);
-lean_dec_ref(x_174);
-lean_dec(x_173);
+lean_dec_ref(x_177);
+lean_dec(x_174);
+lean_dec_ref(x_173);
+lean_dec_ref(x_172);
+lean_dec_ref(x_171);
 lean_dec_ref(x_170);
-lean_dec(x_169);
-lean_dec_ref(x_168);
+lean_dec(x_168);
 lean_dec_ref(x_167);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
@@ -12016,112 +12017,112 @@ lean_ctor_set_uint8(x_251, sizeof(void*)*11 + 2, x_226);
 lean_ctor_set_uint8(x_251, sizeof(void*)*11 + 3, x_227);
 lean_ctor_set_uint8(x_251, sizeof(void*)*11 + 4, x_228);
 lean_ctor_set_uint8(x_251, sizeof(void*)*11 + 5, x_233);
-x_252 = l_Lean_Meta_Grind_setENode___redArg(x_177, x_251, x_179);
+x_252 = l_Lean_Meta_Grind_setENode___redArg(x_175, x_251, x_179);
 if (lean_obj_tag(x_252) == 0)
 {
 uint8_t x_253; lean_object* x_254; lean_object* x_255; 
 lean_dec_ref(x_252);
 x_253 = 0;
 x_254 = l_Lean_Meta_Grind_Goal_getEqc(x_191, x_3, x_253);
-x_255 = lean_nat_add(x_241, x_173);
-lean_dec(x_173);
+x_255 = lean_nat_add(x_241, x_174);
+lean_dec(x_174);
 if (x_244 == 0)
 {
-lean_inc(x_248);
-lean_inc_ref(x_237);
 lean_inc(x_246);
-lean_inc(x_249);
-lean_inc(x_238);
-lean_inc(x_247);
-lean_inc_ref(x_234);
-lean_inc_ref(x_236);
+lean_inc(x_248);
 lean_inc(x_239);
-x_129 = x_168;
-x_130 = x_169;
-x_131 = x_185;
-x_132 = x_171;
-x_133 = x_181;
-x_134 = x_186;
-x_135 = x_174;
-x_136 = x_176;
-x_137 = x_175;
-x_138 = x_239;
-x_139 = x_242;
-x_140 = x_167;
-x_141 = x_236;
-x_142 = x_243;
-x_143 = x_255;
-x_144 = x_183;
-x_145 = x_187;
-x_146 = x_240;
-x_147 = x_234;
-x_148 = x_179;
-x_149 = x_247;
-x_150 = x_245;
-x_151 = x_188;
-x_152 = x_238;
-x_153 = x_250;
-x_154 = x_180;
-x_155 = x_249;
-x_156 = x_184;
-x_157 = x_254;
-x_158 = x_246;
-x_159 = x_178;
-x_160 = x_170;
-x_161 = x_237;
-x_162 = lean_box(0);
-x_163 = x_248;
-x_164 = x_182;
-x_165 = x_172;
+lean_inc_ref(x_234);
+lean_inc(x_238);
+lean_inc_ref(x_236);
+lean_inc_ref(x_237);
+lean_inc(x_247);
+lean_inc(x_249);
+x_129 = x_249;
+x_130 = x_184;
+x_131 = x_247;
+x_132 = x_181;
+x_133 = x_250;
+x_134 = x_176;
+x_135 = x_242;
+x_136 = x_178;
+x_137 = x_237;
+x_138 = x_186;
+x_139 = x_167;
+x_140 = x_255;
+x_141 = x_171;
+x_142 = lean_box(0);
+x_143 = x_187;
+x_144 = x_172;
+x_145 = x_180;
+x_146 = x_173;
+x_147 = x_254;
+x_148 = x_240;
+x_149 = x_182;
+x_150 = x_185;
+x_151 = x_236;
+x_152 = x_168;
+x_153 = x_238;
+x_154 = x_234;
+x_155 = x_239;
+x_156 = x_170;
+x_157 = x_179;
+x_158 = x_177;
+x_159 = x_245;
+x_160 = x_248;
+x_161 = x_243;
+x_162 = x_183;
+x_163 = x_188;
+x_164 = x_246;
+x_165 = x_169;
 goto block_166;
 }
 else
 {
-lean_inc(x_248);
-lean_inc_ref(x_237);
 lean_inc(x_246);
-lean_inc(x_249);
-lean_inc(x_238);
-lean_inc(x_247);
-lean_inc_ref(x_234);
-lean_inc_ref(x_236);
+lean_inc(x_248);
 lean_inc(x_239);
-x_129 = x_168;
-x_130 = x_169;
-x_131 = x_185;
-x_132 = x_171;
-x_133 = x_181;
-x_134 = x_186;
-x_135 = x_174;
-x_136 = x_176;
-x_137 = x_175;
-x_138 = x_239;
-x_139 = x_242;
-x_140 = x_167;
-x_141 = x_236;
-x_142 = x_243;
-x_143 = x_255;
-x_144 = x_183;
-x_145 = x_187;
-x_146 = x_240;
-x_147 = x_234;
-x_148 = x_179;
-x_149 = x_247;
-x_150 = x_245;
-x_151 = x_188;
-x_152 = x_238;
-x_153 = x_250;
-x_154 = x_180;
-x_155 = x_249;
-x_156 = x_184;
-x_157 = x_254;
-x_158 = x_246;
-x_159 = x_178;
-x_160 = x_170;
-x_161 = x_237;
-x_162 = lean_box(0);
-x_163 = x_248;
-x_164 = x_182;
+lean_inc_ref(x_234);
+lean_inc(x_238);
+lean_inc_ref(x_236);
+lean_inc_ref(x_237);
+lean_inc(x_247);
+lean_inc(x_249);
+x_129 = x_249;
+x_130 = x_184;
+x_131 = x_247;
+x_132 = x_181;
+x_133 = x_250;
+x_134 = x_176;
+x_135 = x_242;
+x_136 = x_178;
+x_137 = x_237;
+x_138 = x_186;
+x_139 = x_167;
+x_140 = x_255;
+x_141 = x_171;
+x_142 = lean_box(0);
+x_143 = x_187;
+x_144 = x_172;
+x_145 = x_180;
+x_146 = x_173;
+x_147 = x_254;
+x_148 = x_240;
+x_149 = x_182;
+x_150 = x_185;
+x_151 = x_236;
+x_152 = x_168;
+x_153 = x_238;
+x_154 = x_234;
+x_155 = x_239;
+x_156 = x_170;
+x_157 = x_179;
+x_158 = x_177;
+x_159 = x_245;
+x_160 = x_248;
+x_161 = x_243;
+x_162 = x_183;
+x_163 = x_188;
+x_164 = x_246;
 x_165 = x_244;
 goto block_166;
 }
@@ -12140,13 +12141,13 @@ lean_dec_ref(x_181);
 lean_dec(x_180);
 lean_dec(x_179);
 lean_dec_ref(x_178);
-lean_dec_ref(x_176);
-lean_dec_ref(x_175);
-lean_dec_ref(x_174);
-lean_dec(x_173);
+lean_dec_ref(x_177);
+lean_dec(x_174);
+lean_dec_ref(x_173);
+lean_dec_ref(x_172);
+lean_dec_ref(x_171);
 lean_dec_ref(x_170);
-lean_dec(x_169);
-lean_dec_ref(x_168);
+lean_dec(x_168);
 lean_dec_ref(x_167);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
@@ -12171,13 +12172,13 @@ lean_dec(x_180);
 lean_dec(x_179);
 lean_dec_ref(x_178);
 lean_dec_ref(x_177);
-lean_dec_ref(x_176);
 lean_dec_ref(x_175);
-lean_dec_ref(x_174);
-lean_dec(x_173);
+lean_dec(x_174);
+lean_dec_ref(x_173);
+lean_dec_ref(x_172);
+lean_dec_ref(x_171);
 lean_dec_ref(x_170);
-lean_dec(x_169);
-lean_dec_ref(x_168);
+lean_dec(x_168);
 lean_dec_ref(x_167);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
@@ -12213,13 +12214,13 @@ lean_dec(x_180);
 lean_dec(x_179);
 lean_dec_ref(x_178);
 lean_dec_ref(x_177);
-lean_dec_ref(x_176);
 lean_dec_ref(x_175);
-lean_dec_ref(x_174);
-lean_dec(x_173);
+lean_dec(x_174);
+lean_dec_ref(x_173);
+lean_dec_ref(x_172);
+lean_dec_ref(x_171);
 lean_dec_ref(x_170);
-lean_dec(x_169);
-lean_dec_ref(x_168);
+lean_dec(x_168);
 lean_dec_ref(x_167);
 lean_dec_ref(x_8);
 lean_dec_ref(x_7);
@@ -12260,21 +12261,21 @@ x_288 = lean_unbox(x_287);
 lean_dec(x_287);
 if (x_288 == 0)
 {
-lean_inc_ref(x_278);
 lean_inc_ref(x_277);
 lean_inc(x_279);
-x_167 = x_261;
-x_168 = x_284;
-x_169 = x_283;
-x_170 = x_265;
-x_171 = x_281;
-x_172 = x_280;
-x_173 = x_279;
-x_174 = x_277;
-x_175 = x_278;
-x_176 = x_263;
-x_177 = x_262;
-x_178 = x_264;
+lean_inc_ref(x_278);
+x_167 = x_265;
+x_168 = x_283;
+x_169 = x_280;
+x_170 = x_262;
+x_171 = x_261;
+x_172 = x_278;
+x_173 = x_264;
+x_174 = x_279;
+x_175 = x_263;
+x_176 = x_281;
+x_177 = x_284;
+x_178 = x_277;
 x_179 = x_266;
 x_180 = x_267;
 x_181 = x_268;
@@ -12358,21 +12359,21 @@ x_305 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_M
 if (lean_obj_tag(x_305) == 0)
 {
 lean_dec_ref(x_305);
-lean_inc_ref(x_278);
 lean_inc_ref(x_277);
 lean_inc(x_279);
-x_167 = x_261;
-x_168 = x_284;
-x_169 = x_283;
-x_170 = x_265;
-x_171 = x_281;
-x_172 = x_280;
-x_173 = x_279;
-x_174 = x_277;
-x_175 = x_278;
-x_176 = x_263;
-x_177 = x_262;
-x_178 = x_264;
+lean_inc_ref(x_278);
+x_167 = x_265;
+x_168 = x_283;
+x_169 = x_280;
+x_170 = x_262;
+x_171 = x_261;
+x_172 = x_278;
+x_173 = x_264;
+x_174 = x_279;
+x_175 = x_263;
+x_176 = x_281;
+x_177 = x_284;
+x_178 = x_277;
 x_179 = x_266;
 x_180 = x_267;
 x_181 = x_268;
@@ -12669,7 +12670,7 @@ return x_320;
 block_345:
 {
 uint8_t x_337; 
-x_337 = l_Array_isEmpty___redArg(x_324);
+x_337 = l_Array_isEmpty___redArg(x_323);
 if (x_337 == 0)
 {
 lean_object* x_338; lean_object* x_339; 
@@ -12693,9 +12694,9 @@ x_340 = lean_ctor_get(x_339, 0);
 lean_inc(x_340);
 lean_dec_ref(x_339);
 x_261 = x_322;
-x_262 = x_323;
-x_263 = x_325;
-x_264 = x_324;
+x_262 = x_325;
+x_263 = x_324;
+x_264 = x_323;
 x_265 = x_340;
 x_266 = x_326;
 x_267 = x_327;
@@ -12753,9 +12754,9 @@ else
 lean_object* x_344; 
 x_344 = l_List_forIn_x27_loop___at___00Lean_Meta_Grind_propagateBeta_spec__1___redArg___closed__0;
 x_261 = x_322;
-x_262 = x_323;
-x_263 = x_325;
-x_264 = x_324;
+x_262 = x_325;
+x_263 = x_324;
+x_264 = x_323;
 x_265 = x_344;
 x_266 = x_326;
 x_267 = x_327;
@@ -12866,8 +12867,8 @@ x_373 = lean_ctor_get(x_372, 0);
 lean_inc(x_373);
 lean_dec_ref(x_372);
 x_322 = x_367;
-x_323 = x_361;
-x_324 = x_369;
+x_323 = x_369;
+x_324 = x_361;
 x_325 = x_373;
 x_326 = x_346;
 x_327 = x_347;
@@ -12924,8 +12925,8 @@ else
 lean_object* x_377; 
 x_377 = l_List_forIn_x27_loop___at___00Lean_Meta_Grind_propagateBeta_spec__1___redArg___closed__0;
 x_322 = x_367;
-x_323 = x_361;
-x_324 = x_369;
+x_323 = x_369;
+x_324 = x_361;
 x_325 = x_377;
 x_326 = x_346;
 x_327 = x_347;
@@ -13146,8 +13147,8 @@ x_408 = lean_ctor_get(x_407, 0);
 lean_inc(x_408);
 lean_dec_ref(x_407);
 x_322 = x_402;
-x_323 = x_386;
-x_324 = x_404;
+x_323 = x_404;
+x_324 = x_386;
 x_325 = x_408;
 x_326 = x_346;
 x_327 = x_347;
@@ -13205,8 +13206,8 @@ else
 lean_object* x_412; 
 x_412 = l_List_forIn_x27_loop___at___00Lean_Meta_Grind_propagateBeta_spec__1___redArg___closed__0;
 x_322 = x_402;
-x_323 = x_386;
-x_324 = x_404;
+x_323 = x_404;
+x_324 = x_386;
 x_325 = x_412;
 x_326 = x_346;
 x_327 = x_347;
@@ -13451,8 +13452,8 @@ x_445 = lean_ctor_get(x_444, 0);
 lean_inc(x_445);
 lean_dec_ref(x_444);
 x_322 = x_439;
-x_323 = x_421;
-x_324 = x_441;
+x_323 = x_441;
+x_324 = x_421;
 x_325 = x_445;
 x_326 = x_346;
 x_327 = x_347;
@@ -13510,8 +13511,8 @@ else
 lean_object* x_449; 
 x_449 = l_List_forIn_x27_loop___at___00Lean_Meta_Grind_propagateBeta_spec__1___redArg___closed__0;
 x_322 = x_439;
-x_323 = x_421;
-x_324 = x_441;
+x_323 = x_441;
+x_324 = x_421;
 x_325 = x_449;
 x_326 = x_346;
 x_327 = x_347;
@@ -13763,61 +13764,61 @@ x_27 = lean_ctor_get(x_25, 2);
 x_28 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_26, x_27);
 if (x_28 == 0)
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; uint8_t x_95; uint8_t x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; uint8_t x_123; lean_object* x_124; uint8_t x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_140; uint8_t x_141; lean_object* x_142; uint8_t x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_158; uint8_t x_159; lean_object* x_160; uint8_t x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_175; uint8_t x_176; lean_object* x_177; uint8_t x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; uint8_t x_190; lean_object* x_192; uint8_t x_193; lean_object* x_194; lean_object* x_195; uint8_t x_196; uint8_t x_197; uint8_t 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_213; uint8_t x_214; lean_object* x_215; uint8_t x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; uint8_t x_228; lean_object* x_239; lean_object* x_240; uint8_t x_241; uint8_t x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_257; uint8_t x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_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; uint8_t x_286; 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_317; lean_object* x_318; lean_object* x_326; lean_object* x_327; uint8_t x_328; 
-x_317 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___closed__3));
-x_326 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__1___redArg(x_317, x_13);
-x_327 = lean_ctor_get(x_326, 0);
-lean_inc(x_327);
-lean_dec_ref(x_326);
-x_328 = lean_unbox(x_327);
-lean_dec(x_327);
-if (x_328 == 0)
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_57; uint8_t x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_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; uint8_t x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; uint8_t x_95; lean_object* x_100; uint8_t x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; uint8_t x_123; lean_object* x_124; uint8_t x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_140; uint8_t x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; uint8_t x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_158; uint8_t x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; uint8_t x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_175; uint8_t 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; uint8_t x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; uint8_t x_190; lean_object* x_192; uint8_t x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; uint8_t x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; uint8_t x_209; uint8_t x_210; lean_object* x_213; uint8_t x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; uint8_t x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; uint8_t x_228; lean_object* x_239; uint8_t x_240; lean_object* x_241; uint8_t x_242; uint8_t x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_257; lean_object* x_258; uint8_t x_259; uint8_t x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_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; uint8_t x_285; lean_object* x_286; lean_object* x_287; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; uint8_t x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; uint8_t x_302; lean_object* x_303; lean_object* x_304; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; uint8_t x_328; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_362; lean_object* x_363; lean_object* x_371; lean_object* x_372; uint8_t x_373; 
+x_362 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___closed__3));
+x_371 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__1___redArg(x_362, x_13);
+x_372 = lean_ctor_get(x_371, 0);
+lean_inc(x_372);
+lean_dec_ref(x_371);
+x_373 = lean_unbox(x_372);
+lean_dec(x_372);
+if (x_373 == 0)
 {
-x_290 = x_5;
-x_291 = x_6;
-x_292 = x_7;
-x_293 = x_8;
-x_294 = x_9;
-x_295 = x_10;
-x_296 = x_11;
-x_297 = x_12;
-x_298 = x_13;
-x_299 = x_14;
-x_300 = lean_box(0);
-goto block_316;
+x_335 = x_5;
+x_336 = x_6;
+x_337 = x_7;
+x_338 = x_8;
+x_339 = x_9;
+x_340 = x_10;
+x_341 = x_11;
+x_342 = x_12;
+x_343 = x_13;
+x_344 = x_14;
+x_345 = lean_box(0);
+goto block_361;
 }
 else
 {
-lean_object* x_329; 
-x_329 = l_Lean_Meta_Grind_updateLastTag(x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_329) == 0)
+lean_object* x_374; 
+x_374 = l_Lean_Meta_Grind_updateLastTag(x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_374) == 0)
 {
-lean_dec_ref(x_329);
+lean_dec_ref(x_374);
 if (x_4 == 0)
 {
-lean_object* x_330; 
+lean_object* x_375; 
 lean_inc(x_14);
 lean_inc_ref(x_13);
 lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_330 = l_Lean_Meta_mkEq(x_1, x_2, x_11, x_12, x_13, x_14);
-x_318 = x_330;
-goto block_325;
+x_375 = l_Lean_Meta_mkEq(x_1, x_2, x_11, x_12, x_13, x_14);
+x_363 = x_375;
+goto block_370;
 }
 else
 {
-lean_object* x_331; 
+lean_object* x_376; 
 lean_inc(x_14);
 lean_inc_ref(x_13);
 lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_331 = l_Lean_Meta_mkHEq(x_1, x_2, x_11, x_12, x_13, x_14);
-x_318 = x_331;
-goto block_325;
+x_376 = l_Lean_Meta_mkHEq(x_1, x_2, x_11, x_12, x_13, x_14);
+x_363 = x_376;
+goto block_370;
 }
 }
 else
@@ -13837,7 +13838,7 @@ lean_dec(x_5);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-return x_329;
+return x_374;
 }
 }
 block_56:
@@ -13963,10 +13964,10 @@ x_73 = lean_unbox(x_72);
 lean_dec(x_72);
 if (x_73 == 0)
 {
-if (x_57 == 0)
+if (x_58 == 0)
 {
 lean_dec_ref(x_59);
-lean_dec_ref(x_58);
+lean_dec_ref(x_57);
 x_29 = x_60;
 x_30 = x_61;
 x_31 = x_62;
@@ -13983,12 +13984,12 @@ goto block_56;
 else
 {
 lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_59, 0);
+x_74 = lean_ctor_get(x_57, 0);
 lean_inc_ref(x_74);
-lean_dec_ref(x_59);
-x_75 = lean_ctor_get(x_58, 0);
+lean_dec_ref(x_57);
+x_75 = lean_ctor_get(x_59, 0);
 lean_inc_ref(x_75);
-lean_dec_ref(x_58);
+lean_dec_ref(x_59);
 lean_inc(x_69);
 lean_inc_ref(x_68);
 lean_inc(x_67);
@@ -14035,7 +14036,7 @@ return x_76;
 else
 {
 lean_dec_ref(x_59);
-lean_dec_ref(x_58);
+lean_dec_ref(x_57);
 x_29 = x_60;
 x_30 = x_61;
 x_31 = x_62;
@@ -14064,7 +14065,7 @@ lean_dec_ref(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_dec_ref(x_59);
-lean_dec_ref(x_58);
+lean_dec_ref(x_57);
 x_77 = !lean_is_exclusive(x_71);
 if (x_77 == 0)
 {
@@ -14086,73 +14087,73 @@ block_99:
 {
 if (x_95 == 0)
 {
-x_57 = x_84;
-x_58 = x_85;
-x_59 = x_94;
-x_60 = x_86;
-x_61 = x_81;
-x_62 = x_91;
-x_63 = x_89;
-x_64 = x_87;
-x_65 = x_82;
-x_66 = x_92;
-x_67 = x_93;
-x_68 = x_90;
-x_69 = x_88;
+x_57 = x_83;
+x_58 = x_88;
+x_59 = x_93;
+x_60 = x_89;
+x_61 = x_90;
+x_62 = x_87;
+x_63 = x_92;
+x_64 = x_85;
+x_65 = x_91;
+x_66 = x_94;
+x_67 = x_84;
+x_68 = x_81;
+x_69 = x_86;
 x_70 = lean_box(0);
 goto block_80;
 }
 else
 {
 lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_94, 0);
-x_97 = lean_ctor_get(x_85, 0);
-lean_inc(x_88);
-lean_inc_ref(x_90);
-lean_inc(x_93);
-lean_inc_ref(x_92);
-lean_inc(x_82);
-lean_inc_ref(x_87);
-lean_inc(x_89);
-lean_inc_ref(x_91);
-lean_inc(x_81);
+x_96 = lean_ctor_get(x_83, 0);
+x_97 = lean_ctor_get(x_93, 0);
 lean_inc(x_86);
+lean_inc_ref(x_81);
+lean_inc(x_84);
+lean_inc_ref(x_94);
+lean_inc(x_91);
+lean_inc_ref(x_85);
+lean_inc(x_92);
+lean_inc_ref(x_87);
+lean_inc(x_90);
+lean_inc(x_89);
 lean_inc_ref(x_97);
 lean_inc_ref(x_96);
-x_98 = l_Lean_Meta_Grind_propagateCtor(x_96, x_97, x_86, x_81, x_91, x_89, x_87, x_82, x_92, x_93, x_90, x_88);
+x_98 = l_Lean_Meta_Grind_propagateCtor(x_96, x_97, x_89, x_90, x_87, x_92, x_85, x_91, x_94, x_84, x_81, x_86);
 if (lean_obj_tag(x_98) == 0)
 {
 lean_dec_ref(x_98);
-x_57 = x_84;
-x_58 = x_85;
-x_59 = x_94;
-x_60 = x_86;
-x_61 = x_81;
-x_62 = x_91;
-x_63 = x_89;
-x_64 = x_87;
-x_65 = x_82;
-x_66 = x_92;
-x_67 = x_93;
-x_68 = x_90;
-x_69 = x_88;
+x_57 = x_83;
+x_58 = x_88;
+x_59 = x_93;
+x_60 = x_89;
+x_61 = x_90;
+x_62 = x_87;
+x_63 = x_92;
+x_64 = x_85;
+x_65 = x_91;
+x_66 = x_94;
+x_67 = x_84;
+x_68 = x_81;
+x_69 = x_86;
 x_70 = lean_box(0);
 goto block_80;
 }
 else
 {
 lean_dec_ref(x_94);
-lean_dec(x_93);
-lean_dec_ref(x_92);
-lean_dec_ref(x_91);
-lean_dec_ref(x_90);
+lean_dec_ref(x_93);
+lean_dec(x_92);
+lean_dec(x_91);
+lean_dec(x_90);
 lean_dec(x_89);
-lean_dec(x_88);
 lean_dec_ref(x_87);
 lean_dec(x_86);
 lean_dec_ref(x_85);
-lean_dec(x_82);
-lean_dec(x_81);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec_ref(x_81);
 return x_98;
 }
 }
@@ -14172,44 +14173,44 @@ lean_dec(x_115);
 if (x_116 == 0)
 {
 uint8_t x_117; 
-x_117 = lean_ctor_get_uint8(x_102, sizeof(void*)*11 + 2);
+x_117 = lean_ctor_get_uint8(x_100, sizeof(void*)*11 + 2);
 if (x_117 == 0)
 {
-x_81 = x_104;
-x_82 = x_108;
-x_83 = lean_box(0);
-x_84 = x_100;
-x_85 = x_101;
-x_86 = x_103;
-x_87 = x_107;
-x_88 = x_112;
-x_89 = x_106;
-x_90 = x_111;
-x_91 = x_105;
-x_92 = x_109;
-x_93 = x_110;
-x_94 = x_102;
+x_81 = x_111;
+x_82 = lean_box(0);
+x_83 = x_100;
+x_84 = x_110;
+x_85 = x_107;
+x_86 = x_112;
+x_87 = x_105;
+x_88 = x_101;
+x_89 = x_103;
+x_90 = x_104;
+x_91 = x_108;
+x_92 = x_106;
+x_93 = x_102;
+x_94 = x_109;
 x_95 = x_28;
 goto block_99;
 }
 else
 {
 uint8_t x_118; 
-x_118 = lean_ctor_get_uint8(x_101, sizeof(void*)*11 + 2);
-x_81 = x_104;
-x_82 = x_108;
-x_83 = lean_box(0);
-x_84 = x_100;
-x_85 = x_101;
-x_86 = x_103;
-x_87 = x_107;
-x_88 = x_112;
-x_89 = x_106;
-x_90 = x_111;
-x_91 = x_105;
-x_92 = x_109;
-x_93 = x_110;
-x_94 = x_102;
+x_118 = lean_ctor_get_uint8(x_102, sizeof(void*)*11 + 2);
+x_81 = x_111;
+x_82 = lean_box(0);
+x_83 = x_100;
+x_84 = x_110;
+x_85 = x_107;
+x_86 = x_112;
+x_87 = x_105;
+x_88 = x_101;
+x_89 = x_103;
+x_90 = x_104;
+x_91 = x_108;
+x_92 = x_106;
+x_93 = x_102;
+x_94 = x_109;
 x_95 = x_118;
 goto block_99;
 }
@@ -14247,7 +14248,7 @@ lean_dec_ref(x_105);
 lean_dec(x_104);
 lean_dec(x_103);
 lean_dec_ref(x_102);
-lean_dec_ref(x_101);
+lean_dec_ref(x_100);
 x_119 = !lean_is_exclusive(x_114);
 if (x_119 == 0)
 {
@@ -14267,10 +14268,10 @@ return x_121;
 }
 block_139:
 {
-if (x_125 == 0)
+if (x_123 == 0)
 {
-x_100 = x_123;
-x_101 = x_124;
+x_100 = x_124;
+x_101 = x_125;
 x_102 = x_126;
 x_103 = x_127;
 x_104 = x_128;
@@ -14302,8 +14303,8 @@ x_138 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_closeGoalWith
 if (lean_obj_tag(x_138) == 0)
 {
 lean_dec_ref(x_138);
-x_100 = x_123;
-x_101 = x_124;
+x_100 = x_124;
+x_101 = x_125;
 x_102 = x_126;
 x_103 = x_127;
 x_104 = x_128;
@@ -14340,36 +14341,36 @@ block_157:
 {
 uint8_t x_155; lean_object* x_156; 
 x_155 = 1;
-lean_inc(x_140);
-lean_inc_ref(x_146);
 lean_inc(x_150);
-lean_inc_ref(x_149);
-lean_inc(x_145);
-lean_inc_ref(x_148);
+lean_inc_ref(x_144);
+lean_inc(x_152);
+lean_inc_ref(x_140);
+lean_inc(x_143);
+lean_inc_ref(x_146);
 lean_inc(x_153);
-lean_inc_ref(x_147);
-lean_inc(x_144);
-lean_inc(x_151);
-lean_inc_ref(x_154);
+lean_inc_ref(x_151);
+lean_inc(x_147);
+lean_inc(x_145);
 lean_inc_ref(x_142);
-x_156 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go(x_3, x_4, x_2, x_1, x_25, x_22, x_142, x_154, x_155, x_151, x_144, x_147, x_153, x_148, x_145, x_149, x_150, x_146, x_140);
+lean_inc_ref(x_154);
+x_156 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go(x_3, x_4, x_2, x_1, x_25, x_22, x_154, x_142, x_155, x_145, x_147, x_151, x_153, x_146, x_143, x_140, x_152, x_144, x_150);
 if (lean_obj_tag(x_156) == 0)
 {
 lean_dec_ref(x_156);
 x_123 = x_141;
 x_124 = x_142;
-x_125 = x_143;
+x_125 = x_148;
 x_126 = x_154;
-x_127 = x_151;
-x_128 = x_144;
-x_129 = x_147;
+x_127 = x_145;
+x_128 = x_147;
+x_129 = x_151;
 x_130 = x_153;
-x_131 = x_148;
-x_132 = x_145;
-x_133 = x_149;
-x_134 = x_150;
-x_135 = x_146;
-x_136 = x_140;
+x_131 = x_146;
+x_132 = x_143;
+x_133 = x_140;
+x_134 = x_152;
+x_135 = x_144;
+x_136 = x_150;
 x_137 = lean_box(0);
 goto block_139;
 }
@@ -14377,52 +14378,52 @@ else
 {
 lean_dec_ref(x_154);
 lean_dec(x_153);
-lean_dec(x_151);
+lean_dec(x_152);
+lean_dec_ref(x_151);
 lean_dec(x_150);
-lean_dec_ref(x_149);
-lean_dec_ref(x_148);
-lean_dec_ref(x_147);
+lean_dec(x_147);
 lean_dec_ref(x_146);
 lean_dec(x_145);
-lean_dec(x_144);
+lean_dec_ref(x_144);
+lean_dec(x_143);
 lean_dec_ref(x_142);
-lean_dec(x_140);
+lean_dec_ref(x_140);
 return x_156;
 }
 }
 block_174:
 {
 lean_object* x_173; 
-lean_inc(x_158);
-lean_inc_ref(x_164);
 lean_inc(x_168);
-lean_inc_ref(x_167);
-lean_inc(x_163);
-lean_inc_ref(x_166);
+lean_inc_ref(x_162);
+lean_inc(x_170);
+lean_inc_ref(x_158);
+lean_inc(x_161);
+lean_inc_ref(x_164);
 lean_inc(x_171);
-lean_inc_ref(x_165);
-lean_inc(x_162);
-lean_inc(x_169);
-lean_inc_ref(x_160);
+lean_inc_ref(x_169);
+lean_inc(x_165);
+lean_inc(x_163);
 lean_inc_ref(x_172);
-x_173 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go(x_3, x_4, x_1, x_2, x_22, x_25, x_172, x_160, x_28, x_169, x_162, x_165, x_171, x_166, x_163, x_167, x_168, x_164, x_158);
+lean_inc_ref(x_160);
+x_173 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go(x_3, x_4, x_1, x_2, x_22, x_25, x_160, x_172, x_28, x_163, x_165, x_169, x_171, x_164, x_161, x_158, x_170, x_162, x_168);
 if (lean_obj_tag(x_173) == 0)
 {
 lean_dec_ref(x_173);
 x_123 = x_159;
 x_124 = x_160;
-x_125 = x_161;
+x_125 = x_166;
 x_126 = x_172;
-x_127 = x_169;
-x_128 = x_162;
-x_129 = x_165;
+x_127 = x_163;
+x_128 = x_165;
+x_129 = x_169;
 x_130 = x_171;
-x_131 = x_166;
-x_132 = x_163;
-x_133 = x_167;
-x_134 = x_168;
-x_135 = x_164;
-x_136 = x_158;
+x_131 = x_164;
+x_132 = x_161;
+x_133 = x_158;
+x_134 = x_170;
+x_135 = x_162;
+x_136 = x_168;
 x_137 = lean_box(0);
 goto block_139;
 }
@@ -14430,16 +14431,16 @@ else
 {
 lean_dec_ref(x_172);
 lean_dec(x_171);
-lean_dec(x_169);
+lean_dec(x_170);
+lean_dec_ref(x_169);
 lean_dec(x_168);
-lean_dec_ref(x_167);
-lean_dec_ref(x_166);
-lean_dec_ref(x_165);
+lean_dec(x_165);
 lean_dec_ref(x_164);
 lean_dec(x_163);
-lean_dec(x_162);
+lean_dec_ref(x_162);
+lean_dec(x_161);
 lean_dec_ref(x_160);
-lean_dec(x_158);
+lean_dec_ref(x_158);
 return x_173;
 }
 }
@@ -14456,10 +14457,10 @@ x_163 = x_180;
 x_164 = x_181;
 x_165 = x_182;
 x_166 = x_183;
-x_167 = x_184;
+x_167 = lean_box(0);
 x_168 = x_185;
 x_169 = x_186;
-x_170 = lean_box(0);
+x_170 = x_187;
 x_171 = x_188;
 x_172 = x_189;
 goto block_174;
@@ -14475,10 +14476,10 @@ x_145 = x_180;
 x_146 = x_181;
 x_147 = x_182;
 x_148 = x_183;
-x_149 = x_184;
+x_149 = lean_box(0);
 x_150 = x_185;
 x_151 = x_186;
-x_152 = lean_box(0);
+x_152 = x_187;
 x_153 = x_188;
 x_154 = x_189;
 goto block_157;
@@ -14487,72 +14488,72 @@ goto block_157;
 block_212:
 {
 uint8_t x_211; 
-x_211 = lean_nat_dec_lt(x_195, x_210);
-lean_dec(x_210);
+x_211 = lean_nat_dec_lt(x_208, x_195);
 lean_dec(x_195);
+lean_dec(x_208);
 if (x_211 == 0)
 {
 x_175 = x_192;
 x_176 = x_193;
 x_177 = x_194;
-x_178 = x_198;
-x_179 = x_199;
-x_180 = x_200;
-x_181 = x_201;
-x_182 = x_202;
-x_183 = x_203;
-x_184 = x_204;
-x_185 = x_205;
-x_186 = x_206;
-x_187 = lean_box(0);
-x_188 = x_208;
-x_189 = x_209;
+x_178 = x_196;
+x_179 = x_197;
+x_180 = x_198;
+x_181 = x_199;
+x_182 = x_200;
+x_183 = x_201;
+x_184 = lean_box(0);
+x_185 = x_203;
+x_186 = x_205;
+x_187 = x_204;
+x_188 = x_206;
+x_189 = x_207;
 x_190 = x_28;
 goto block_191;
 }
 else
 {
-if (x_196 == 0)
+if (x_209 == 0)
 {
 if (x_211 == 0)
 {
 x_175 = x_192;
 x_176 = x_193;
 x_177 = x_194;
-x_178 = x_198;
-x_179 = x_199;
-x_180 = x_200;
-x_181 = x_201;
-x_182 = x_202;
-x_183 = x_203;
-x_184 = x_204;
-x_185 = x_205;
-x_186 = x_206;
-x_187 = lean_box(0);
-x_188 = x_208;
-x_189 = x_209;
+x_178 = x_196;
+x_179 = x_197;
+x_180 = x_198;
+x_181 = x_199;
+x_182 = x_200;
+x_183 = x_201;
+x_184 = lean_box(0);
+x_185 = x_203;
+x_186 = x_205;
+x_187 = x_204;
+x_188 = x_206;
+x_189 = x_207;
 x_190 = x_28;
 goto block_191;
 }
 else
 {
-if (x_197 == 0)
+if (x_210 == 0)
 {
 x_175 = x_192;
 x_176 = x_193;
 x_177 = x_194;
-x_178 = x_198;
-x_179 = x_199;
-x_180 = x_200;
-x_181 = x_201;
-x_182 = x_202;
-x_183 = x_203;
-x_184 = x_204;
-x_185 = x_205;
-x_186 = x_206;
-x_187 = lean_box(0);
-x_188 = x_208;
-x_189 = x_209;
+x_178 = x_196;
+x_179 = x_197;
+x_180 = x_198;
+x_181 = x_199;
+x_182 = x_200;
+x_183 = x_201;
+x_184 = lean_box(0);
+x_185 = x_203;
+x_186 = x_205;
+x_187 = x_204;
+x_188 = x_206;
+x_189 = x_207;
 x_190 = x_211;
 goto block_191;
 }
@@ -14561,18 +14562,18 @@ else
 x_158 = x_192;
 x_159 = x_193;
 x_160 = x_194;
-x_161 = x_198;
-x_162 = x_199;
-x_163 = x_200;
-x_164 = x_201;
-x_165 = x_202;
-x_166 = x_203;
-x_167 = x_204;
-x_168 = x_205;
-x_169 = x_206;
-x_170 = lean_box(0);
-x_171 = x_208;
-x_172 = x_209;
+x_161 = x_196;
+x_162 = x_197;
+x_163 = x_198;
+x_164 = x_199;
+x_165 = x_200;
+x_166 = x_201;
+x_167 = lean_box(0);
+x_168 = x_203;
+x_169 = x_205;
+x_170 = x_204;
+x_171 = x_206;
+x_172 = x_207;
 goto block_174;
 }
 }
@@ -14582,18 +14583,18 @@ else
 x_175 = x_192;
 x_176 = x_193;
 x_177 = x_194;
-x_178 = x_198;
-x_179 = x_199;
-x_180 = x_200;
-x_181 = x_201;
-x_182 = x_202;
-x_183 = x_203;
-x_184 = x_204;
-x_185 = x_205;
-x_186 = x_206;
-x_187 = lean_box(0);
-x_188 = x_208;
-x_189 = x_209;
+x_178 = x_196;
+x_179 = x_197;
+x_180 = x_198;
+x_181 = x_199;
+x_182 = x_200;
+x_183 = x_201;
+x_184 = lean_box(0);
+x_185 = x_203;
+x_186 = x_205;
+x_187 = x_204;
+x_188 = x_206;
+x_189 = x_207;
 x_190 = x_28;
 goto block_191;
 }
@@ -14604,37 +14605,37 @@ block_238:
 if (x_228 == 0)
 {
 uint8_t x_229; 
-x_229 = lean_ctor_get_uint8(x_227, sizeof(void*)*11 + 2);
+x_229 = lean_ctor_get_uint8(x_215, sizeof(void*)*11 + 2);
 if (x_229 == 0)
 {
 if (x_28 == 0)
 {
 lean_object* x_230; lean_object* x_231; uint8_t x_232; uint8_t x_233; 
-x_230 = lean_ctor_get(x_227, 6);
+x_230 = lean_ctor_get(x_215, 6);
 lean_inc(x_230);
-x_231 = lean_ctor_get(x_215, 6);
+x_231 = lean_ctor_get(x_227, 6);
 lean_inc(x_231);
-x_232 = lean_ctor_get_uint8(x_215, sizeof(void*)*11 + 1);
-x_233 = lean_ctor_get_uint8(x_215, sizeof(void*)*11 + 2);
+x_232 = lean_ctor_get_uint8(x_227, sizeof(void*)*11 + 1);
+x_233 = lean_ctor_get_uint8(x_227, sizeof(void*)*11 + 2);
 x_192 = x_213;
 x_193 = x_214;
 x_194 = x_215;
-x_195 = x_231;
-x_196 = x_232;
-x_197 = x_233;
-x_198 = x_216;
-x_199 = x_217;
-x_200 = x_218;
-x_201 = x_219;
-x_202 = x_220;
-x_203 = x_221;
-x_204 = x_222;
-x_205 = x_223;
-x_206 = x_224;
-x_207 = lean_box(0);
-x_208 = x_226;
-x_209 = x_227;
-x_210 = x_230;
+x_195 = x_230;
+x_196 = x_216;
+x_197 = x_217;
+x_198 = x_218;
+x_199 = x_219;
+x_200 = x_220;
+x_201 = x_221;
+x_202 = lean_box(0);
+x_203 = x_223;
+x_204 = x_224;
+x_205 = x_225;
+x_206 = x_226;
+x_207 = x_227;
+x_208 = x_231;
+x_209 = x_232;
+x_210 = x_233;
 goto block_212;
 }
 else
@@ -14648,10 +14649,10 @@ x_145 = x_218;
 x_146 = x_219;
 x_147 = x_220;
 x_148 = x_221;
-x_149 = x_222;
+x_149 = lean_box(0);
 x_150 = x_223;
-x_151 = x_224;
-x_152 = lean_box(0);
+x_151 = x_225;
+x_152 = x_224;
 x_153 = x_226;
 x_154 = x_227;
 goto block_157;
@@ -14660,7 +14661,7 @@ goto block_157;
 else
 {
 uint8_t x_234; 
-x_234 = lean_ctor_get_uint8(x_215, sizeof(void*)*11 + 2);
+x_234 = lean_ctor_get_uint8(x_227, sizeof(void*)*11 + 2);
 if (x_234 == 0)
 {
 x_140 = x_213;
@@ -14672,10 +14673,10 @@ x_145 = x_218;
 x_146 = x_219;
 x_147 = x_220;
 x_148 = x_221;
-x_149 = x_222;
+x_149 = lean_box(0);
 x_150 = x_223;
-x_151 = x_224;
-x_152 = lean_box(0);
+x_151 = x_225;
+x_152 = x_224;
 x_153 = x_226;
 x_154 = x_227;
 goto block_157;
@@ -14683,30 +14684,30 @@ goto block_157;
 else
 {
 lean_object* x_235; lean_object* x_236; uint8_t x_237; 
-x_235 = lean_ctor_get(x_227, 6);
+x_235 = lean_ctor_get(x_215, 6);
 lean_inc(x_235);
-x_236 = lean_ctor_get(x_215, 6);
+x_236 = lean_ctor_get(x_227, 6);
 lean_inc(x_236);
-x_237 = lean_ctor_get_uint8(x_215, sizeof(void*)*11 + 1);
+x_237 = lean_ctor_get_uint8(x_227, sizeof(void*)*11 + 1);
 x_192 = x_213;
 x_193 = x_214;
 x_194 = x_215;
-x_195 = x_236;
-x_196 = x_237;
-x_197 = x_234;
-x_198 = x_216;
-x_199 = x_217;
-x_200 = x_218;
-x_201 = x_219;
-x_202 = x_220;
-x_203 = x_221;
-x_204 = x_222;
-x_205 = x_223;
-x_206 = x_224;
-x_207 = lean_box(0);
-x_208 = x_226;
-x_209 = x_227;
-x_210 = x_235;
+x_195 = x_235;
+x_196 = x_216;
+x_197 = x_217;
+x_198 = x_218;
+x_199 = x_219;
+x_200 = x_220;
+x_201 = x_221;
+x_202 = lean_box(0);
+x_203 = x_223;
+x_204 = x_224;
+x_205 = x_225;
+x_206 = x_226;
+x_207 = x_227;
+x_208 = x_236;
+x_209 = x_237;
+x_210 = x_234;
 goto block_212;
 }
 }
@@ -14722,10 +14723,10 @@ x_145 = x_218;
 x_146 = x_219;
 x_147 = x_220;
 x_148 = x_221;
-x_149 = x_222;
+x_149 = lean_box(0);
 x_150 = x_223;
-x_151 = x_224;
-x_152 = lean_box(0);
+x_151 = x_225;
+x_152 = x_224;
 x_153 = x_226;
 x_154 = x_227;
 goto block_157;
@@ -14733,587 +14734,587 @@ goto block_157;
 }
 block_256:
 {
-uint8_t x_254; 
-x_254 = lean_ctor_get_uint8(x_240, sizeof(void*)*11 + 1);
-if (x_254 == 0)
+if (x_240 == 0)
 {
-x_213 = x_252;
+x_213 = x_250;
 x_214 = x_242;
 x_215 = x_239;
-x_216 = x_241;
-x_217 = x_244;
-x_218 = x_248;
-x_219 = x_251;
+x_216 = x_249;
+x_217 = x_252;
+x_218 = x_244;
+x_219 = x_248;
 x_220 = x_245;
-x_221 = x_247;
-x_222 = x_249;
-x_223 = x_250;
-x_224 = x_243;
-x_225 = lean_box(0);
-x_226 = x_246;
-x_227 = x_240;
+x_221 = x_243;
+x_222 = lean_box(0);
+x_223 = x_253;
+x_224 = x_251;
+x_225 = x_246;
+x_226 = x_247;
+x_227 = x_241;
 x_228 = x_28;
 goto block_238;
 }
 else
 {
 uint8_t x_255; 
-x_255 = lean_ctor_get_uint8(x_239, sizeof(void*)*11 + 1);
+x_255 = lean_ctor_get_uint8(x_241, sizeof(void*)*11 + 1);
 if (x_255 == 0)
 {
-x_140 = x_252;
+x_140 = x_250;
 x_141 = x_242;
 x_142 = x_239;
-x_143 = x_241;
-x_144 = x_244;
-x_145 = x_248;
-x_146 = x_251;
+x_143 = x_249;
+x_144 = x_252;
+x_145 = x_244;
+x_146 = x_248;
 x_147 = x_245;
-x_148 = x_247;
-x_149 = x_249;
-x_150 = x_250;
-x_151 = x_243;
-x_152 = lean_box(0);
-x_153 = x_246;
-x_154 = x_240;
+x_148 = x_243;
+x_149 = lean_box(0);
+x_150 = x_253;
+x_151 = x_246;
+x_152 = x_251;
+x_153 = x_247;
+x_154 = x_241;
 goto block_157;
 }
 else
 {
-x_213 = x_252;
+x_213 = x_250;
 x_214 = x_242;
 x_215 = x_239;
-x_216 = x_241;
-x_217 = x_244;
-x_218 = x_248;
-x_219 = x_251;
+x_216 = x_249;
+x_217 = x_252;
+x_218 = x_244;
+x_219 = x_248;
 x_220 = x_245;
-x_221 = x_247;
-x_222 = x_249;
-x_223 = x_250;
-x_224 = x_243;
-x_225 = lean_box(0);
-x_226 = x_246;
-x_227 = x_240;
+x_221 = x_243;
+x_222 = lean_box(0);
+x_223 = x_253;
+x_224 = x_251;
+x_225 = x_246;
+x_226 = x_247;
+x_227 = x_241;
 x_228 = x_28;
 goto block_238;
 }
 }
 }
-block_272:
+block_273:
 {
-lean_object* x_271; 
-x_271 = l_Lean_Meta_Grind_markAsInconsistent___redArg(x_265, x_260, x_267, x_270, x_268);
-if (lean_obj_tag(x_271) == 0)
-{
-lean_dec_ref(x_271);
-x_239 = x_259;
-x_240 = x_269;
+uint8_t x_272; 
+x_272 = lean_ctor_get_uint8(x_257, sizeof(void*)*11 + 1);
+x_239 = x_257;
+x_240 = x_272;
 x_241 = x_258;
-x_242 = x_28;
-x_243 = x_265;
-x_244 = x_264;
+x_242 = x_259;
+x_243 = x_260;
+x_244 = x_261;
 x_245 = x_262;
-x_246 = x_266;
-x_247 = x_261;
-x_248 = x_263;
-x_249 = x_260;
+x_246 = x_263;
+x_247 = x_264;
+x_248 = x_265;
+x_249 = x_266;
 x_250 = x_267;
-x_251 = x_270;
-x_252 = x_268;
-x_253 = lean_box(0);
+x_251 = x_268;
+x_252 = x_269;
+x_253 = x_270;
+x_254 = lean_box(0);
 goto block_256;
 }
-else
-{
-lean_dec_ref(x_270);
-lean_dec_ref(x_269);
-lean_dec(x_268);
-lean_dec(x_267);
-lean_dec(x_266);
-lean_dec(x_265);
-lean_dec(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec_ref(x_261);
-lean_dec_ref(x_260);
-lean_dec_ref(x_259);
-lean_dec(x_25);
-lean_dec(x_22);
-lean_dec_ref(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-return x_271;
-}
-}
 block_289:
 {
-if (x_286 == 0)
+lean_object* x_288; 
+x_288 = l_Lean_Meta_Grind_markAsInconsistent___redArg(x_278, x_279, x_274, x_280, x_287);
+if (lean_obj_tag(x_288) == 0)
 {
-x_239 = x_274;
-x_240 = x_285;
-x_241 = x_28;
-x_242 = x_28;
-x_243 = x_280;
-x_244 = x_279;
-x_245 = x_277;
-x_246 = x_281;
-x_247 = x_275;
-x_248 = x_278;
-x_249 = x_276;
-x_250 = x_282;
-x_251 = x_284;
-x_252 = x_283;
-x_253 = lean_box(0);
-goto block_256;
-}
-else
-{
-uint8_t x_287; 
-lean_inc_ref(x_26);
-x_287 = l_Lean_Expr_isTrue(x_26);
-if (x_287 == 0)
-{
-uint8_t x_288; 
-lean_inc_ref(x_27);
-x_288 = l_Lean_Expr_isTrue(x_27);
-if (x_288 == 0)
-{
-x_239 = x_274;
-x_240 = x_285;
-x_241 = x_28;
-x_242 = x_286;
-x_243 = x_280;
-x_244 = x_279;
-x_245 = x_277;
-x_246 = x_281;
-x_247 = x_275;
-x_248 = x_278;
-x_249 = x_276;
-x_250 = x_282;
-x_251 = x_284;
-x_252 = x_283;
-x_253 = lean_box(0);
-goto block_256;
-}
-else
-{
-x_257 = lean_box(0);
+lean_dec_ref(x_288);
+x_257 = x_275;
 x_258 = x_286;
-x_259 = x_274;
-x_260 = x_276;
-x_261 = x_275;
-x_262 = x_277;
-x_263 = x_278;
-x_264 = x_279;
-x_265 = x_280;
-x_266 = x_281;
-x_267 = x_282;
-x_268 = x_283;
-x_269 = x_285;
-x_270 = x_284;
-goto block_272;
-}
+x_259 = x_285;
+x_260 = x_28;
+x_261 = x_278;
+x_262 = x_276;
+x_263 = x_282;
+x_264 = x_283;
+x_265 = x_277;
+x_266 = x_284;
+x_267 = x_279;
+x_268 = x_274;
+x_269 = x_280;
+x_270 = x_287;
+x_271 = lean_box(0);
+goto block_273;
 }
 else
 {
-x_257 = lean_box(0);
-x_258 = x_286;
-x_259 = x_274;
-x_260 = x_276;
-x_261 = x_275;
-x_262 = x_277;
-x_263 = x_278;
-x_264 = x_279;
-x_265 = x_280;
-x_266 = x_281;
-x_267 = x_282;
-x_268 = x_283;
-x_269 = x_285;
-x_270 = x_284;
-goto block_272;
-}
-}
-}
-block_316:
-{
-lean_object* x_301; lean_object* x_302; 
-x_301 = lean_st_ref_get(x_290);
-lean_inc_ref(x_26);
-x_302 = l_Lean_Meta_Grind_Goal_getENode(x_301, x_26, x_296, x_297, x_298, x_299);
-if (lean_obj_tag(x_302) == 0)
-{
-lean_object* x_303; lean_object* x_304; lean_object* x_305; 
-x_303 = lean_ctor_get(x_302, 0);
-lean_inc(x_303);
-lean_dec_ref(x_302);
-x_304 = lean_st_ref_get(x_290);
-lean_inc_ref(x_27);
-x_305 = l_Lean_Meta_Grind_Goal_getENode(x_304, x_27, x_296, x_297, x_298, x_299);
-if (lean_obj_tag(x_305) == 0)
-{
-uint8_t x_306; 
-x_306 = lean_ctor_get_uint8(x_303, sizeof(void*)*11 + 1);
-if (x_306 == 0)
-{
-lean_object* x_307; 
-x_307 = lean_ctor_get(x_305, 0);
-lean_inc(x_307);
-lean_dec_ref(x_305);
-x_273 = lean_box(0);
-x_274 = x_307;
-x_275 = x_294;
-x_276 = x_296;
-x_277 = x_292;
-x_278 = x_295;
-x_279 = x_291;
-x_280 = x_290;
-x_281 = x_293;
-x_282 = x_297;
-x_283 = x_299;
-x_284 = x_298;
-x_285 = x_303;
-x_286 = x_28;
-goto block_289;
-}
-else
-{
-lean_object* x_308; uint8_t x_309; 
-x_308 = lean_ctor_get(x_305, 0);
-lean_inc(x_308);
-lean_dec_ref(x_305);
-x_309 = lean_ctor_get_uint8(x_308, sizeof(void*)*11 + 1);
-x_273 = lean_box(0);
-x_274 = x_308;
-x_275 = x_294;
-x_276 = x_296;
-x_277 = x_292;
-x_278 = x_295;
-x_279 = x_291;
-x_280 = x_290;
-x_281 = x_293;
-x_282 = x_297;
-x_283 = x_299;
-x_284 = x_298;
-x_285 = x_303;
-x_286 = x_309;
-goto block_289;
-}
-}
-else
-{
-uint8_t x_310; 
-lean_dec(x_303);
-lean_dec(x_299);
-lean_dec_ref(x_298);
-lean_dec(x_297);
-lean_dec_ref(x_296);
-lean_dec(x_295);
-lean_dec_ref(x_294);
-lean_dec(x_293);
-lean_dec_ref(x_292);
-lean_dec(x_291);
-lean_dec(x_290);
+lean_dec(x_287);
+lean_dec_ref(x_286);
+lean_dec(x_284);
+lean_dec(x_283);
+lean_dec_ref(x_282);
+lean_dec_ref(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
 lean_dec(x_25);
 lean_dec(x_22);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_310 = !lean_is_exclusive(x_305);
+return x_288;
+}
+}
+block_314:
+{
+if (x_296 == 0)
+{
+lean_object* x_305; uint8_t x_306; lean_object* x_307; lean_object* x_308; 
+x_305 = lean_ctor_get(x_291, 0);
+x_306 = lean_ctor_get_uint8(x_291, sizeof(void*)*11 + 1);
+x_307 = lean_ctor_get(x_303, 0);
+lean_inc(x_304);
+lean_inc_ref(x_297);
+lean_inc(x_290);
+lean_inc_ref(x_295);
+lean_inc_ref(x_307);
+lean_inc_ref(x_305);
+x_308 = l_Lean_Meta_Grind_hasSameType(x_305, x_307, x_295, x_290, x_297, x_304);
+if (lean_obj_tag(x_308) == 0)
+{
+lean_object* x_309; uint8_t x_310; 
+x_309 = lean_ctor_get(x_308, 0);
+lean_inc(x_309);
+lean_dec_ref(x_308);
+x_310 = lean_unbox(x_309);
+lean_dec(x_309);
 if (x_310 == 0)
 {
-return x_305;
+x_239 = x_291;
+x_240 = x_306;
+x_241 = x_303;
+x_242 = x_28;
+x_243 = x_28;
+x_244 = x_294;
+x_245 = x_292;
+x_246 = x_299;
+x_247 = x_301;
+x_248 = x_293;
+x_249 = x_300;
+x_250 = x_295;
+x_251 = x_290;
+x_252 = x_297;
+x_253 = x_304;
+x_254 = lean_box(0);
+goto block_256;
 }
 else
 {
-lean_object* x_311; lean_object* x_312; 
-x_311 = lean_ctor_get(x_305, 0);
-lean_inc(x_311);
-lean_dec(x_305);
-x_312 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_312, 0, x_311);
-return x_312;
-}
+x_239 = x_291;
+x_240 = x_306;
+x_241 = x_303;
+x_242 = x_28;
+x_243 = x_302;
+x_244 = x_294;
+x_245 = x_292;
+x_246 = x_299;
+x_247 = x_301;
+x_248 = x_293;
+x_249 = x_300;
+x_250 = x_295;
+x_251 = x_290;
+x_252 = x_297;
+x_253 = x_304;
+x_254 = lean_box(0);
+goto block_256;
 }
 }
 else
 {
-uint8_t x_313; 
-lean_dec(x_299);
-lean_dec_ref(x_298);
-lean_dec(x_297);
-lean_dec_ref(x_296);
-lean_dec(x_295);
-lean_dec_ref(x_294);
-lean_dec(x_293);
-lean_dec_ref(x_292);
-lean_dec(x_291);
+uint8_t x_311; 
+lean_dec(x_304);
+lean_dec_ref(x_303);
+lean_dec(x_301);
+lean_dec(x_300);
+lean_dec_ref(x_299);
+lean_dec_ref(x_297);
+lean_dec_ref(x_295);
+lean_dec(x_294);
+lean_dec_ref(x_293);
+lean_dec(x_292);
+lean_dec_ref(x_291);
 lean_dec(x_290);
 lean_dec(x_25);
 lean_dec(x_22);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_313 = !lean_is_exclusive(x_302);
-if (x_313 == 0)
+x_311 = !lean_is_exclusive(x_308);
+if (x_311 == 0)
 {
-return x_302;
+return x_308;
 }
 else
 {
-lean_object* x_314; lean_object* x_315; 
-x_314 = lean_ctor_get(x_302, 0);
-lean_inc(x_314);
-lean_dec(x_302);
-x_315 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_315, 0, x_314);
-return x_315;
-}
-}
-}
-block_325:
-{
-if (lean_obj_tag(x_318) == 0)
-{
-lean_object* x_319; lean_object* x_320; lean_object* x_321; 
-x_319 = lean_ctor_get(x_318, 0);
-lean_inc(x_319);
-lean_dec_ref(x_318);
-x_320 = l_Lean_MessageData_ofExpr(x_319);
-x_321 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__2___redArg(x_317, x_320, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_321) == 0)
-{
-lean_dec_ref(x_321);
-x_290 = x_5;
-x_291 = x_6;
-x_292 = x_7;
-x_293 = x_8;
-x_294 = x_9;
-x_295 = x_10;
-x_296 = x_11;
-x_297 = x_12;
-x_298 = x_13;
-x_299 = x_14;
-x_300 = lean_box(0);
-goto block_316;
-}
-else
-{
-lean_dec(x_25);
-lean_dec(x_22);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec_ref(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-return x_321;
-}
-}
-else
-{
-uint8_t x_322; 
-lean_dec(x_25);
-lean_dec(x_22);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec_ref(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_322 = !lean_is_exclusive(x_318);
-if (x_322 == 0)
-{
-return x_318;
-}
-else
-{
-lean_object* x_323; lean_object* x_324; 
-x_323 = lean_ctor_get(x_318, 0);
-lean_inc(x_323);
-lean_dec(x_318);
-x_324 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_324, 0, x_323);
-return x_324;
-}
+lean_object* x_312; lean_object* x_313; 
+x_312 = lean_ctor_get(x_308, 0);
+lean_inc(x_312);
+lean_dec(x_308);
+x_313 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_313, 0, x_312);
+return x_313;
 }
 }
 }
 else
 {
-lean_object* x_332; lean_object* x_333; lean_object* x_334; uint8_t x_335; 
-lean_dec(x_25);
-lean_dec(x_22);
-lean_dec_ref(x_3);
-x_332 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go___closed__0));
-x_333 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__1___redArg(x_332, x_13);
-x_334 = lean_ctor_get(x_333, 0);
-lean_inc(x_334);
-lean_dec_ref(x_333);
-x_335 = lean_unbox(x_334);
-lean_dec(x_334);
-if (x_335 == 0)
+x_257 = x_291;
+x_258 = x_303;
+x_259 = x_28;
+x_260 = x_302;
+x_261 = x_294;
+x_262 = x_292;
+x_263 = x_299;
+x_264 = x_301;
+x_265 = x_293;
+x_266 = x_300;
+x_267 = x_295;
+x_268 = x_290;
+x_269 = x_297;
+x_270 = x_304;
+x_271 = lean_box(0);
+goto block_273;
+}
+}
+block_334:
 {
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec_ref(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_16 = lean_box(0);
-goto block_19;
+if (x_328 == 0)
+{
+x_257 = x_316;
+x_258 = x_327;
+x_259 = x_28;
+x_260 = x_28;
+x_261 = x_319;
+x_262 = x_317;
+x_263 = x_322;
+x_264 = x_324;
+x_265 = x_318;
+x_266 = x_325;
+x_267 = x_320;
+x_268 = x_315;
+x_269 = x_321;
+x_270 = x_326;
+x_271 = lean_box(0);
+goto block_273;
 }
 else
 {
-lean_object* x_336; 
-x_336 = l_Lean_Meta_Grind_updateLastTag(x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec_ref(x_7);
-lean_dec(x_6);
-if (lean_obj_tag(x_336) == 0)
+uint8_t x_329; 
+lean_inc_ref(x_26);
+x_329 = l_Lean_Expr_isTrue(x_26);
+if (x_329 == 0)
 {
-lean_object* x_337; 
-lean_dec_ref(x_336);
-lean_inc(x_14);
-lean_inc_ref(x_13);
-lean_inc(x_12);
-lean_inc_ref(x_11);
-x_337 = l_Lean_Meta_Grind_ppENodeRef___redArg(x_1, x_5, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_337) == 0)
+uint8_t x_330; 
+lean_inc_ref(x_27);
+x_330 = l_Lean_Expr_isTrue(x_27);
+if (x_330 == 0)
 {
-lean_object* x_338; lean_object* x_339; 
-x_338 = lean_ctor_get(x_337, 0);
-lean_inc(x_338);
-lean_dec_ref(x_337);
-lean_inc(x_14);
-lean_inc_ref(x_13);
-lean_inc(x_12);
-lean_inc_ref(x_11);
-x_339 = l_Lean_Meta_Grind_ppENodeRef___redArg(x_2, x_5, x_11, x_12, x_13, x_14);
-lean_dec(x_5);
-if (lean_obj_tag(x_339) == 0)
+if (x_4 == 0)
 {
-lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; 
-x_340 = lean_ctor_get(x_339, 0);
-lean_inc(x_340);
-lean_dec_ref(x_339);
-x_341 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___closed__5;
-x_342 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_342, 0, x_338);
-lean_ctor_set(x_342, 1, x_341);
-x_343 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_343, 0, x_342);
-lean_ctor_set(x_343, 1, x_340);
-x_344 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___closed__7;
-x_345 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_345, 0, x_343);
-lean_ctor_set(x_345, 1, x_344);
-x_346 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__2___redArg(x_332, x_345, x_11, x_12, x_13, x_14);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-if (lean_obj_tag(x_346) == 0)
+uint8_t x_331; 
+x_331 = lean_ctor_get_uint8(x_316, sizeof(void*)*11 + 4);
+if (x_331 == 0)
 {
-lean_dec_ref(x_346);
-x_16 = lean_box(0);
-goto block_19;
+uint8_t x_332; 
+x_332 = lean_ctor_get_uint8(x_327, sizeof(void*)*11 + 4);
+if (x_332 == 0)
+{
+uint8_t x_333; 
+x_333 = lean_ctor_get_uint8(x_316, sizeof(void*)*11 + 1);
+x_239 = x_316;
+x_240 = x_333;
+x_241 = x_327;
+x_242 = x_28;
+x_243 = x_328;
+x_244 = x_319;
+x_245 = x_317;
+x_246 = x_322;
+x_247 = x_324;
+x_248 = x_318;
+x_249 = x_325;
+x_250 = x_320;
+x_251 = x_315;
+x_252 = x_321;
+x_253 = x_326;
+x_254 = lean_box(0);
+goto block_256;
 }
 else
 {
-return x_346;
+x_290 = x_315;
+x_291 = x_316;
+x_292 = x_317;
+x_293 = x_318;
+x_294 = x_319;
+x_295 = x_320;
+x_296 = x_330;
+x_297 = x_321;
+x_298 = lean_box(0);
+x_299 = x_322;
+x_300 = x_325;
+x_301 = x_324;
+x_302 = x_328;
+x_303 = x_327;
+x_304 = x_326;
+goto block_314;
 }
 }
 else
 {
-uint8_t x_347; 
-lean_dec(x_338);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-x_347 = !lean_is_exclusive(x_339);
-if (x_347 == 0)
-{
-return x_339;
+x_290 = x_315;
+x_291 = x_316;
+x_292 = x_317;
+x_293 = x_318;
+x_294 = x_319;
+x_295 = x_320;
+x_296 = x_330;
+x_297 = x_321;
+x_298 = lean_box(0);
+x_299 = x_322;
+x_300 = x_325;
+x_301 = x_324;
+x_302 = x_328;
+x_303 = x_327;
+x_304 = x_326;
+goto block_314;
+}
 }
 else
 {
-lean_object* x_348; lean_object* x_349; 
-x_348 = lean_ctor_get(x_339, 0);
+x_290 = x_315;
+x_291 = x_316;
+x_292 = x_317;
+x_293 = x_318;
+x_294 = x_319;
+x_295 = x_320;
+x_296 = x_330;
+x_297 = x_321;
+x_298 = lean_box(0);
+x_299 = x_322;
+x_300 = x_325;
+x_301 = x_324;
+x_302 = x_328;
+x_303 = x_327;
+x_304 = x_326;
+goto block_314;
+}
+}
+else
+{
+x_274 = x_315;
+x_275 = x_316;
+x_276 = x_317;
+x_277 = x_318;
+x_278 = x_319;
+x_279 = x_320;
+x_280 = x_321;
+x_281 = lean_box(0);
+x_282 = x_322;
+x_283 = x_324;
+x_284 = x_325;
+x_285 = x_328;
+x_286 = x_327;
+x_287 = x_326;
+goto block_289;
+}
+}
+else
+{
+x_274 = x_315;
+x_275 = x_316;
+x_276 = x_317;
+x_277 = x_318;
+x_278 = x_319;
+x_279 = x_320;
+x_280 = x_321;
+x_281 = lean_box(0);
+x_282 = x_322;
+x_283 = x_324;
+x_284 = x_325;
+x_285 = x_328;
+x_286 = x_327;
+x_287 = x_326;
+goto block_289;
+}
+}
+}
+block_361:
+{
+lean_object* x_346; lean_object* x_347; 
+x_346 = lean_st_ref_get(x_335);
+lean_inc_ref(x_26);
+x_347 = l_Lean_Meta_Grind_Goal_getENode(x_346, x_26, x_341, x_342, x_343, x_344);
+if (lean_obj_tag(x_347) == 0)
+{
+lean_object* x_348; lean_object* x_349; lean_object* x_350; 
+x_348 = lean_ctor_get(x_347, 0);
 lean_inc(x_348);
-lean_dec(x_339);
-x_349 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_349, 0, x_348);
-return x_349;
+lean_dec_ref(x_347);
+x_349 = lean_st_ref_get(x_335);
+lean_inc_ref(x_27);
+x_350 = l_Lean_Meta_Grind_Goal_getENode(x_349, x_27, x_341, x_342, x_343, x_344);
+if (lean_obj_tag(x_350) == 0)
+{
+uint8_t x_351; 
+x_351 = lean_ctor_get_uint8(x_348, sizeof(void*)*11 + 1);
+if (x_351 == 0)
+{
+lean_object* x_352; 
+x_352 = lean_ctor_get(x_350, 0);
+lean_inc(x_352);
+lean_dec_ref(x_350);
+x_315 = x_342;
+x_316 = x_348;
+x_317 = x_336;
+x_318 = x_339;
+x_319 = x_335;
+x_320 = x_341;
+x_321 = x_343;
+x_322 = x_337;
+x_323 = lean_box(0);
+x_324 = x_338;
+x_325 = x_340;
+x_326 = x_344;
+x_327 = x_352;
+x_328 = x_28;
+goto block_334;
 }
+else
+{
+lean_object* x_353; uint8_t x_354; 
+x_353 = lean_ctor_get(x_350, 0);
+lean_inc(x_353);
+lean_dec_ref(x_350);
+x_354 = lean_ctor_get_uint8(x_353, sizeof(void*)*11 + 1);
+x_315 = x_342;
+x_316 = x_348;
+x_317 = x_336;
+x_318 = x_339;
+x_319 = x_335;
+x_320 = x_341;
+x_321 = x_343;
+x_322 = x_337;
+x_323 = lean_box(0);
+x_324 = x_338;
+x_325 = x_340;
+x_326 = x_344;
+x_327 = x_353;
+x_328 = x_354;
+goto block_334;
 }
 }
 else
 {
-uint8_t x_350; 
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_5);
-lean_dec_ref(x_2);
-x_350 = !lean_is_exclusive(x_337);
-if (x_350 == 0)
-{
-return x_337;
-}
-else
-{
-lean_object* x_351; lean_object* x_352; 
-x_351 = lean_ctor_get(x_337, 0);
-lean_inc(x_351);
-lean_dec(x_337);
-x_352 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_352, 0, x_351);
-return x_352;
-}
-}
-}
-else
-{
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_5);
+uint8_t x_355; 
+lean_dec(x_348);
+lean_dec(x_344);
+lean_dec_ref(x_343);
+lean_dec(x_342);
+lean_dec_ref(x_341);
+lean_dec(x_340);
+lean_dec_ref(x_339);
+lean_dec(x_338);
+lean_dec_ref(x_337);
+lean_dec(x_336);
+lean_dec(x_335);
+lean_dec(x_25);
+lean_dec(x_22);
+lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-return x_336;
+x_355 = !lean_is_exclusive(x_350);
+if (x_355 == 0)
+{
+return x_350;
 }
+else
+{
+lean_object* x_356; lean_object* x_357; 
+x_356 = lean_ctor_get(x_350, 0);
+lean_inc(x_356);
+lean_dec(x_350);
+x_357 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_357, 0, x_356);
+return x_357;
 }
 }
 }
 else
 {
-uint8_t x_353; 
+uint8_t x_358; 
+lean_dec(x_344);
+lean_dec_ref(x_343);
+lean_dec(x_342);
+lean_dec_ref(x_341);
+lean_dec(x_340);
+lean_dec_ref(x_339);
+lean_dec(x_338);
+lean_dec_ref(x_337);
+lean_dec(x_336);
+lean_dec(x_335);
+lean_dec(x_25);
+lean_dec(x_22);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_358 = !lean_is_exclusive(x_347);
+if (x_358 == 0)
+{
+return x_347;
+}
+else
+{
+lean_object* x_359; lean_object* x_360; 
+x_359 = lean_ctor_get(x_347, 0);
+lean_inc(x_359);
+lean_dec(x_347);
+x_360 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_360, 0, x_359);
+return x_360;
+}
+}
+}
+block_370:
+{
+if (lean_obj_tag(x_363) == 0)
+{
+lean_object* x_364; lean_object* x_365; lean_object* x_366; 
+x_364 = lean_ctor_get(x_363, 0);
+lean_inc(x_364);
+lean_dec_ref(x_363);
+x_365 = l_Lean_MessageData_ofExpr(x_364);
+x_366 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__2___redArg(x_362, x_365, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_366) == 0)
+{
+lean_dec_ref(x_366);
+x_335 = x_5;
+x_336 = x_6;
+x_337 = x_7;
+x_338 = x_8;
+x_339 = x_9;
+x_340 = x_10;
+x_341 = x_11;
+x_342 = x_12;
+x_343 = x_13;
+x_344 = x_14;
+x_345 = lean_box(0);
+goto block_361;
+}
+else
+{
+lean_dec(x_25);
 lean_dec(x_22);
 lean_dec(x_14);
 lean_dec_ref(x_13);
@@ -15328,26 +15329,240 @@ lean_dec(x_5);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_353 = !lean_is_exclusive(x_24);
-if (x_353 == 0)
+return x_366;
+}
+}
+else
+{
+uint8_t x_367; 
+lean_dec(x_25);
+lean_dec(x_22);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_367 = !lean_is_exclusive(x_363);
+if (x_367 == 0)
+{
+return x_363;
+}
+else
+{
+lean_object* x_368; lean_object* x_369; 
+x_368 = lean_ctor_get(x_363, 0);
+lean_inc(x_368);
+lean_dec(x_363);
+x_369 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_369, 0, x_368);
+return x_369;
+}
+}
+}
+}
+else
+{
+lean_object* x_377; lean_object* x_378; lean_object* x_379; uint8_t x_380; 
+lean_dec(x_25);
+lean_dec(x_22);
+lean_dec_ref(x_3);
+x_377 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep_go___closed__0));
+x_378 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__1___redArg(x_377, x_13);
+x_379 = lean_ctor_get(x_378, 0);
+lean_inc(x_379);
+lean_dec_ref(x_378);
+x_380 = lean_unbox(x_379);
+lean_dec(x_379);
+if (x_380 == 0)
+{
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_16 = lean_box(0);
+goto block_19;
+}
+else
+{
+lean_object* x_381; 
+x_381 = l_Lean_Meta_Grind_updateLastTag(x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+if (lean_obj_tag(x_381) == 0)
+{
+lean_object* x_382; 
+lean_dec_ref(x_381);
+lean_inc(x_14);
+lean_inc_ref(x_13);
+lean_inc(x_12);
+lean_inc_ref(x_11);
+x_382 = l_Lean_Meta_Grind_ppENodeRef___redArg(x_1, x_5, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_382) == 0)
+{
+lean_object* x_383; lean_object* x_384; 
+x_383 = lean_ctor_get(x_382, 0);
+lean_inc(x_383);
+lean_dec_ref(x_382);
+lean_inc(x_14);
+lean_inc_ref(x_13);
+lean_inc(x_12);
+lean_inc_ref(x_11);
+x_384 = l_Lean_Meta_Grind_ppENodeRef___redArg(x_2, x_5, x_11, x_12, x_13, x_14);
+lean_dec(x_5);
+if (lean_obj_tag(x_384) == 0)
+{
+lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; 
+x_385 = lean_ctor_get(x_384, 0);
+lean_inc(x_385);
+lean_dec_ref(x_384);
+x_386 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___closed__5;
+x_387 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_387, 0, x_383);
+lean_ctor_set(x_387, 1, x_386);
+x_388 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_388, 0, x_387);
+lean_ctor_set(x_388, 1, x_385);
+x_389 = l___private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_addEqStep___closed__7;
+x_390 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_390, 0, x_388);
+lean_ctor_set(x_390, 1, x_389);
+x_391 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_Core_0__Lean_Meta_Grind_removeParents_spec__2___redArg(x_377, x_390, x_11, x_12, x_13, x_14);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+if (lean_obj_tag(x_391) == 0)
+{
+lean_dec_ref(x_391);
+x_16 = lean_box(0);
+goto block_19;
+}
+else
+{
+return x_391;
+}
+}
+else
+{
+uint8_t x_392; 
+lean_dec(x_383);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+x_392 = !lean_is_exclusive(x_384);
+if (x_392 == 0)
+{
+return x_384;
+}
+else
+{
+lean_object* x_393; lean_object* x_394; 
+x_393 = lean_ctor_get(x_384, 0);
+lean_inc(x_393);
+lean_dec(x_384);
+x_394 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_394, 0, x_393);
+return x_394;
+}
+}
+}
+else
+{
+uint8_t x_395; 
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_5);
+lean_dec_ref(x_2);
+x_395 = !lean_is_exclusive(x_382);
+if (x_395 == 0)
+{
+return x_382;
+}
+else
+{
+lean_object* x_396; lean_object* x_397; 
+x_396 = lean_ctor_get(x_382, 0);
+lean_inc(x_396);
+lean_dec(x_382);
+x_397 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_397, 0, x_396);
+return x_397;
+}
+}
+}
+else
+{
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_5);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+return x_381;
+}
+}
+}
+}
+else
+{
+uint8_t x_398; 
+lean_dec(x_22);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_398 = !lean_is_exclusive(x_24);
+if (x_398 == 0)
 {
 return x_24;
 }
 else
 {
-lean_object* x_354; lean_object* x_355; 
-x_354 = lean_ctor_get(x_24, 0);
-lean_inc(x_354);
+lean_object* x_399; lean_object* x_400; 
+x_399 = lean_ctor_get(x_24, 0);
+lean_inc(x_399);
 lean_dec(x_24);
-x_355 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_355, 0, x_354);
-return x_355;
+x_400 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_400, 0, x_399);
+return x_400;
 }
 }
 }
 else
 {
-uint8_t x_356; 
+uint8_t x_401; 
 lean_dec(x_14);
 lean_dec_ref(x_13);
 lean_dec(x_12);
@@ -15361,20 +15576,20 @@ lean_dec(x_5);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_356 = !lean_is_exclusive(x_21);
-if (x_356 == 0)
+x_401 = !lean_is_exclusive(x_21);
+if (x_401 == 0)
 {
 return x_21;
 }
 else
 {
-lean_object* x_357; lean_object* x_358; 
-x_357 = lean_ctor_get(x_21, 0);
-lean_inc(x_357);
+lean_object* x_402; lean_object* x_403; 
+x_402 = lean_ctor_get(x_21, 0);
+lean_inc(x_402);
 lean_dec(x_21);
-x_358 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_358, 0, x_357);
-return x_358;
+x_403 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_403, 0, x_402);
+return x_403;
 }
 }
 block_19:
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatch.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatch.c
index 826aced2ef..a68dc97855 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatch.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatch.c
@@ -199,6 +199,8 @@ lean_object* l_Lean_Meta_Grind_groundPattern_x3f(lean_object*);
 lean_object* l_Lean_Meta_Grind_isOffsetPattern_x3f(lean_object*);
 lean_object* l_Lean_Meta_Grind_isGenPattern_x3f(lean_object*);
 lean_object* l_Lean_Expr_bvarIdx_x21(lean_object*);
+lean_object* l_Lean_Meta_Grind_hoPattern_x3f(lean_object*);
+lean_object* lean_array_push(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
@@ -297,7 +299,6 @@ lean_object* l_Lean_Meta_isProp(lean_object*, lean_object*, lean_object*, lean_o
 lean_object* l_Lean_Meta_Grind_markAsPreMatchCond(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_annotateEqnTypeConds(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
-lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_annotateEqnTypeConds___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 const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_annotateMatchEqnType___lam__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = "Eq"};
@@ -950,46 +951,53 @@ LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tact
 lean_object* l_instInhabitedForall___redArg___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_string_object l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 6, .m_capacity = 6, .m_length = 5, .m_data = "trace"};
-static const lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__0 = (const lean_object*)&l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__0_value;
-static const lean_ctor_object l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__0_value),LEAN_SCALAR_PTR_LITERAL(212, 145, 141, 177, 67, 149, 127, 197)}};
-static const lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__1 = (const lean_object*)&l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__1_value;
+static const lean_string_object l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 6, .m_capacity = 6, .m_length = 5, .m_data = "trace"};
+static const lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__0 = (const lean_object*)&l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__0_value;
+static const lean_ctor_object l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__0_value),LEAN_SCALAR_PTR_LITERAL(212, 145, 141, 177, 67, 149, 127, 197)}};
+static const lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__1 = (const lean_object*)&l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__1_value;
 lean_object* l_Lean_Name_append(lean_object*, lean_object*);
 uint8_t l___private_Lean_Util_Trace_0__Lean_checkTraceOption_go(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-double lean_float_of_nat(lean_object*);
-static double l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0;
-static const lean_string_object l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 1, .m_capacity = 1, .m_length = 0, .m_data = ""};
-static const lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1 = (const lean_object*)&l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1_value;
-static lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2;
-lean_object* l_Lean_PersistentArray_push___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(uint8_t, uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4___boxed(lean_object**);
-static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1))}};
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4___boxed(lean_object**);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(uint8_t, uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___boxed(lean_object**);
+static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0_value),((lean_object*)(((size_t)(0) << 1) | 1))}};
 static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0_value;
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static const lean_string_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 41, .m_capacity = 41, .m_length = 40, .m_data = "failed to match higher-order pattern at "};
+static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__1 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__1_value;
+static lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2;
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1))}};
+static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg___closed__0_value;
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isProof(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___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_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___boxed(lean_object**);
-LEAN_EXPORT lean_object* l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(lean_object*, lean_object*);
+double lean_float_of_nat(lean_object*);
+static double l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0;
+static const lean_string_object l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 1, .m_capacity = 1, .m_length = 0, .m_data = ""};
+static const lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1 = (const lean_object*)&l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1_value;
+static lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2;
+lean_object* l_Lean_PersistentArray_push___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 23, .m_capacity = 23, .m_length = 22, .m_data = "failed to instantiate "};
 static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__0 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__0_value;
 static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
@@ -1031,12 +1039,12 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0___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_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___boxed(lean_object**);
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_ctor_object l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0_value),((lean_object*)(((size_t)(0) << 1) | 1))}};
-static const lean_object* l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0 = (const lean_object*)&l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0_value;
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Grind_checkMaxInstancesExceeded___redArg(lean_object*, lean_object*);
 lean_object* l_List_tail_x21___redArg(lean_object*);
 lean_object* l_List_head_x21___redArg(lean_object*, lean_object*);
@@ -1046,6 +1054,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0(lean_object*, lean_object*, lean_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_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___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_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0;
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___boxed(lean_object**);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1446,10 +1455,11 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Meta_Grind_EMatch_instInhabitedChoice_default___closed__0;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_box(0);
-x_4 = lean_alloc_ctor(0, 3, 0);
+x_4 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_4, 0, x_3);
 lean_ctor_set(x_4, 1, x_2);
 lean_ctor_set(x_4, 2, x_1);
+lean_ctor_set(x_4, 3, x_1);
 return x_4;
 }
 }
@@ -2454,7 +2464,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(128u);
+x_3 = lean_unsigned_to_nat(130u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__1));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -2464,24 +2474,25 @@ return x_6;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
 x_15 = lean_ctor_get(x_1, 0);
 x_16 = lean_ctor_get(x_1, 1);
 x_17 = lean_ctor_get(x_1, 2);
-x_18 = lean_array_get_size(x_17);
-x_19 = lean_nat_dec_lt(x_2, x_18);
-if (x_19 == 0)
+x_18 = lean_ctor_get(x_1, 3);
+x_19 = lean_array_get_size(x_17);
+x_20 = lean_nat_dec_lt(x_2, x_19);
+if (x_20 == 0)
 {
-lean_object* x_20; lean_object* x_21; 
+lean_object* x_21; lean_object* x_22; 
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_20 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__3;
-x_21 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_20, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_21;
+x_21 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__3;
+x_22 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_21, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_22;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; uint8_t x_24; 
+lean_object* x_23; lean_object* x_24; uint8_t x_25; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -2491,130 +2502,134 @@ lean_dec_ref(x_8);
 lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
-x_22 = lean_array_fget_borrowed(x_17, x_2);
-x_23 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_unassigned;
-x_24 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_22, x_23);
-if (x_24 == 0)
+x_23 = lean_array_fget_borrowed(x_17, x_2);
+x_24 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_unassigned;
+x_25 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_23, x_24);
+if (x_25 == 0)
 {
-lean_object* x_25; 
-x_25 = l_Lean_Meta_Grind_isEqv___redArg(x_22, x_3, x_4);
+lean_object* x_26; 
+x_26 = l_Lean_Meta_Grind_isEqv___redArg(x_23, x_3, x_4);
 lean_dec(x_4);
 lean_dec_ref(x_3);
-if (lean_obj_tag(x_25) == 0)
+if (lean_obj_tag(x_26) == 0)
 {
-uint8_t x_26; 
-x_26 = !lean_is_exclusive(x_25);
-if (x_26 == 0)
+uint8_t x_27; 
+x_27 = !lean_is_exclusive(x_26);
+if (x_27 == 0)
 {
-lean_object* x_27; uint8_t x_28; 
-x_27 = lean_ctor_get(x_25, 0);
-x_28 = lean_unbox(x_27);
-lean_dec(x_27);
-if (x_28 == 0)
-{
-lean_object* x_29; 
-lean_dec_ref(x_1);
-x_29 = lean_box(0);
-lean_ctor_set(x_25, 0, x_29);
-return x_25;
-}
-else
+lean_object* x_28; uint8_t x_29; 
+x_28 = lean_ctor_get(x_26, 0);
+x_29 = lean_unbox(x_28);
+lean_dec(x_28);
+if (x_29 == 0)
 {
 lean_object* x_30; 
-x_30 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_30, 0, x_1);
-lean_ctor_set(x_25, 0, x_30);
-return x_25;
-}
-}
-else
-{
-lean_object* x_31; uint8_t x_32; 
-x_31 = lean_ctor_get(x_25, 0);
-lean_inc(x_31);
-lean_dec(x_25);
-x_32 = lean_unbox(x_31);
-lean_dec(x_31);
-if (x_32 == 0)
-{
-lean_object* x_33; lean_object* x_34; 
 lean_dec_ref(x_1);
-x_33 = lean_box(0);
-x_34 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_34, 0, x_33);
-return x_34;
+x_30 = lean_box(0);
+lean_ctor_set(x_26, 0, x_30);
+return x_26;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; 
-x_35 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_35, 0, x_1);
-x_36 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_36, 0, x_35);
-return x_36;
-}
+lean_object* x_31; 
+x_31 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_31, 0, x_1);
+lean_ctor_set(x_26, 0, x_31);
+return x_26;
 }
 }
 else
 {
-uint8_t x_37; 
+lean_object* x_32; uint8_t x_33; 
+x_32 = lean_ctor_get(x_26, 0);
+lean_inc(x_32);
+lean_dec(x_26);
+x_33 = lean_unbox(x_32);
+lean_dec(x_32);
+if (x_33 == 0)
+{
+lean_object* x_34; lean_object* x_35; 
 lean_dec_ref(x_1);
-x_37 = !lean_is_exclusive(x_25);
-if (x_37 == 0)
-{
-return x_25;
+x_34 = lean_box(0);
+x_35 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_35, 0, x_34);
+return x_35;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; 
-x_38 = lean_ctor_get(x_25, 0);
-lean_inc(x_38);
-lean_dec(x_25);
-x_39 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_39, 0, x_38);
-return x_39;
+lean_object* x_36; lean_object* x_37; 
+x_36 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_36, 0, x_1);
+x_37 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_37, 0, x_36);
+return x_37;
 }
 }
 }
 else
 {
-uint8_t x_40; 
+uint8_t x_38; 
+lean_dec_ref(x_1);
+x_38 = !lean_is_exclusive(x_26);
+if (x_38 == 0)
+{
+return x_26;
+}
+else
+{
+lean_object* x_39; lean_object* x_40; 
+x_39 = lean_ctor_get(x_26, 0);
+lean_inc(x_39);
+lean_dec(x_26);
+x_40 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_40, 0, x_39);
+return x_40;
+}
+}
+}
+else
+{
+uint8_t x_41; 
+lean_inc_ref(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_dec(x_4);
-x_40 = !lean_is_exclusive(x_1);
-if (x_40 == 0)
+x_41 = !lean_is_exclusive(x_1);
+if (x_41 == 0)
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_41 = lean_ctor_get(x_1, 2);
-lean_dec(x_41);
-x_42 = lean_ctor_get(x_1, 1);
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_42 = lean_ctor_get(x_1, 3);
 lean_dec(x_42);
-x_43 = lean_ctor_get(x_1, 0);
+x_43 = lean_ctor_get(x_1, 2);
 lean_dec(x_43);
-x_44 = lean_array_fset(x_17, x_2, x_3);
-lean_ctor_set(x_1, 2, x_44);
-x_45 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_45, 0, x_1);
-x_46 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_46, 0, x_45);
-return x_46;
+x_44 = lean_ctor_get(x_1, 1);
+lean_dec(x_44);
+x_45 = lean_ctor_get(x_1, 0);
+lean_dec(x_45);
+x_46 = lean_array_fset(x_17, x_2, x_3);
+lean_ctor_set(x_1, 2, x_46);
+x_47 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_47, 0, x_1);
+x_48 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_48, 0, x_47);
+return x_48;
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
 lean_dec(x_1);
-x_47 = lean_array_fset(x_17, x_2, x_3);
-x_48 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_48, 0, x_15);
-lean_ctor_set(x_48, 1, x_16);
-lean_ctor_set(x_48, 2, x_47);
-x_49 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_49, 0, x_48);
-x_50 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_50, 0, x_49);
-return x_50;
+x_49 = lean_array_fset(x_17, x_2, x_3);
+x_50 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_50, 0, x_15);
+lean_ctor_set(x_50, 1, x_16);
+lean_ctor_set(x_50, 2, x_49);
+lean_ctor_set(x_50, 3, x_18);
+x_51 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_51, 0, x_50);
+x_52 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_52, 0, x_51);
+return x_52;
 }
 }
 }
@@ -2635,7 +2650,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(143u);
+x_3 = lean_unsigned_to_nat(145u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignDelayedEqProof_x3f___closed__0));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -2645,23 +2660,24 @@ return x_6;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignDelayedEqProof_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
 x_14 = lean_ctor_get(x_1, 0);
 x_15 = lean_ctor_get(x_1, 1);
 x_16 = lean_ctor_get(x_1, 2);
-x_17 = lean_array_get_size(x_16);
-x_18 = lean_nat_dec_lt(x_2, x_17);
-if (x_18 == 0)
+x_17 = lean_ctor_get(x_1, 3);
+x_18 = lean_array_get_size(x_16);
+x_19 = lean_nat_dec_lt(x_2, x_18);
+if (x_19 == 0)
 {
-lean_object* x_19; lean_object* x_20; 
+lean_object* x_20; lean_object* x_21; 
 lean_dec_ref(x_1);
-x_19 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignDelayedEqProof_x3f___closed__1;
-x_20 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_19, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-return x_20;
+x_20 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignDelayedEqProof_x3f___closed__1;
+x_21 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_20, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+return x_21;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+lean_object* x_22; lean_object* x_23; uint8_t x_24; 
 lean_dec(x_12);
 lean_dec_ref(x_11);
 lean_dec(x_10);
@@ -2672,58 +2688,62 @@ lean_dec(x_6);
 lean_dec_ref(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_21 = lean_array_fget_borrowed(x_16, x_2);
-x_22 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_unassigned;
-x_23 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_21, x_22);
-if (x_23 == 0)
+x_22 = lean_array_fget_borrowed(x_16, x_2);
+x_23 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_unassigned;
+x_24 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_22, x_23);
+if (x_24 == 0)
 {
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_24, 0, x_1);
-x_25 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_25, 0, x_24);
-return x_25;
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_25, 0, x_1);
+x_26 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_26, 0, x_25);
+return x_26;
 }
 else
 {
-uint8_t x_26; 
+uint8_t x_27; 
+lean_inc_ref(x_17);
 lean_inc_ref(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
-x_26 = !lean_is_exclusive(x_1);
-if (x_26 == 0)
+x_27 = !lean_is_exclusive(x_1);
+if (x_27 == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_27 = lean_ctor_get(x_1, 2);
-lean_dec(x_27);
-x_28 = lean_ctor_get(x_1, 1);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_28 = lean_ctor_get(x_1, 3);
 lean_dec(x_28);
-x_29 = lean_ctor_get(x_1, 0);
+x_29 = lean_ctor_get(x_1, 2);
 lean_dec(x_29);
-x_30 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_delayedEqProof;
-x_31 = lean_array_fset(x_16, x_2, x_30);
-lean_ctor_set(x_1, 2, x_31);
-x_32 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_32, 0, x_1);
-x_33 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_33, 0, x_32);
-return x_33;
+x_30 = lean_ctor_get(x_1, 1);
+lean_dec(x_30);
+x_31 = lean_ctor_get(x_1, 0);
+lean_dec(x_31);
+x_32 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_delayedEqProof;
+x_33 = lean_array_fset(x_16, x_2, x_32);
+lean_ctor_set(x_1, 2, x_33);
+x_34 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_34, 0, x_1);
+x_35 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_35, 0, x_34);
+return x_35;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
 lean_dec(x_1);
-x_34 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_delayedEqProof;
-x_35 = lean_array_fset(x_16, x_2, x_34);
-x_36 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_36, 0, x_14);
-lean_ctor_set(x_36, 1, x_15);
-lean_ctor_set(x_36, 2, x_35);
-x_37 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_37, 0, x_36);
-x_38 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_38, 0, x_37);
-return x_38;
+x_36 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_delayedEqProof;
+x_37 = lean_array_fset(x_16, x_2, x_36);
+x_38 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_38, 0, x_14);
+lean_ctor_set(x_38, 1, x_15);
+lean_ctor_set(x_38, 2, x_37);
+lean_ctor_set(x_38, 3, x_17);
+x_39 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_39, 0, x_38);
+x_40 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_40, 0, x_39);
+return x_40;
 }
 }
 }
@@ -2754,21 +2774,24 @@ return x_1;
 }
 else
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_7 = lean_ctor_get(x_1, 0);
 x_8 = lean_ctor_get(x_1, 1);
 x_9 = lean_ctor_get(x_1, 2);
+x_10 = lean_ctor_get(x_1, 3);
+lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_dec(x_1);
-x_10 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_unassigned;
-x_11 = lean_array_set(x_9, x_2, x_10);
-x_12 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_12, 0, x_7);
-lean_ctor_set(x_12, 1, x_8);
-lean_ctor_set(x_12, 2, x_11);
-return x_12;
+x_11 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_unassigned;
+x_12 = lean_array_set(x_9, x_2, x_11);
+x_13 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_13, 0, x_7);
+lean_ctor_set(x_13, 1, x_8);
+lean_ctor_set(x_13, 2, x_12);
+lean_ctor_set(x_13, 3, x_10);
+return x_13;
 }
 }
 }
@@ -3626,7 +3649,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__1));
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(200u);
+x_3 = lean_unsigned_to_nat(202u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__0));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -3639,7 +3662,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__3));
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(199u);
+x_3 = lean_unsigned_to_nat(201u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__0));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -3824,7 +3847,7 @@ lean_inc_ref(x_2);
 x_45 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_2);
 if (lean_obj_tag(x_45) == 1)
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_72; 
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_73; 
 lean_dec_ref(x_2);
 x_46 = lean_ctor_get(x_45, 0);
 lean_inc(x_46);
@@ -3848,33 +3871,33 @@ if (lean_is_exclusive(x_46)) {
  x_50 = lean_box(0);
 }
 lean_inc(x_48);
-x_72 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_48);
-if (lean_obj_tag(x_72) == 0)
+x_73 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_48);
+if (lean_obj_tag(x_73) == 0)
 {
-goto block_71;
+goto block_72;
 }
 else
 {
-lean_dec_ref(x_72);
+lean_dec_ref(x_73);
 if (x_16 == 0)
 {
-lean_object* x_73; lean_object* x_74; 
+lean_object* x_74; lean_object* x_75; 
 lean_dec(x_50);
 lean_dec(x_49);
 lean_dec(x_48);
 lean_dec(x_47);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_73 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__4;
-x_74 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_73, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_74;
+x_74 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__4;
+x_75 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_74, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_75;
 }
 else
 {
-goto block_71;
+goto block_72;
 }
 }
-block_67:
+block_68:
 {
 uint8_t x_51; 
 x_51 = !lean_is_exclusive(x_1);
@@ -3909,48 +3932,51 @@ return x_57;
 }
 else
 {
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
 x_58 = lean_ctor_get(x_1, 0);
 x_59 = lean_ctor_get(x_1, 1);
 x_60 = lean_ctor_get(x_1, 2);
+x_61 = lean_ctor_get(x_1, 3);
+lean_inc(x_61);
 lean_inc(x_60);
 lean_inc(x_59);
 lean_inc(x_58);
 lean_dec(x_1);
-x_61 = lean_box(0);
-x_62 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_62, 0, x_61);
-lean_ctor_set(x_62, 1, x_48);
-lean_ctor_set(x_62, 2, x_49);
-lean_ctor_set(x_62, 3, x_3);
-if (lean_is_scalar(x_50)) {
- x_63 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_63 = x_50;
- lean_ctor_set_tag(x_63, 1);
-}
+x_62 = lean_box(0);
+x_63 = lean_alloc_ctor(1, 4, 0);
 lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_58);
-x_64 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_64, 0, x_63);
-lean_ctor_set(x_64, 1, x_59);
-lean_ctor_set(x_64, 2, x_60);
-if (lean_is_scalar(x_47)) {
- x_65 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_63, 1, x_48);
+lean_ctor_set(x_63, 2, x_49);
+lean_ctor_set(x_63, 3, x_3);
+if (lean_is_scalar(x_50)) {
+ x_64 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_65 = x_47;
+ x_64 = x_50;
+ lean_ctor_set_tag(x_64, 1);
 }
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_58);
+x_65 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_65, 0, x_64);
-x_66 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_65, 1, x_59);
+lean_ctor_set(x_65, 2, x_60);
+lean_ctor_set(x_65, 3, x_61);
+if (lean_is_scalar(x_47)) {
+ x_66 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_66 = x_47;
+}
 lean_ctor_set(x_66, 0, x_65);
-return x_66;
+x_67 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_67, 0, x_66);
+return x_67;
 }
 }
-block_71:
+block_72:
 {
-uint8_t x_68; 
-x_68 = l_Lean_Meta_Grind_isPatternDontCare(x_48);
-if (x_68 == 0)
+uint8_t x_69; 
+x_69 = l_Lean_Meta_Grind_isPatternDontCare(x_48);
+if (x_69 == 0)
 {
 lean_dec(x_13);
 lean_dec_ref(x_12);
@@ -3962,22 +3988,22 @@ lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-goto block_67;
+goto block_68;
 }
 else
 {
 if (x_16 == 0)
 {
-lean_object* x_69; lean_object* x_70; 
+lean_object* x_70; lean_object* x_71; 
 lean_dec(x_50);
 lean_dec(x_49);
 lean_dec(x_48);
 lean_dec(x_47);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_69 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__2;
-x_70 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_69, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_70;
+x_70 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f___closed__2;
+x_71 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f_spec__0(x_70, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_71;
 }
 else
 {
@@ -3991,46 +4017,46 @@ lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-goto block_67;
+goto block_68;
 }
 }
 }
 }
 else
 {
-lean_object* x_75; 
+lean_object* x_76; 
 lean_dec(x_45);
 lean_inc_ref(x_2);
-x_75 = l_Lean_Meta_Grind_isGenPattern_x3f(x_2);
-if (lean_obj_tag(x_75) == 1)
+x_76 = l_Lean_Meta_Grind_isGenPattern_x3f(x_2);
+if (lean_obj_tag(x_76) == 1)
 {
-uint8_t x_76; 
+uint8_t x_77; 
 lean_dec_ref(x_2);
-x_76 = !lean_is_exclusive(x_75);
-if (x_76 == 0)
+x_77 = !lean_is_exclusive(x_76);
+if (x_77 == 0)
 {
-lean_object* x_77; uint8_t x_78; 
-x_77 = lean_ctor_get(x_75, 0);
-x_78 = !lean_is_exclusive(x_77);
-if (x_78 == 0)
+lean_object* x_78; uint8_t x_79; 
+x_78 = lean_ctor_get(x_76, 0);
+x_79 = !lean_is_exclusive(x_78);
+if (x_79 == 0)
 {
-lean_object* x_79; lean_object* x_80; uint8_t x_81; 
-x_79 = lean_ctor_get(x_77, 0);
-x_80 = lean_ctor_get(x_77, 1);
-x_81 = l_Lean_Expr_isBVar(x_80);
-if (x_81 == 0)
+lean_object* x_80; lean_object* x_81; uint8_t x_82; 
+x_80 = lean_ctor_get(x_78, 0);
+x_81 = lean_ctor_get(x_78, 1);
+x_82 = l_Lean_Expr_isBVar(x_81);
+if (x_82 == 0)
 {
-lean_object* x_82; 
-x_82 = l_Lean_Meta_Grind_groundPattern_x3f(x_80);
-if (lean_obj_tag(x_82) == 1)
+lean_object* x_83; 
+x_83 = l_Lean_Meta_Grind_groundPattern_x3f(x_81);
+if (lean_obj_tag(x_83) == 1)
 {
-lean_object* x_83; lean_object* x_84; 
-lean_free_object(x_77);
-lean_dec(x_80);
-lean_free_object(x_75);
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc(x_83);
-lean_dec_ref(x_82);
+lean_object* x_84; lean_object* x_85; 
+lean_free_object(x_78);
+lean_dec(x_81);
+lean_free_object(x_76);
+x_84 = lean_ctor_get(x_83, 0);
+lean_inc(x_84);
+lean_dec_ref(x_83);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -4042,58 +4068,21 @@ lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_84 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchGroundPattern(x_83, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_84) == 0)
+x_85 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchGroundPattern(x_84, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_85) == 0)
 {
-uint8_t x_85; 
-x_85 = !lean_is_exclusive(x_84);
-if (x_85 == 0)
+uint8_t x_86; 
+x_86 = !lean_is_exclusive(x_85);
+if (x_86 == 0)
 {
-lean_object* x_86; uint8_t x_87; 
-x_86 = lean_ctor_get(x_84, 0);
-x_87 = lean_unbox(x_86);
-lean_dec(x_86);
-if (x_87 == 0)
-{
-lean_object* x_88; 
-lean_dec(x_79);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-lean_dec_ref(x_1);
-x_88 = lean_box(0);
-lean_ctor_set(x_84, 0, x_88);
-return x_84;
-}
-else
+lean_object* x_87; uint8_t x_88; 
+x_87 = lean_ctor_get(x_85, 0);
+x_88 = lean_unbox(x_87);
+lean_dec(x_87);
+if (x_88 == 0)
 {
 lean_object* x_89; 
-lean_free_object(x_84);
-x_89 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_79, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_79);
-return x_89;
-}
-}
-else
-{
-lean_object* x_90; uint8_t x_91; 
-x_90 = lean_ctor_get(x_84, 0);
-lean_inc(x_90);
-lean_dec(x_84);
-x_91 = lean_unbox(x_90);
-lean_dec(x_90);
-if (x_91 == 0)
-{
-lean_object* x_92; lean_object* x_93; 
-lean_dec(x_79);
+lean_dec(x_80);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -4106,24 +4095,61 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_92 = lean_box(0);
-x_93 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_93, 0, x_92);
-return x_93;
+x_89 = lean_box(0);
+lean_ctor_set(x_85, 0, x_89);
+return x_85;
 }
 else
 {
-lean_object* x_94; 
-x_94 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_79, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_79);
+lean_object* x_90; 
+lean_free_object(x_85);
+x_90 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_80, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_80);
+return x_90;
+}
+}
+else
+{
+lean_object* x_91; uint8_t x_92; 
+x_91 = lean_ctor_get(x_85, 0);
+lean_inc(x_91);
+lean_dec(x_85);
+x_92 = lean_unbox(x_91);
+lean_dec(x_91);
+if (x_92 == 0)
+{
+lean_object* x_93; lean_object* x_94; 
+lean_dec(x_80);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+lean_dec_ref(x_1);
+x_93 = lean_box(0);
+x_94 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_94, 0, x_93);
 return x_94;
 }
+else
+{
+lean_object* x_95; 
+x_95 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_80, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_80);
+return x_95;
+}
 }
 }
 else
 {
-uint8_t x_95; 
-lean_dec(x_79);
+uint8_t x_96; 
+lean_dec(x_80);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -4136,27 +4162,27 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_95 = !lean_is_exclusive(x_84);
-if (x_95 == 0)
+x_96 = !lean_is_exclusive(x_85);
+if (x_96 == 0)
 {
-return x_84;
+return x_85;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; 
-x_96 = lean_ctor_get(x_84, 0);
-lean_inc(x_96);
-lean_dec(x_84);
-x_97 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_97, 0, x_96);
-return x_97;
+lean_object* x_97; lean_object* x_98; 
+x_97 = lean_ctor_get(x_85, 0);
+lean_inc(x_97);
+lean_dec(x_85);
+x_98 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_98, 0, x_97);
+return x_98;
 }
 }
 }
 else
 {
-lean_object* x_98; 
-lean_dec(x_82);
+lean_object* x_99; 
+lean_dec(x_83);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -4167,330 +4193,259 @@ lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_inc(x_80);
-x_98 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_80);
-if (lean_obj_tag(x_98) == 1)
+lean_inc(x_81);
+x_99 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_81);
+if (lean_obj_tag(x_99) == 1)
 {
-uint8_t x_99; 
-lean_free_object(x_77);
-lean_dec(x_80);
-x_99 = !lean_is_exclusive(x_98);
-if (x_99 == 0)
+uint8_t x_100; 
+lean_free_object(x_78);
+lean_dec(x_81);
+x_100 = !lean_is_exclusive(x_99);
+if (x_100 == 0)
 {
-lean_object* x_100; uint8_t x_101; 
-x_100 = lean_ctor_get(x_98, 0);
-x_101 = !lean_is_exclusive(x_100);
-if (x_101 == 0)
-{
-uint8_t x_102; 
-x_102 = !lean_is_exclusive(x_1);
+lean_object* x_101; uint8_t x_102; 
+x_101 = lean_ctor_get(x_99, 0);
+x_102 = !lean_is_exclusive(x_101);
 if (x_102 == 0)
 {
-lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_103 = lean_ctor_get(x_100, 0);
-x_104 = lean_ctor_get(x_100, 1);
-x_105 = lean_ctor_get(x_1, 0);
-lean_ctor_set(x_98, 0, x_79);
-x_106 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_106, 0, x_98);
-lean_ctor_set(x_106, 1, x_103);
-lean_ctor_set(x_106, 2, x_104);
-lean_ctor_set(x_106, 3, x_3);
-lean_ctor_set_tag(x_100, 1);
-lean_ctor_set(x_100, 1, x_105);
-lean_ctor_set(x_100, 0, x_106);
-lean_ctor_set(x_1, 0, x_100);
-lean_ctor_set(x_75, 0, x_1);
-x_107 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_107, 0, x_75);
-return x_107;
+uint8_t x_103; 
+x_103 = !lean_is_exclusive(x_1);
+if (x_103 == 0)
+{
+lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
+x_104 = lean_ctor_get(x_101, 0);
+x_105 = lean_ctor_get(x_101, 1);
+x_106 = lean_ctor_get(x_1, 0);
+lean_ctor_set(x_99, 0, x_80);
+x_107 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_107, 0, x_99);
+lean_ctor_set(x_107, 1, x_104);
+lean_ctor_set(x_107, 2, x_105);
+lean_ctor_set(x_107, 3, x_3);
+lean_ctor_set_tag(x_101, 1);
+lean_ctor_set(x_101, 1, x_106);
+lean_ctor_set(x_101, 0, x_107);
+lean_ctor_set(x_1, 0, x_101);
+lean_ctor_set(x_76, 0, x_1);
+x_108 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_108, 0, x_76);
+return x_108;
 }
 else
 {
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-x_108 = lean_ctor_get(x_100, 0);
-x_109 = lean_ctor_get(x_100, 1);
-x_110 = lean_ctor_get(x_1, 0);
-x_111 = lean_ctor_get(x_1, 1);
-x_112 = lean_ctor_get(x_1, 2);
+lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+x_109 = lean_ctor_get(x_101, 0);
+x_110 = lean_ctor_get(x_101, 1);
+x_111 = lean_ctor_get(x_1, 0);
+x_112 = lean_ctor_get(x_1, 1);
+x_113 = lean_ctor_get(x_1, 2);
+x_114 = lean_ctor_get(x_1, 3);
+lean_inc(x_114);
+lean_inc(x_113);
 lean_inc(x_112);
 lean_inc(x_111);
-lean_inc(x_110);
 lean_dec(x_1);
-lean_ctor_set(x_98, 0, x_79);
-x_113 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_113, 0, x_98);
-lean_ctor_set(x_113, 1, x_108);
-lean_ctor_set(x_113, 2, x_109);
-lean_ctor_set(x_113, 3, x_3);
-lean_ctor_set_tag(x_100, 1);
-lean_ctor_set(x_100, 1, x_110);
-lean_ctor_set(x_100, 0, x_113);
-x_114 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_114, 0, x_100);
-lean_ctor_set(x_114, 1, x_111);
-lean_ctor_set(x_114, 2, x_112);
-lean_ctor_set(x_75, 0, x_114);
-x_115 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_115, 0, x_75);
-return x_115;
+lean_ctor_set(x_99, 0, x_80);
+x_115 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_115, 0, x_99);
+lean_ctor_set(x_115, 1, x_109);
+lean_ctor_set(x_115, 2, x_110);
+lean_ctor_set(x_115, 3, x_3);
+lean_ctor_set_tag(x_101, 1);
+lean_ctor_set(x_101, 1, x_111);
+lean_ctor_set(x_101, 0, x_115);
+x_116 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_116, 0, x_101);
+lean_ctor_set(x_116, 1, x_112);
+lean_ctor_set(x_116, 2, x_113);
+lean_ctor_set(x_116, 3, x_114);
+lean_ctor_set(x_76, 0, x_116);
+x_117 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_117, 0, x_76);
+return x_117;
 }
 }
 else
 {
-lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-x_116 = lean_ctor_get(x_100, 0);
-x_117 = lean_ctor_get(x_100, 1);
-lean_inc(x_117);
-lean_inc(x_116);
-lean_dec(x_100);
-x_118 = lean_ctor_get(x_1, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_1, 1);
+lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; 
+x_118 = lean_ctor_get(x_101, 0);
+x_119 = lean_ctor_get(x_101, 1);
 lean_inc(x_119);
-x_120 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_120);
+lean_inc(x_118);
+lean_dec(x_101);
+x_120 = lean_ctor_get(x_1, 0);
+lean_inc(x_120);
+x_121 = lean_ctor_get(x_1, 1);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_122);
+x_123 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_123);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
  lean_ctor_release(x_1, 2);
- x_121 = x_1;
+ lean_ctor_release(x_1, 3);
+ x_124 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_121 = lean_box(0);
+ x_124 = lean_box(0);
 }
-lean_ctor_set(x_98, 0, x_79);
-x_122 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_122, 0, x_98);
-lean_ctor_set(x_122, 1, x_116);
-lean_ctor_set(x_122, 2, x_117);
-lean_ctor_set(x_122, 3, x_3);
-x_123 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_123, 0, x_122);
-lean_ctor_set(x_123, 1, x_118);
-if (lean_is_scalar(x_121)) {
- x_124 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_99, 0, x_80);
+x_125 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_125, 0, x_99);
+lean_ctor_set(x_125, 1, x_118);
+lean_ctor_set(x_125, 2, x_119);
+lean_ctor_set(x_125, 3, x_3);
+x_126 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_126, 0, x_125);
+lean_ctor_set(x_126, 1, x_120);
+if (lean_is_scalar(x_124)) {
+ x_127 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_124 = x_121;
+ x_127 = x_124;
 }
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_119);
-lean_ctor_set(x_124, 2, x_120);
-lean_ctor_set(x_75, 0, x_124);
-x_125 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_125, 0, x_75);
-return x_125;
+lean_ctor_set(x_127, 0, x_126);
+lean_ctor_set(x_127, 1, x_121);
+lean_ctor_set(x_127, 2, x_122);
+lean_ctor_set(x_127, 3, x_123);
+lean_ctor_set(x_76, 0, x_127);
+x_128 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_128, 0, x_76);
+return x_128;
 }
 }
 else
 {
-lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-x_126 = lean_ctor_get(x_98, 0);
-lean_inc(x_126);
-lean_dec(x_98);
-x_127 = lean_ctor_get(x_126, 0);
-lean_inc(x_127);
-x_128 = lean_ctor_get(x_126, 1);
-lean_inc(x_128);
-if (lean_is_exclusive(x_126)) {
- lean_ctor_release(x_126, 0);
- lean_ctor_release(x_126, 1);
- x_129 = x_126;
-} else {
- lean_dec_ref(x_126);
- x_129 = lean_box(0);
-}
-x_130 = lean_ctor_get(x_1, 0);
+lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_129 = lean_ctor_get(x_99, 0);
+lean_inc(x_129);
+lean_dec(x_99);
+x_130 = lean_ctor_get(x_129, 0);
 lean_inc(x_130);
-x_131 = lean_ctor_get(x_1, 1);
+x_131 = lean_ctor_get(x_129, 1);
 lean_inc(x_131);
-x_132 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_132);
+if (lean_is_exclusive(x_129)) {
+ lean_ctor_release(x_129, 0);
+ lean_ctor_release(x_129, 1);
+ x_132 = x_129;
+} else {
+ lean_dec_ref(x_129);
+ x_132 = lean_box(0);
+}
+x_133 = lean_ctor_get(x_1, 0);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_1, 1);
+lean_inc(x_134);
+x_135 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_135);
+x_136 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_136);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
  lean_ctor_release(x_1, 2);
- x_133 = x_1;
+ lean_ctor_release(x_1, 3);
+ x_137 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_133 = lean_box(0);
+ x_137 = lean_box(0);
 }
-x_134 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_134, 0, x_79);
-x_135 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_135, 0, x_134);
-lean_ctor_set(x_135, 1, x_127);
-lean_ctor_set(x_135, 2, x_128);
-lean_ctor_set(x_135, 3, x_3);
-if (lean_is_scalar(x_129)) {
- x_136 = lean_alloc_ctor(1, 2, 0);
+x_138 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_138, 0, x_80);
+x_139 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_139, 0, x_138);
+lean_ctor_set(x_139, 1, x_130);
+lean_ctor_set(x_139, 2, x_131);
+lean_ctor_set(x_139, 3, x_3);
+if (lean_is_scalar(x_132)) {
+ x_140 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_136 = x_129;
- lean_ctor_set_tag(x_136, 1);
+ x_140 = x_132;
+ lean_ctor_set_tag(x_140, 1);
 }
-lean_ctor_set(x_136, 0, x_135);
-lean_ctor_set(x_136, 1, x_130);
-if (lean_is_scalar(x_133)) {
- x_137 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_140, 0, x_139);
+lean_ctor_set(x_140, 1, x_133);
+if (lean_is_scalar(x_137)) {
+ x_141 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_137 = x_133;
+ x_141 = x_137;
 }
-lean_ctor_set(x_137, 0, x_136);
-lean_ctor_set(x_137, 1, x_131);
-lean_ctor_set(x_137, 2, x_132);
-lean_ctor_set(x_75, 0, x_137);
-x_138 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_138, 0, x_75);
-return x_138;
+lean_ctor_set(x_141, 0, x_140);
+lean_ctor_set(x_141, 1, x_134);
+lean_ctor_set(x_141, 2, x_135);
+lean_ctor_set(x_141, 3, x_136);
+lean_ctor_set(x_76, 0, x_141);
+x_142 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_142, 0, x_76);
+return x_142;
 }
 }
 else
 {
-uint8_t x_139; 
-lean_dec(x_98);
-x_139 = !lean_is_exclusive(x_1);
-if (x_139 == 0)
+uint8_t x_143; 
+lean_dec(x_99);
+x_143 = !lean_is_exclusive(x_1);
+if (x_143 == 0)
 {
-lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_140 = lean_ctor_get(x_1, 0);
-lean_ctor_set(x_75, 0, x_79);
-x_141 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_141, 0, x_75);
-lean_ctor_set(x_141, 1, x_80);
-lean_ctor_set(x_141, 2, x_3);
-lean_ctor_set_tag(x_77, 1);
-lean_ctor_set(x_77, 1, x_140);
-lean_ctor_set(x_77, 0, x_141);
-lean_ctor_set(x_1, 0, x_77);
-x_142 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_142, 0, x_1);
-x_143 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_143, 0, x_142);
-return x_143;
-}
-else
-{
-lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
+lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
 x_144 = lean_ctor_get(x_1, 0);
-x_145 = lean_ctor_get(x_1, 1);
-x_146 = lean_ctor_get(x_1, 2);
-lean_inc(x_146);
-lean_inc(x_145);
-lean_inc(x_144);
+lean_ctor_set(x_76, 0, x_80);
+x_145 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_145, 0, x_76);
+lean_ctor_set(x_145, 1, x_81);
+lean_ctor_set(x_145, 2, x_3);
+lean_ctor_set_tag(x_78, 1);
+lean_ctor_set(x_78, 1, x_144);
+lean_ctor_set(x_78, 0, x_145);
+lean_ctor_set(x_1, 0, x_78);
+x_146 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_146, 0, x_1);
+x_147 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_147, 0, x_146);
+return x_147;
+}
+else
+{
+lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+x_148 = lean_ctor_get(x_1, 0);
+x_149 = lean_ctor_get(x_1, 1);
+x_150 = lean_ctor_get(x_1, 2);
+x_151 = lean_ctor_get(x_1, 3);
+lean_inc(x_151);
+lean_inc(x_150);
+lean_inc(x_149);
+lean_inc(x_148);
 lean_dec(x_1);
-lean_ctor_set(x_75, 0, x_79);
-x_147 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_147, 0, x_75);
-lean_ctor_set(x_147, 1, x_80);
-lean_ctor_set(x_147, 2, x_3);
-lean_ctor_set_tag(x_77, 1);
-lean_ctor_set(x_77, 1, x_144);
-lean_ctor_set(x_77, 0, x_147);
-x_148 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_148, 0, x_77);
-lean_ctor_set(x_148, 1, x_145);
-lean_ctor_set(x_148, 2, x_146);
-x_149 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_149, 0, x_148);
-x_150 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_150, 0, x_149);
-return x_150;
-}
-}
-}
-}
-else
-{
-lean_object* x_151; lean_object* x_152; 
-lean_free_object(x_77);
-lean_free_object(x_75);
-x_151 = l_Lean_Expr_bvarIdx_x21(x_80);
-lean_dec(x_80);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc_ref(x_3);
-x_152 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_151, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_151);
-if (lean_obj_tag(x_152) == 0)
-{
-lean_object* x_153; 
-x_153 = lean_ctor_get(x_152, 0);
-lean_inc(x_153);
-if (lean_obj_tag(x_153) == 0)
-{
-lean_dec(x_79);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-return x_152;
-}
-else
-{
-lean_object* x_154; lean_object* x_155; 
-lean_dec_ref(x_152);
-x_154 = lean_ctor_get(x_153, 0);
-lean_inc(x_154);
-lean_dec_ref(x_153);
-x_155 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_79, x_154, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_79);
+lean_ctor_set(x_76, 0, x_80);
+x_152 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_152, 0, x_76);
+lean_ctor_set(x_152, 1, x_81);
+lean_ctor_set(x_152, 2, x_3);
+lean_ctor_set_tag(x_78, 1);
+lean_ctor_set(x_78, 1, x_148);
+lean_ctor_set(x_78, 0, x_152);
+x_153 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_153, 0, x_78);
+lean_ctor_set(x_153, 1, x_149);
+lean_ctor_set(x_153, 2, x_150);
+lean_ctor_set(x_153, 3, x_151);
+x_154 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_154, 0, x_153);
+x_155 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_155, 0, x_154);
 return x_155;
 }
 }
-else
-{
-lean_dec(x_79);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-return x_152;
-}
 }
 }
 else
 {
-lean_object* x_156; lean_object* x_157; uint8_t x_158; 
-x_156 = lean_ctor_get(x_77, 0);
-x_157 = lean_ctor_get(x_77, 1);
-lean_inc(x_157);
-lean_inc(x_156);
-lean_dec(x_77);
-x_158 = l_Lean_Expr_isBVar(x_157);
-if (x_158 == 0)
-{
-lean_object* x_159; 
-x_159 = l_Lean_Meta_Grind_groundPattern_x3f(x_157);
-if (lean_obj_tag(x_159) == 1)
-{
-lean_object* x_160; lean_object* x_161; 
-lean_dec(x_157);
-lean_free_object(x_75);
-x_160 = lean_ctor_get(x_159, 0);
-lean_inc(x_160);
-lean_dec_ref(x_159);
+lean_object* x_156; lean_object* x_157; 
+lean_free_object(x_78);
+lean_free_object(x_76);
+x_156 = l_Lean_Expr_bvarIdx_x21(x_81);
+lean_dec(x_81);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -4502,25 +4457,110 @@ lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_161 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchGroundPattern(x_160, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_161) == 0)
+x_157 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_156, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_156);
+if (lean_obj_tag(x_157) == 0)
 {
-lean_object* x_162; lean_object* x_163; uint8_t x_164; 
-x_162 = lean_ctor_get(x_161, 0);
-lean_inc(x_162);
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- x_163 = x_161;
-} else {
- lean_dec_ref(x_161);
- x_163 = lean_box(0);
+lean_object* x_158; 
+x_158 = lean_ctor_get(x_157, 0);
+lean_inc(x_158);
+if (lean_obj_tag(x_158) == 0)
+{
+lean_dec(x_80);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_157;
 }
-x_164 = lean_unbox(x_162);
-lean_dec(x_162);
-if (x_164 == 0)
+else
+{
+lean_object* x_159; lean_object* x_160; 
+lean_dec_ref(x_157);
+x_159 = lean_ctor_get(x_158, 0);
+lean_inc(x_159);
+lean_dec_ref(x_158);
+x_160 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_80, x_159, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_80);
+return x_160;
+}
+}
+else
+{
+lean_dec(x_80);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_157;
+}
+}
+}
+else
+{
+lean_object* x_161; lean_object* x_162; uint8_t x_163; 
+x_161 = lean_ctor_get(x_78, 0);
+x_162 = lean_ctor_get(x_78, 1);
+lean_inc(x_162);
+lean_inc(x_161);
+lean_dec(x_78);
+x_163 = l_Lean_Expr_isBVar(x_162);
+if (x_163 == 0)
+{
+lean_object* x_164; 
+x_164 = l_Lean_Meta_Grind_groundPattern_x3f(x_162);
+if (lean_obj_tag(x_164) == 1)
 {
 lean_object* x_165; lean_object* x_166; 
-lean_dec(x_156);
+lean_dec(x_162);
+lean_free_object(x_76);
+x_165 = lean_ctor_get(x_164, 0);
+lean_inc(x_165);
+lean_dec_ref(x_164);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc_ref(x_3);
+x_166 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchGroundPattern(x_165, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_166) == 0)
+{
+lean_object* x_167; lean_object* x_168; uint8_t x_169; 
+x_167 = lean_ctor_get(x_166, 0);
+lean_inc(x_167);
+if (lean_is_exclusive(x_166)) {
+ lean_ctor_release(x_166, 0);
+ x_168 = x_166;
+} else {
+ lean_dec_ref(x_166);
+ x_168 = lean_box(0);
+}
+x_169 = lean_unbox(x_167);
+lean_dec(x_167);
+if (x_169 == 0)
+{
+lean_object* x_170; lean_object* x_171; 
+lean_dec(x_161);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -4533,28 +4573,28 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_165 = lean_box(0);
-if (lean_is_scalar(x_163)) {
- x_166 = lean_alloc_ctor(0, 1, 0);
+x_170 = lean_box(0);
+if (lean_is_scalar(x_168)) {
+ x_171 = lean_alloc_ctor(0, 1, 0);
 } else {
- x_166 = x_163;
+ x_171 = x_168;
 }
-lean_ctor_set(x_166, 0, x_165);
-return x_166;
+lean_ctor_set(x_171, 0, x_170);
+return x_171;
 }
 else
 {
-lean_object* x_167; 
-lean_dec(x_163);
-x_167 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_156, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_156);
-return x_167;
+lean_object* x_172; 
+lean_dec(x_168);
+x_172 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_161, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_161);
+return x_172;
 }
 }
 else
 {
-lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-lean_dec(x_156);
+lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+lean_dec(x_161);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -4567,28 +4607,28 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_168 = lean_ctor_get(x_161, 0);
-lean_inc(x_168);
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- x_169 = x_161;
+x_173 = lean_ctor_get(x_166, 0);
+lean_inc(x_173);
+if (lean_is_exclusive(x_166)) {
+ lean_ctor_release(x_166, 0);
+ x_174 = x_166;
 } else {
- lean_dec_ref(x_161);
- x_169 = lean_box(0);
+ lean_dec_ref(x_166);
+ x_174 = lean_box(0);
 }
-if (lean_is_scalar(x_169)) {
- x_170 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_174)) {
+ x_175 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_170 = x_169;
+ x_175 = x_174;
 }
-lean_ctor_set(x_170, 0, x_168);
-return x_170;
+lean_ctor_set(x_175, 0, x_173);
+return x_175;
 }
 }
 else
 {
-lean_object* x_171; 
-lean_dec(x_159);
+lean_object* x_176; 
+lean_dec(x_164);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -4599,129 +4639,137 @@ lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_inc(x_157);
-x_171 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_157);
-if (lean_obj_tag(x_171) == 1)
+lean_inc(x_162);
+x_176 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_162);
+if (lean_obj_tag(x_176) == 1)
 {
-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_dec(x_157);
-x_172 = lean_ctor_get(x_171, 0);
-lean_inc(x_172);
-if (lean_is_exclusive(x_171)) {
- lean_ctor_release(x_171, 0);
- x_173 = x_171;
-} else {
- lean_dec_ref(x_171);
- x_173 = lean_box(0);
-}
-x_174 = lean_ctor_get(x_172, 0);
-lean_inc(x_174);
-x_175 = lean_ctor_get(x_172, 1);
-lean_inc(x_175);
-if (lean_is_exclusive(x_172)) {
- lean_ctor_release(x_172, 0);
- lean_ctor_release(x_172, 1);
- x_176 = x_172;
-} else {
- lean_dec_ref(x_172);
- x_176 = lean_box(0);
-}
-x_177 = lean_ctor_get(x_1, 0);
+lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; 
+lean_dec(x_162);
+x_177 = lean_ctor_get(x_176, 0);
 lean_inc(x_177);
-x_178 = lean_ctor_get(x_1, 1);
-lean_inc(x_178);
-x_179 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_179);
+if (lean_is_exclusive(x_176)) {
+ lean_ctor_release(x_176, 0);
+ x_178 = x_176;
+} else {
+ lean_dec_ref(x_176);
+ x_178 = lean_box(0);
+}
+x_179 = lean_ctor_get(x_177, 0);
+lean_inc(x_179);
+x_180 = lean_ctor_get(x_177, 1);
+lean_inc(x_180);
+if (lean_is_exclusive(x_177)) {
+ lean_ctor_release(x_177, 0);
+ lean_ctor_release(x_177, 1);
+ x_181 = x_177;
+} else {
+ lean_dec_ref(x_177);
+ x_181 = lean_box(0);
+}
+x_182 = lean_ctor_get(x_1, 0);
+lean_inc(x_182);
+x_183 = lean_ctor_get(x_1, 1);
+lean_inc(x_183);
+x_184 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_184);
+x_185 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_185);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
  lean_ctor_release(x_1, 2);
- x_180 = x_1;
+ lean_ctor_release(x_1, 3);
+ x_186 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_180 = lean_box(0);
+ x_186 = lean_box(0);
 }
-if (lean_is_scalar(x_173)) {
- x_181 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_178)) {
+ x_187 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_181 = x_173;
+ x_187 = x_178;
 }
-lean_ctor_set(x_181, 0, x_156);
-x_182 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_182, 0, x_181);
-lean_ctor_set(x_182, 1, x_174);
-lean_ctor_set(x_182, 2, x_175);
-lean_ctor_set(x_182, 3, x_3);
-if (lean_is_scalar(x_176)) {
- x_183 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_187, 0, x_161);
+x_188 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_188, 0, x_187);
+lean_ctor_set(x_188, 1, x_179);
+lean_ctor_set(x_188, 2, x_180);
+lean_ctor_set(x_188, 3, x_3);
+if (lean_is_scalar(x_181)) {
+ x_189 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_183 = x_176;
- lean_ctor_set_tag(x_183, 1);
+ x_189 = x_181;
+ lean_ctor_set_tag(x_189, 1);
 }
-lean_ctor_set(x_183, 0, x_182);
-lean_ctor_set(x_183, 1, x_177);
-if (lean_is_scalar(x_180)) {
- x_184 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_189, 0, x_188);
+lean_ctor_set(x_189, 1, x_182);
+if (lean_is_scalar(x_186)) {
+ x_190 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_184 = x_180;
+ x_190 = x_186;
 }
-lean_ctor_set(x_184, 0, x_183);
-lean_ctor_set(x_184, 1, x_178);
-lean_ctor_set(x_184, 2, x_179);
-lean_ctor_set(x_75, 0, x_184);
-x_185 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_185, 0, x_75);
-return x_185;
+lean_ctor_set(x_190, 0, x_189);
+lean_ctor_set(x_190, 1, x_183);
+lean_ctor_set(x_190, 2, x_184);
+lean_ctor_set(x_190, 3, x_185);
+lean_ctor_set(x_76, 0, x_190);
+x_191 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_191, 0, x_76);
+return x_191;
 }
 else
 {
-lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
-lean_dec(x_171);
-x_186 = lean_ctor_get(x_1, 0);
-lean_inc(x_186);
-x_187 = lean_ctor_get(x_1, 1);
-lean_inc(x_187);
-x_188 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_188);
+lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; 
+lean_dec(x_176);
+x_192 = lean_ctor_get(x_1, 0);
+lean_inc(x_192);
+x_193 = lean_ctor_get(x_1, 1);
+lean_inc(x_193);
+x_194 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_194);
+x_195 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_195);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
  lean_ctor_release(x_1, 2);
- x_189 = x_1;
+ lean_ctor_release(x_1, 3);
+ x_196 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_189 = lean_box(0);
+ x_196 = lean_box(0);
 }
-lean_ctor_set(x_75, 0, x_156);
-x_190 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_190, 0, x_75);
-lean_ctor_set(x_190, 1, x_157);
-lean_ctor_set(x_190, 2, x_3);
-x_191 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_191, 0, x_190);
-lean_ctor_set(x_191, 1, x_186);
-if (lean_is_scalar(x_189)) {
- x_192 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_76, 0, x_161);
+x_197 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_197, 0, x_76);
+lean_ctor_set(x_197, 1, x_162);
+lean_ctor_set(x_197, 2, x_3);
+x_198 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_198, 0, x_197);
+lean_ctor_set(x_198, 1, x_192);
+if (lean_is_scalar(x_196)) {
+ x_199 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_192 = x_189;
+ x_199 = x_196;
 }
-lean_ctor_set(x_192, 0, x_191);
-lean_ctor_set(x_192, 1, x_187);
-lean_ctor_set(x_192, 2, x_188);
-x_193 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_193, 0, x_192);
-x_194 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_194, 0, x_193);
-return x_194;
+lean_ctor_set(x_199, 0, x_198);
+lean_ctor_set(x_199, 1, x_193);
+lean_ctor_set(x_199, 2, x_194);
+lean_ctor_set(x_199, 3, x_195);
+x_200 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_200, 0, x_199);
+x_201 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_201, 0, x_200);
+return x_201;
 }
 }
 }
 else
 {
-lean_object* x_195; lean_object* x_196; 
-lean_free_object(x_75);
-x_195 = l_Lean_Expr_bvarIdx_x21(x_157);
-lean_dec(x_157);
+lean_object* x_202; lean_object* x_203; 
+lean_free_object(x_76);
+x_202 = l_Lean_Expr_bvarIdx_x21(x_162);
+lean_dec(x_162);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -4733,330 +4781,91 @@ lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_196 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_195, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_195);
-if (lean_obj_tag(x_196) == 0)
-{
-lean_object* x_197; 
-x_197 = lean_ctor_get(x_196, 0);
-lean_inc(x_197);
-if (lean_obj_tag(x_197) == 0)
-{
-lean_dec(x_156);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-return x_196;
-}
-else
-{
-lean_object* x_198; lean_object* x_199; 
-lean_dec_ref(x_196);
-x_198 = lean_ctor_get(x_197, 0);
-lean_inc(x_198);
-lean_dec_ref(x_197);
-x_199 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_156, x_198, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_156);
-return x_199;
-}
-}
-else
-{
-lean_dec(x_156);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-return x_196;
-}
-}
-}
-}
-else
-{
-lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; uint8_t x_204; 
-x_200 = lean_ctor_get(x_75, 0);
-lean_inc(x_200);
-lean_dec(x_75);
-x_201 = lean_ctor_get(x_200, 0);
-lean_inc(x_201);
-x_202 = lean_ctor_get(x_200, 1);
-lean_inc(x_202);
-if (lean_is_exclusive(x_200)) {
- lean_ctor_release(x_200, 0);
- lean_ctor_release(x_200, 1);
- x_203 = x_200;
-} else {
- lean_dec_ref(x_200);
- x_203 = lean_box(0);
-}
-x_204 = l_Lean_Expr_isBVar(x_202);
-if (x_204 == 0)
-{
-lean_object* x_205; 
-x_205 = l_Lean_Meta_Grind_groundPattern_x3f(x_202);
-if (lean_obj_tag(x_205) == 1)
-{
-lean_object* x_206; lean_object* x_207; 
-lean_dec(x_203);
+x_203 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_202, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_202);
-x_206 = lean_ctor_get(x_205, 0);
-lean_inc(x_206);
-lean_dec_ref(x_205);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc_ref(x_3);
-x_207 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchGroundPattern(x_206, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_207) == 0)
+if (lean_obj_tag(x_203) == 0)
 {
-lean_object* x_208; lean_object* x_209; uint8_t x_210; 
+lean_object* x_204; 
+x_204 = lean_ctor_get(x_203, 0);
+lean_inc(x_204);
+if (lean_obj_tag(x_204) == 0)
+{
+lean_dec(x_161);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_203;
+}
+else
+{
+lean_object* x_205; lean_object* x_206; 
+lean_dec_ref(x_203);
+x_205 = lean_ctor_get(x_204, 0);
+lean_inc(x_205);
+lean_dec_ref(x_204);
+x_206 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_161, x_205, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_161);
+return x_206;
+}
+}
+else
+{
+lean_dec(x_161);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_203;
+}
+}
+}
+}
+else
+{
+lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; uint8_t x_211; 
+x_207 = lean_ctor_get(x_76, 0);
+lean_inc(x_207);
+lean_dec(x_76);
 x_208 = lean_ctor_get(x_207, 0);
 lean_inc(x_208);
+x_209 = lean_ctor_get(x_207, 1);
+lean_inc(x_209);
 if (lean_is_exclusive(x_207)) {
  lean_ctor_release(x_207, 0);
- x_209 = x_207;
+ lean_ctor_release(x_207, 1);
+ x_210 = x_207;
 } else {
  lean_dec_ref(x_207);
- x_209 = lean_box(0);
+ x_210 = lean_box(0);
 }
-x_210 = lean_unbox(x_208);
-lean_dec(x_208);
-if (x_210 == 0)
+x_211 = l_Lean_Expr_isBVar(x_209);
+if (x_211 == 0)
 {
-lean_object* x_211; lean_object* x_212; 
-lean_dec(x_201);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-lean_dec_ref(x_1);
-x_211 = lean_box(0);
-if (lean_is_scalar(x_209)) {
- x_212 = lean_alloc_ctor(0, 1, 0);
-} else {
- x_212 = x_209;
-}
-lean_ctor_set(x_212, 0, x_211);
-return x_212;
-}
-else
+lean_object* x_212; 
+x_212 = l_Lean_Meta_Grind_groundPattern_x3f(x_209);
+if (lean_obj_tag(x_212) == 1)
 {
-lean_object* x_213; 
+lean_object* x_213; lean_object* x_214; 
+lean_dec(x_210);
 lean_dec(x_209);
-x_213 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_201, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_201);
-return x_213;
-}
-}
-else
-{
-lean_object* x_214; lean_object* x_215; lean_object* x_216; 
-lean_dec(x_201);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-lean_dec_ref(x_1);
-x_214 = lean_ctor_get(x_207, 0);
-lean_inc(x_214);
-if (lean_is_exclusive(x_207)) {
- lean_ctor_release(x_207, 0);
- x_215 = x_207;
-} else {
- lean_dec_ref(x_207);
- x_215 = lean_box(0);
-}
-if (lean_is_scalar(x_215)) {
- x_216 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_216 = x_215;
-}
-lean_ctor_set(x_216, 0, x_214);
-return x_216;
-}
-}
-else
-{
-lean_object* x_217; 
-lean_dec(x_205);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_inc(x_202);
-x_217 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_202);
-if (lean_obj_tag(x_217) == 1)
-{
-lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; 
-lean_dec(x_203);
-lean_dec(x_202);
-x_218 = lean_ctor_get(x_217, 0);
-lean_inc(x_218);
-if (lean_is_exclusive(x_217)) {
- lean_ctor_release(x_217, 0);
- x_219 = x_217;
-} else {
- lean_dec_ref(x_217);
- x_219 = lean_box(0);
-}
-x_220 = lean_ctor_get(x_218, 0);
-lean_inc(x_220);
-x_221 = lean_ctor_get(x_218, 1);
-lean_inc(x_221);
-if (lean_is_exclusive(x_218)) {
- lean_ctor_release(x_218, 0);
- lean_ctor_release(x_218, 1);
- x_222 = x_218;
-} else {
- lean_dec_ref(x_218);
- x_222 = lean_box(0);
-}
-x_223 = lean_ctor_get(x_1, 0);
-lean_inc(x_223);
-x_224 = lean_ctor_get(x_1, 1);
-lean_inc(x_224);
-x_225 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_225);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- lean_ctor_release(x_1, 2);
- x_226 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_226 = lean_box(0);
-}
-if (lean_is_scalar(x_219)) {
- x_227 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_227 = x_219;
-}
-lean_ctor_set(x_227, 0, x_201);
-x_228 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_228, 0, x_227);
-lean_ctor_set(x_228, 1, x_220);
-lean_ctor_set(x_228, 2, x_221);
-lean_ctor_set(x_228, 3, x_3);
-if (lean_is_scalar(x_222)) {
- x_229 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_229 = x_222;
- lean_ctor_set_tag(x_229, 1);
-}
-lean_ctor_set(x_229, 0, x_228);
-lean_ctor_set(x_229, 1, x_223);
-if (lean_is_scalar(x_226)) {
- x_230 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_230 = x_226;
-}
-lean_ctor_set(x_230, 0, x_229);
-lean_ctor_set(x_230, 1, x_224);
-lean_ctor_set(x_230, 2, x_225);
-x_231 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_231, 0, x_230);
-x_232 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_232, 0, x_231);
-return x_232;
-}
-else
-{
-lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; 
-lean_dec(x_217);
-x_233 = lean_ctor_get(x_1, 0);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_1, 1);
-lean_inc(x_234);
-x_235 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_235);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- lean_ctor_release(x_1, 2);
- x_236 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_236 = lean_box(0);
-}
-x_237 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_237, 0, x_201);
-x_238 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_238, 0, x_237);
-lean_ctor_set(x_238, 1, x_202);
-lean_ctor_set(x_238, 2, x_3);
-if (lean_is_scalar(x_203)) {
- x_239 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_239 = x_203;
- lean_ctor_set_tag(x_239, 1);
-}
-lean_ctor_set(x_239, 0, x_238);
-lean_ctor_set(x_239, 1, x_233);
-if (lean_is_scalar(x_236)) {
- x_240 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_240 = x_236;
-}
-lean_ctor_set(x_240, 0, x_239);
-lean_ctor_set(x_240, 1, x_234);
-lean_ctor_set(x_240, 2, x_235);
-x_241 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_241, 0, x_240);
-x_242 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_242, 0, x_241);
-return x_242;
-}
-}
-}
-else
-{
-lean_object* x_243; lean_object* x_244; 
-lean_dec(x_203);
-x_243 = l_Lean_Expr_bvarIdx_x21(x_202);
-lean_dec(x_202);
+x_213 = lean_ctor_get(x_212, 0);
+lean_inc(x_213);
+lean_dec_ref(x_212);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -5068,16 +4877,25 @@ lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_244 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_243, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_243);
-if (lean_obj_tag(x_244) == 0)
+x_214 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchGroundPattern(x_213, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_214) == 0)
 {
-lean_object* x_245; 
-x_245 = lean_ctor_get(x_244, 0);
-lean_inc(x_245);
-if (lean_obj_tag(x_245) == 0)
+lean_object* x_215; lean_object* x_216; uint8_t x_217; 
+x_215 = lean_ctor_get(x_214, 0);
+lean_inc(x_215);
+if (lean_is_exclusive(x_214)) {
+ lean_ctor_release(x_214, 0);
+ x_216 = x_214;
+} else {
+ lean_dec_ref(x_214);
+ x_216 = lean_box(0);
+}
+x_217 = lean_unbox(x_215);
+lean_dec(x_215);
+if (x_217 == 0)
 {
-lean_dec(x_201);
+lean_object* x_218; lean_object* x_219; 
+lean_dec(x_208);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -5089,23 +4907,29 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
-return x_244;
+lean_dec_ref(x_1);
+x_218 = lean_box(0);
+if (lean_is_scalar(x_216)) {
+ x_219 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_219 = x_216;
+}
+lean_ctor_set(x_219, 0, x_218);
+return x_219;
 }
 else
 {
-lean_object* x_246; lean_object* x_247; 
-lean_dec_ref(x_244);
-x_246 = lean_ctor_get(x_245, 0);
-lean_inc(x_246);
-lean_dec_ref(x_245);
-x_247 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_201, x_246, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_201);
-return x_247;
+lean_object* x_220; 
+lean_dec(x_216);
+x_220 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_208, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_208);
+return x_220;
 }
 }
 else
 {
-lean_dec(x_201);
+lean_object* x_221; lean_object* x_222; lean_object* x_223; 
+lean_dec(x_208);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -5117,15 +4941,29 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
-return x_244;
+lean_dec_ref(x_1);
+x_221 = lean_ctor_get(x_214, 0);
+lean_inc(x_221);
+if (lean_is_exclusive(x_214)) {
+ lean_ctor_release(x_214, 0);
+ x_222 = x_214;
+} else {
+ lean_dec_ref(x_214);
+ x_222 = lean_box(0);
 }
+if (lean_is_scalar(x_222)) {
+ x_223 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_223 = x_222;
 }
+lean_ctor_set(x_223, 0, x_221);
+return x_223;
 }
 }
 else
 {
-uint8_t x_248; 
-lean_dec(x_75);
+lean_object* x_224; 
+lean_dec(x_212);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -5136,71 +4974,394 @@ lean_dec(x_7);
 lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_248 = !lean_is_exclusive(x_1);
-if (x_248 == 0)
+lean_inc(x_209);
+x_224 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_209);
+if (lean_obj_tag(x_224) == 1)
 {
-lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; 
-x_249 = lean_ctor_get(x_1, 0);
-x_250 = lean_box(0);
-x_251 = lean_alloc_ctor(0, 3, 0);
+lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; 
+lean_dec(x_210);
+lean_dec(x_209);
+x_225 = lean_ctor_get(x_224, 0);
+lean_inc(x_225);
+if (lean_is_exclusive(x_224)) {
+ lean_ctor_release(x_224, 0);
+ x_226 = x_224;
+} else {
+ lean_dec_ref(x_224);
+ x_226 = lean_box(0);
+}
+x_227 = lean_ctor_get(x_225, 0);
+lean_inc(x_227);
+x_228 = lean_ctor_get(x_225, 1);
+lean_inc(x_228);
+if (lean_is_exclusive(x_225)) {
+ lean_ctor_release(x_225, 0);
+ lean_ctor_release(x_225, 1);
+ x_229 = x_225;
+} else {
+ lean_dec_ref(x_225);
+ x_229 = lean_box(0);
+}
+x_230 = lean_ctor_get(x_1, 0);
+lean_inc(x_230);
+x_231 = lean_ctor_get(x_1, 1);
+lean_inc(x_231);
+x_232 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_232);
+x_233 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_233);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ lean_ctor_release(x_1, 1);
+ lean_ctor_release(x_1, 2);
+ lean_ctor_release(x_1, 3);
+ x_234 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_234 = lean_box(0);
+}
+if (lean_is_scalar(x_226)) {
+ x_235 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_235 = x_226;
+}
+lean_ctor_set(x_235, 0, x_208);
+x_236 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_236, 0, x_235);
+lean_ctor_set(x_236, 1, x_227);
+lean_ctor_set(x_236, 2, x_228);
+lean_ctor_set(x_236, 3, x_3);
+if (lean_is_scalar(x_229)) {
+ x_237 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_237 = x_229;
+ lean_ctor_set_tag(x_237, 1);
+}
+lean_ctor_set(x_237, 0, x_236);
+lean_ctor_set(x_237, 1, x_230);
+if (lean_is_scalar(x_234)) {
+ x_238 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_238 = x_234;
+}
+lean_ctor_set(x_238, 0, x_237);
+lean_ctor_set(x_238, 1, x_231);
+lean_ctor_set(x_238, 2, x_232);
+lean_ctor_set(x_238, 3, x_233);
+x_239 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_239, 0, x_238);
+x_240 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_240, 0, x_239);
+return x_240;
+}
+else
+{
+lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; 
+lean_dec(x_224);
+x_241 = lean_ctor_get(x_1, 0);
+lean_inc(x_241);
+x_242 = lean_ctor_get(x_1, 1);
+lean_inc(x_242);
+x_243 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_243);
+x_244 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_244);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ lean_ctor_release(x_1, 1);
+ lean_ctor_release(x_1, 2);
+ lean_ctor_release(x_1, 3);
+ x_245 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_245 = lean_box(0);
+}
+x_246 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_246, 0, x_208);
+x_247 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_247, 0, x_246);
+lean_ctor_set(x_247, 1, x_209);
+lean_ctor_set(x_247, 2, x_3);
+if (lean_is_scalar(x_210)) {
+ x_248 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_248 = x_210;
+ lean_ctor_set_tag(x_248, 1);
+}
+lean_ctor_set(x_248, 0, x_247);
+lean_ctor_set(x_248, 1, x_241);
+if (lean_is_scalar(x_245)) {
+ x_249 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_249 = x_245;
+}
+lean_ctor_set(x_249, 0, x_248);
+lean_ctor_set(x_249, 1, x_242);
+lean_ctor_set(x_249, 2, x_243);
+lean_ctor_set(x_249, 3, x_244);
+x_250 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_250, 0, x_249);
+x_251 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_251, 0, x_250);
-lean_ctor_set(x_251, 1, x_2);
-lean_ctor_set(x_251, 2, x_3);
-x_252 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_252, 0, x_251);
-lean_ctor_set(x_252, 1, x_249);
-lean_ctor_set(x_1, 0, x_252);
-x_253 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_253, 0, x_1);
-x_254 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_254, 0, x_253);
-return x_254;
+return x_251;
+}
+}
 }
 else
 {
-lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; 
-x_255 = lean_ctor_get(x_1, 0);
-x_256 = lean_ctor_get(x_1, 1);
-x_257 = lean_ctor_get(x_1, 2);
-lean_inc(x_257);
-lean_inc(x_256);
+lean_object* x_252; lean_object* x_253; 
+lean_dec(x_210);
+x_252 = l_Lean_Expr_bvarIdx_x21(x_209);
+lean_dec(x_209);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc_ref(x_3);
+x_253 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_252, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_252);
+if (lean_obj_tag(x_253) == 0)
+{
+lean_object* x_254; 
+x_254 = lean_ctor_get(x_253, 0);
+lean_inc(x_254);
+if (lean_obj_tag(x_254) == 0)
+{
+lean_dec(x_208);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_253;
+}
+else
+{
+lean_object* x_255; lean_object* x_256; 
+lean_dec_ref(x_253);
+x_255 = lean_ctor_get(x_254, 0);
 lean_inc(x_255);
-lean_dec(x_1);
-x_258 = lean_box(0);
-x_259 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_259, 0, x_258);
-lean_ctor_set(x_259, 1, x_2);
-lean_ctor_set(x_259, 2, x_3);
-x_260 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_260, 0, x_259);
-lean_ctor_set(x_260, 1, x_255);
-x_261 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_261, 0, x_260);
-lean_ctor_set(x_261, 1, x_256);
-lean_ctor_set(x_261, 2, x_257);
-x_262 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_262, 0, x_261);
-x_263 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_263, 0, x_262);
-return x_263;
+lean_dec_ref(x_254);
+x_256 = l_Lean_Meta_Grind_GenPatternInfo_assign_x3f(x_208, x_255, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_208);
+return x_256;
 }
 }
+else
+{
+lean_dec(x_208);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_253;
+}
 }
 }
 }
 else
 {
-lean_object* x_264; lean_object* x_265; 
-x_264 = l_Lean_Expr_bvarIdx_x21(x_2);
+lean_object* x_257; 
+lean_dec(x_76);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_257 = l_Lean_Meta_Grind_hoPattern_x3f(x_2);
+if (lean_obj_tag(x_257) == 1)
+{
+uint8_t x_258; 
 lean_dec_ref(x_2);
-x_265 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_264, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_264);
-return x_265;
+x_258 = !lean_is_exclusive(x_257);
+if (x_258 == 0)
+{
+uint8_t x_259; 
+x_259 = !lean_is_exclusive(x_1);
+if (x_259 == 0)
+{
+lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; 
+x_260 = lean_ctor_get(x_257, 0);
+x_261 = lean_ctor_get(x_1, 3);
+x_262 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_262, 0, x_260);
+lean_ctor_set(x_262, 1, x_3);
+x_263 = lean_array_push(x_261, x_262);
+lean_ctor_set(x_1, 3, x_263);
+lean_ctor_set(x_257, 0, x_1);
+x_264 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_264, 0, x_257);
+return x_264;
+}
+else
+{
+lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; 
+x_265 = lean_ctor_get(x_257, 0);
+x_266 = lean_ctor_get(x_1, 0);
+x_267 = lean_ctor_get(x_1, 1);
+x_268 = lean_ctor_get(x_1, 2);
+x_269 = lean_ctor_get(x_1, 3);
+lean_inc(x_269);
+lean_inc(x_268);
+lean_inc(x_267);
+lean_inc(x_266);
+lean_dec(x_1);
+x_270 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_270, 0, x_265);
+lean_ctor_set(x_270, 1, x_3);
+x_271 = lean_array_push(x_269, x_270);
+x_272 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_272, 0, x_266);
+lean_ctor_set(x_272, 1, x_267);
+lean_ctor_set(x_272, 2, x_268);
+lean_ctor_set(x_272, 3, x_271);
+lean_ctor_set(x_257, 0, x_272);
+x_273 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_273, 0, x_257);
+return x_273;
 }
 }
 else
 {
-lean_object* x_266; lean_object* x_267; 
+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_274 = lean_ctor_get(x_257, 0);
+lean_inc(x_274);
+lean_dec(x_257);
+x_275 = lean_ctor_get(x_1, 0);
+lean_inc(x_275);
+x_276 = lean_ctor_get(x_1, 1);
+lean_inc(x_276);
+x_277 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_277);
+x_278 = lean_ctor_get(x_1, 3);
+lean_inc_ref(x_278);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ lean_ctor_release(x_1, 1);
+ lean_ctor_release(x_1, 2);
+ lean_ctor_release(x_1, 3);
+ x_279 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_279 = lean_box(0);
+}
+x_280 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_280, 0, x_274);
+lean_ctor_set(x_280, 1, x_3);
+x_281 = lean_array_push(x_278, x_280);
+if (lean_is_scalar(x_279)) {
+ x_282 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_282 = x_279;
+}
+lean_ctor_set(x_282, 0, x_275);
+lean_ctor_set(x_282, 1, x_276);
+lean_ctor_set(x_282, 2, x_277);
+lean_ctor_set(x_282, 3, x_281);
+x_283 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_283, 0, x_282);
+x_284 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_284, 0, x_283);
+return x_284;
+}
+}
+else
+{
+uint8_t x_285; 
+lean_dec(x_257);
+x_285 = !lean_is_exclusive(x_1);
+if (x_285 == 0)
+{
+lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; 
+x_286 = lean_ctor_get(x_1, 0);
+x_287 = lean_box(0);
+x_288 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_288, 0, x_287);
+lean_ctor_set(x_288, 1, x_2);
+lean_ctor_set(x_288, 2, x_3);
+x_289 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_289, 0, x_288);
+lean_ctor_set(x_289, 1, x_286);
+lean_ctor_set(x_1, 0, x_289);
+x_290 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_290, 0, x_1);
+x_291 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_291, 0, x_290);
+return x_291;
+}
+else
+{
+lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; 
+x_292 = lean_ctor_get(x_1, 0);
+x_293 = lean_ctor_get(x_1, 1);
+x_294 = lean_ctor_get(x_1, 2);
+x_295 = lean_ctor_get(x_1, 3);
+lean_inc(x_295);
+lean_inc(x_294);
+lean_inc(x_293);
+lean_inc(x_292);
+lean_dec(x_1);
+x_296 = lean_box(0);
+x_297 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_297, 0, x_296);
+lean_ctor_set(x_297, 1, x_2);
+lean_ctor_set(x_297, 2, x_3);
+x_298 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_298, 0, x_297);
+lean_ctor_set(x_298, 1, x_292);
+x_299 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_299, 0, x_298);
+lean_ctor_set(x_299, 1, x_293);
+lean_ctor_set(x_299, 2, x_294);
+lean_ctor_set(x_299, 3, x_295);
+x_300 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_300, 0, x_299);
+x_301 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_301, 0, x_300);
+return x_301;
+}
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_302; lean_object* x_303; 
+x_302 = l_Lean_Expr_bvarIdx_x21(x_2);
+lean_dec_ref(x_2);
+x_303 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f(x_1, x_302, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_302);
+return x_303;
+}
+}
+else
+{
+lean_object* x_304; lean_object* x_305; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -5213,11 +5374,11 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_266 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_266, 0, x_1);
-x_267 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_267, 0, x_266);
-return x_267;
+x_304 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_304, 0, x_1);
+x_305 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_305, 0, x_304);
+return x_305;
 }
 }
 }
@@ -5232,38 +5393,43 @@ return x_15;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
 x_3 = lean_ctor_get(x_1, 0);
 x_4 = lean_ctor_get(x_1, 1);
 x_5 = lean_ctor_get(x_1, 2);
-x_6 = lean_nat_dec_le(x_2, x_4);
-if (x_6 == 0)
-{
-uint8_t x_7; 
-lean_inc_ref(x_5);
-lean_inc(x_3);
-x_7 = !lean_is_exclusive(x_1);
+x_6 = lean_ctor_get(x_1, 3);
+x_7 = lean_nat_dec_le(x_2, x_4);
 if (x_7 == 0)
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_8 = lean_ctor_get(x_1, 2);
-lean_dec(x_8);
-x_9 = lean_ctor_get(x_1, 1);
+uint8_t x_8; 
+lean_inc_ref(x_6);
+lean_inc_ref(x_5);
+lean_inc(x_3);
+x_8 = !lean_is_exclusive(x_1);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_9 = lean_ctor_get(x_1, 3);
 lean_dec(x_9);
-x_10 = lean_ctor_get(x_1, 0);
+x_10 = lean_ctor_get(x_1, 2);
 lean_dec(x_10);
+x_11 = lean_ctor_get(x_1, 1);
+lean_dec(x_11);
+x_12 = lean_ctor_get(x_1, 0);
+lean_dec(x_12);
 lean_ctor_set(x_1, 1, x_2);
 return x_1;
 }
 else
 {
-lean_object* x_11; 
+lean_object* x_13; 
 lean_dec(x_1);
-x_11 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_11, 0, x_3);
-lean_ctor_set(x_11, 1, x_2);
-lean_ctor_set(x_11, 2, x_5);
-return x_11;
+x_13 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_13, 0, x_3);
+lean_ctor_set(x_13, 1, x_2);
+lean_ctor_set(x_13, 2, x_5);
+lean_ctor_set(x_13, 3, x_6);
+return x_13;
 }
 }
 else
@@ -6840,34 +7006,37 @@ return x_95;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
 x_96 = lean_ctor_get(x_86, 0);
 x_97 = lean_ctor_get(x_86, 1);
 x_98 = lean_ctor_get(x_86, 2);
+x_99 = lean_ctor_get(x_86, 3);
+lean_inc(x_99);
 lean_inc(x_98);
 lean_inc(x_97);
 lean_inc(x_96);
 lean_dec(x_86);
-x_99 = lean_box(0);
-x_100 = lean_nat_sub(x_5, x_43);
+x_100 = lean_box(0);
+x_101 = lean_nat_sub(x_5, x_43);
 lean_dec(x_43);
 lean_inc_ref(x_6);
-x_101 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_101, 0, x_99);
-lean_ctor_set(x_101, 1, x_6);
-lean_ctor_set(x_101, 2, x_100);
-lean_ctor_set(x_101, 3, x_42);
+x_102 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_102, 0, x_100);
+lean_ctor_set(x_102, 1, x_6);
+lean_ctor_set(x_102, 2, x_101);
+lean_ctor_set(x_102, 3, x_42);
 lean_ctor_set_tag(x_40, 1);
 lean_ctor_set(x_40, 1, x_96);
-lean_ctor_set(x_40, 0, x_101);
-x_102 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_102, 0, x_40);
-lean_ctor_set(x_102, 1, x_97);
-lean_ctor_set(x_102, 2, x_98);
-x_103 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_102, x_8);
-if (lean_obj_tag(x_103) == 0)
+lean_ctor_set(x_40, 0, x_102);
+x_103 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_103, 0, x_40);
+lean_ctor_set(x_103, 1, x_97);
+lean_ctor_set(x_103, 2, x_98);
+lean_ctor_set(x_103, 3, x_99);
+x_104 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_103, x_8);
+if (lean_obj_tag(x_104) == 0)
 {
-lean_dec_ref(x_103);
+lean_dec_ref(x_104);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -6884,7 +7053,7 @@ goto block_32;
 }
 else
 {
-lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
 lean_dec(x_18);
 lean_dec_ref(x_17);
 lean_dec(x_16);
@@ -6899,22 +7068,22 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_104 = lean_ctor_get(x_103, 0);
-lean_inc(x_104);
-if (lean_is_exclusive(x_103)) {
- lean_ctor_release(x_103, 0);
- x_105 = x_103;
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+if (lean_is_exclusive(x_104)) {
+ lean_ctor_release(x_104, 0);
+ x_106 = x_104;
 } else {
- lean_dec_ref(x_103);
- x_105 = lean_box(0);
+ lean_dec_ref(x_104);
+ x_106 = lean_box(0);
 }
-if (lean_is_scalar(x_105)) {
- x_106 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_106)) {
+ x_107 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_106 = x_105;
+ x_107 = x_106;
 }
-lean_ctor_set(x_106, 0, x_104);
-return x_106;
+lean_ctor_set(x_107, 0, x_105);
+return x_107;
 }
 }
 }
@@ -6943,7 +7112,7 @@ goto block_32;
 }
 else
 {
-uint8_t x_107; 
+uint8_t x_108; 
 lean_free_object(x_40);
 lean_dec(x_43);
 lean_dec(x_42);
@@ -6962,30 +7131,30 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_107 = !lean_is_exclusive(x_44);
-if (x_107 == 0)
+x_108 = !lean_is_exclusive(x_44);
+if (x_108 == 0)
 {
 return x_44;
 }
 else
 {
-lean_object* x_108; lean_object* x_109; 
-x_108 = lean_ctor_get(x_44, 0);
-lean_inc(x_108);
+lean_object* x_109; lean_object* x_110; 
+x_109 = lean_ctor_get(x_44, 0);
+lean_inc(x_109);
 lean_dec(x_44);
-x_109 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_109, 0, x_108);
-return x_109;
+x_110 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_110, 0, x_109);
+return x_110;
 }
 }
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; 
-x_110 = lean_ctor_get(x_40, 0);
-x_111 = lean_ctor_get(x_40, 1);
+lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_111 = lean_ctor_get(x_40, 0);
+x_112 = lean_ctor_get(x_40, 1);
+lean_inc(x_112);
 lean_inc(x_111);
-lean_inc(x_110);
 lean_dec(x_40);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -6999,33 +7168,33 @@ lean_inc(x_10);
 lean_inc(x_9);
 lean_inc_ref(x_1);
 lean_inc_ref(x_4);
-x_112 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignGenInfo_x3f(x_3, x_4, x_1, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_112) == 0)
+x_113 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignGenInfo_x3f(x_3, x_4, x_1, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_113) == 0)
 {
-lean_object* x_113; 
-x_113 = lean_ctor_get(x_112, 0);
-lean_inc(x_113);
-lean_dec_ref(x_112);
-if (lean_obj_tag(x_113) == 1)
-{
-lean_object* x_114; uint8_t x_115; 
+lean_object* x_114; 
 x_114 = lean_ctor_get(x_113, 0);
 lean_inc(x_114);
 lean_dec_ref(x_113);
-x_115 = lean_nat_dec_lt(x_111, x_5);
-if (x_115 == 0)
+if (lean_obj_tag(x_114) == 1)
 {
-uint8_t x_116; 
-x_116 = lean_nat_dec_eq(x_111, x_5);
+lean_object* x_115; uint8_t x_116; 
+x_115 = lean_ctor_get(x_114, 0);
+lean_inc(x_115);
+lean_dec_ref(x_114);
+x_116 = lean_nat_dec_lt(x_112, x_5);
 if (x_116 == 0)
 {
 uint8_t x_117; 
-x_117 = lean_nat_dec_lt(x_5, x_111);
+x_117 = lean_nat_dec_eq(x_112, x_5);
 if (x_117 == 0)
 {
-lean_dec(x_114);
+uint8_t x_118; 
+x_118 = lean_nat_dec_lt(x_5, x_112);
+if (x_118 == 0)
+{
+lean_dec(x_115);
+lean_dec(x_112);
 lean_dec(x_111);
-lean_dec(x_110);
 lean_dec(x_36);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -7043,11 +7212,11 @@ goto block_32;
 }
 else
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-x_118 = lean_nat_sub(x_111, x_5);
-lean_dec(x_111);
-x_119 = l_Lean_mkNatLit(x_118);
-x_120 = l_Lean_mkNatAdd(x_110, x_119);
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
+x_119 = lean_nat_sub(x_112, x_5);
+lean_dec(x_112);
+x_120 = l_Lean_mkNatLit(x_119);
+x_121 = l_Lean_mkNatAdd(x_111, x_120);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7058,23 +7227,23 @@ lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_121 = lean_grind_canon(x_120, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_121) == 0)
+x_122 = lean_grind_canon(x_121, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_122) == 0)
 {
-lean_object* x_122; lean_object* x_123; 
-x_122 = lean_ctor_get(x_121, 0);
-lean_inc(x_122);
-lean_dec_ref(x_121);
-x_123 = l_Lean_Meta_Sym_shareCommon___redArg(x_122, x_14);
-if (lean_obj_tag(x_123) == 0)
+lean_object* x_123; lean_object* x_124; 
+x_123 = lean_ctor_get(x_122, 0);
+lean_inc(x_123);
+lean_dec_ref(x_122);
+x_124 = l_Lean_Meta_Sym_shareCommon___redArg(x_123, x_14);
+if (lean_obj_tag(x_124) == 0)
 {
-lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; 
-x_124 = lean_ctor_get(x_123, 0);
-lean_inc(x_124);
-lean_dec_ref(x_123);
-x_125 = lean_unsigned_to_nat(1u);
-x_126 = lean_nat_add(x_36, x_125);
-x_127 = lean_box(0);
+lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+x_125 = lean_ctor_get(x_124, 0);
+lean_inc(x_125);
+lean_dec_ref(x_124);
+x_126 = lean_unsigned_to_nat(1u);
+x_127 = lean_nat_add(x_36, x_126);
+x_128 = lean_box(0);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7085,230 +7254,12 @@ lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-lean_inc(x_124);
-x_128 = lean_grind_internalize(x_124, x_126, x_127, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_128) == 0)
-{
-lean_object* x_129; 
-lean_dec_ref(x_128);
-lean_inc(x_18);
-lean_inc_ref(x_17);
-lean_inc(x_16);
-lean_inc_ref(x_15);
-lean_inc(x_14);
-lean_inc_ref(x_13);
-lean_inc(x_12);
-lean_inc_ref(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_6);
-x_129 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_114, x_6, x_124, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+lean_inc(x_125);
+x_129 = lean_grind_internalize(x_125, x_127, x_128, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
 if (lean_obj_tag(x_129) == 0)
 {
 lean_object* x_130; 
-x_130 = lean_ctor_get(x_129, 0);
-lean_inc(x_130);
 lean_dec_ref(x_129);
-if (lean_obj_tag(x_130) == 1)
-{
-lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_131 = lean_ctor_get(x_130, 0);
-lean_inc(x_131);
-lean_dec_ref(x_130);
-x_132 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_131, x_36);
-x_133 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_132, x_8);
-if (lean_obj_tag(x_133) == 0)
-{
-lean_dec_ref(x_133);
-lean_inc(x_18);
-lean_inc_ref(x_17);
-lean_inc(x_16);
-lean_inc_ref(x_15);
-lean_inc(x_9);
-x_20 = x_7;
-x_21 = x_9;
-x_22 = x_15;
-x_23 = x_16;
-x_24 = x_17;
-x_25 = x_18;
-x_26 = lean_box(0);
-goto block_32;
-}
-else
-{
-lean_object* x_134; lean_object* x_135; lean_object* x_136; 
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-x_134 = lean_ctor_get(x_133, 0);
-lean_inc(x_134);
-if (lean_is_exclusive(x_133)) {
- lean_ctor_release(x_133, 0);
- x_135 = x_133;
-} else {
- lean_dec_ref(x_133);
- x_135 = lean_box(0);
-}
-if (lean_is_scalar(x_135)) {
- x_136 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_136 = x_135;
-}
-lean_ctor_set(x_136, 0, x_134);
-return x_136;
-}
-}
-else
-{
-lean_dec(x_130);
-lean_dec(x_36);
-lean_inc(x_18);
-lean_inc_ref(x_17);
-lean_inc(x_16);
-lean_inc_ref(x_15);
-lean_inc(x_9);
-x_20 = x_7;
-x_21 = x_9;
-x_22 = x_15;
-x_23 = x_16;
-x_24 = x_17;
-x_25 = x_18;
-x_26 = lean_box(0);
-goto block_32;
-}
-}
-else
-{
-lean_object* x_137; lean_object* x_138; lean_object* x_139; 
-lean_dec(x_36);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-x_137 = lean_ctor_get(x_129, 0);
-lean_inc(x_137);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- x_138 = x_129;
-} else {
- lean_dec_ref(x_129);
- x_138 = lean_box(0);
-}
-if (lean_is_scalar(x_138)) {
- x_139 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_139 = x_138;
-}
-lean_ctor_set(x_139, 0, x_137);
-return x_139;
-}
-}
-else
-{
-lean_object* x_140; lean_object* x_141; lean_object* x_142; 
-lean_dec(x_124);
-lean_dec(x_114);
-lean_dec(x_36);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-x_140 = lean_ctor_get(x_128, 0);
-lean_inc(x_140);
-if (lean_is_exclusive(x_128)) {
- lean_ctor_release(x_128, 0);
- x_141 = x_128;
-} else {
- lean_dec_ref(x_128);
- x_141 = lean_box(0);
-}
-if (lean_is_scalar(x_141)) {
- x_142 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_142 = x_141;
-}
-lean_ctor_set(x_142, 0, x_140);
-return x_142;
-}
-}
-else
-{
-lean_dec(x_114);
-lean_dec(x_36);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-return x_123;
-}
-}
-else
-{
-lean_dec(x_114);
-lean_dec(x_36);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-return x_121;
-}
-}
-}
-else
-{
-lean_object* x_143; 
-lean_dec(x_111);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7320,24 +7271,242 @@ lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc_ref(x_6);
-x_143 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_114, x_6, x_110, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_143) == 0)
+x_130 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_115, x_6, x_125, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_130) == 0)
+{
+lean_object* x_131; 
+x_131 = lean_ctor_get(x_130, 0);
+lean_inc(x_131);
+lean_dec_ref(x_130);
+if (lean_obj_tag(x_131) == 1)
+{
+lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+x_132 = lean_ctor_get(x_131, 0);
+lean_inc(x_132);
+lean_dec_ref(x_131);
+x_133 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_132, x_36);
+x_134 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_133, x_8);
+if (lean_obj_tag(x_134) == 0)
+{
+lean_dec_ref(x_134);
+lean_inc(x_18);
+lean_inc_ref(x_17);
+lean_inc(x_16);
+lean_inc_ref(x_15);
+lean_inc(x_9);
+x_20 = x_7;
+x_21 = x_9;
+x_22 = x_15;
+x_23 = x_16;
+x_24 = x_17;
+x_25 = x_18;
+x_26 = lean_box(0);
+goto block_32;
+}
+else
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+x_135 = lean_ctor_get(x_134, 0);
+lean_inc(x_135);
+if (lean_is_exclusive(x_134)) {
+ lean_ctor_release(x_134, 0);
+ x_136 = x_134;
+} else {
+ lean_dec_ref(x_134);
+ x_136 = lean_box(0);
+}
+if (lean_is_scalar(x_136)) {
+ x_137 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_137 = x_136;
+}
+lean_ctor_set(x_137, 0, x_135);
+return x_137;
+}
+}
+else
+{
+lean_dec(x_131);
+lean_dec(x_36);
+lean_inc(x_18);
+lean_inc_ref(x_17);
+lean_inc(x_16);
+lean_inc_ref(x_15);
+lean_inc(x_9);
+x_20 = x_7;
+x_21 = x_9;
+x_22 = x_15;
+x_23 = x_16;
+x_24 = x_17;
+x_25 = x_18;
+x_26 = lean_box(0);
+goto block_32;
+}
+}
+else
+{
+lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+lean_dec(x_36);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+x_138 = lean_ctor_get(x_130, 0);
+lean_inc(x_138);
+if (lean_is_exclusive(x_130)) {
+ lean_ctor_release(x_130, 0);
+ x_139 = x_130;
+} else {
+ lean_dec_ref(x_130);
+ x_139 = lean_box(0);
+}
+if (lean_is_scalar(x_139)) {
+ x_140 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_140 = x_139;
+}
+lean_ctor_set(x_140, 0, x_138);
+return x_140;
+}
+}
+else
+{
+lean_object* x_141; lean_object* x_142; lean_object* x_143; 
+lean_dec(x_125);
+lean_dec(x_115);
+lean_dec(x_36);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+x_141 = lean_ctor_get(x_129, 0);
+lean_inc(x_141);
+if (lean_is_exclusive(x_129)) {
+ lean_ctor_release(x_129, 0);
+ x_142 = x_129;
+} else {
+ lean_dec_ref(x_129);
+ x_142 = lean_box(0);
+}
+if (lean_is_scalar(x_142)) {
+ x_143 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_143 = x_142;
+}
+lean_ctor_set(x_143, 0, x_141);
+return x_143;
+}
+}
+else
+{
+lean_dec(x_115);
+lean_dec(x_36);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+return x_124;
+}
+}
+else
+{
+lean_dec(x_115);
+lean_dec(x_36);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+return x_122;
+}
+}
+}
+else
 {
 lean_object* x_144; 
-x_144 = lean_ctor_get(x_143, 0);
-lean_inc(x_144);
-lean_dec_ref(x_143);
-if (lean_obj_tag(x_144) == 1)
+lean_dec(x_112);
+lean_inc(x_18);
+lean_inc_ref(x_17);
+lean_inc(x_16);
+lean_inc_ref(x_15);
+lean_inc(x_14);
+lean_inc_ref(x_13);
+lean_inc(x_12);
+lean_inc_ref(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_6);
+x_144 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_115, x_6, x_111, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_144) == 0)
 {
-lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+lean_object* x_145; 
 x_145 = lean_ctor_get(x_144, 0);
 lean_inc(x_145);
 lean_dec_ref(x_144);
-x_146 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_145, x_36);
-x_147 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_146, x_8);
-if (lean_obj_tag(x_147) == 0)
+if (lean_obj_tag(x_145) == 1)
 {
-lean_dec_ref(x_147);
+lean_object* x_146; lean_object* x_147; lean_object* x_148; 
+x_146 = lean_ctor_get(x_145, 0);
+lean_inc(x_146);
+lean_dec_ref(x_145);
+x_147 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_146, x_36);
+x_148 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_147, x_8);
+if (lean_obj_tag(x_148) == 0)
+{
+lean_dec_ref(x_148);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7354,7 +7523,7 @@ goto block_32;
 }
 else
 {
-lean_object* x_148; lean_object* x_149; lean_object* x_150; 
+lean_object* x_149; lean_object* x_150; lean_object* x_151; 
 lean_dec(x_18);
 lean_dec_ref(x_17);
 lean_dec(x_16);
@@ -7369,27 +7538,27 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_148 = lean_ctor_get(x_147, 0);
-lean_inc(x_148);
-if (lean_is_exclusive(x_147)) {
- lean_ctor_release(x_147, 0);
- x_149 = x_147;
+x_149 = lean_ctor_get(x_148, 0);
+lean_inc(x_149);
+if (lean_is_exclusive(x_148)) {
+ lean_ctor_release(x_148, 0);
+ x_150 = x_148;
 } else {
- lean_dec_ref(x_147);
- x_149 = lean_box(0);
+ lean_dec_ref(x_148);
+ x_150 = lean_box(0);
 }
-if (lean_is_scalar(x_149)) {
- x_150 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_150)) {
+ x_151 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_150 = x_149;
+ x_151 = x_150;
 }
-lean_ctor_set(x_150, 0, x_148);
-return x_150;
+lean_ctor_set(x_151, 0, x_149);
+return x_151;
 }
 }
 else
 {
-lean_dec(x_144);
+lean_dec(x_145);
 lean_dec(x_36);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -7408,7 +7577,7 @@ goto block_32;
 }
 else
 {
-lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+lean_object* x_152; lean_object* x_153; lean_object* x_154; 
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -7424,68 +7593,72 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_151 = lean_ctor_get(x_143, 0);
-lean_inc(x_151);
-if (lean_is_exclusive(x_143)) {
- lean_ctor_release(x_143, 0);
- x_152 = x_143;
+x_152 = lean_ctor_get(x_144, 0);
+lean_inc(x_152);
+if (lean_is_exclusive(x_144)) {
+ lean_ctor_release(x_144, 0);
+ x_153 = x_144;
 } else {
- lean_dec_ref(x_143);
- x_152 = lean_box(0);
+ lean_dec_ref(x_144);
+ x_153 = lean_box(0);
 }
-if (lean_is_scalar(x_152)) {
- x_153 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_153)) {
+ x_154 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_153 = x_152;
+ x_154 = x_153;
 }
-lean_ctor_set(x_153, 0, x_151);
-return x_153;
+lean_ctor_set(x_154, 0, x_152);
+return x_154;
 }
 }
 }
 else
 {
-lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-x_154 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_114, x_36);
-x_155 = lean_ctor_get(x_154, 0);
-lean_inc(x_155);
-x_156 = lean_ctor_get(x_154, 1);
+lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
+x_155 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_115, x_36);
+x_156 = lean_ctor_get(x_155, 0);
 lean_inc(x_156);
-x_157 = lean_ctor_get(x_154, 2);
-lean_inc_ref(x_157);
-if (lean_is_exclusive(x_154)) {
- lean_ctor_release(x_154, 0);
- lean_ctor_release(x_154, 1);
- lean_ctor_release(x_154, 2);
- x_158 = x_154;
+x_157 = lean_ctor_get(x_155, 1);
+lean_inc(x_157);
+x_158 = lean_ctor_get(x_155, 2);
+lean_inc_ref(x_158);
+x_159 = lean_ctor_get(x_155, 3);
+lean_inc_ref(x_159);
+if (lean_is_exclusive(x_155)) {
+ lean_ctor_release(x_155, 0);
+ lean_ctor_release(x_155, 1);
+ lean_ctor_release(x_155, 2);
+ lean_ctor_release(x_155, 3);
+ x_160 = x_155;
 } else {
- lean_dec_ref(x_154);
- x_158 = lean_box(0);
+ lean_dec_ref(x_155);
+ x_160 = lean_box(0);
 }
-x_159 = lean_box(0);
-x_160 = lean_nat_sub(x_5, x_111);
-lean_dec(x_111);
+x_161 = lean_box(0);
+x_162 = lean_nat_sub(x_5, x_112);
+lean_dec(x_112);
 lean_inc_ref(x_6);
-x_161 = lean_alloc_ctor(1, 4, 0);
-lean_ctor_set(x_161, 0, x_159);
-lean_ctor_set(x_161, 1, x_6);
-lean_ctor_set(x_161, 2, x_160);
-lean_ctor_set(x_161, 3, x_110);
-x_162 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_162, 0, x_161);
-lean_ctor_set(x_162, 1, x_155);
-if (lean_is_scalar(x_158)) {
- x_163 = lean_alloc_ctor(0, 3, 0);
+x_163 = lean_alloc_ctor(1, 4, 0);
+lean_ctor_set(x_163, 0, x_161);
+lean_ctor_set(x_163, 1, x_6);
+lean_ctor_set(x_163, 2, x_162);
+lean_ctor_set(x_163, 3, x_111);
+x_164 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_164, 0, x_163);
+lean_ctor_set(x_164, 1, x_156);
+if (lean_is_scalar(x_160)) {
+ x_165 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_163 = x_158;
+ x_165 = x_160;
 }
-lean_ctor_set(x_163, 0, x_162);
-lean_ctor_set(x_163, 1, x_156);
-lean_ctor_set(x_163, 2, x_157);
-x_164 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_163, x_8);
-if (lean_obj_tag(x_164) == 0)
+lean_ctor_set(x_165, 0, x_164);
+lean_ctor_set(x_165, 1, x_157);
+lean_ctor_set(x_165, 2, x_158);
+lean_ctor_set(x_165, 3, x_159);
+x_166 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_165, x_8);
+if (lean_obj_tag(x_166) == 0)
 {
-lean_dec_ref(x_164);
+lean_dec_ref(x_166);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7502,7 +7675,7 @@ goto block_32;
 }
 else
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; 
+lean_object* x_167; lean_object* x_168; lean_object* x_169; 
 lean_dec(x_18);
 lean_dec_ref(x_17);
 lean_dec(x_16);
@@ -7517,30 +7690,30 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_165 = lean_ctor_get(x_164, 0);
-lean_inc(x_165);
-if (lean_is_exclusive(x_164)) {
- lean_ctor_release(x_164, 0);
- x_166 = x_164;
+x_167 = lean_ctor_get(x_166, 0);
+lean_inc(x_167);
+if (lean_is_exclusive(x_166)) {
+ lean_ctor_release(x_166, 0);
+ x_168 = x_166;
 } else {
- lean_dec_ref(x_164);
- x_166 = lean_box(0);
+ lean_dec_ref(x_166);
+ x_168 = lean_box(0);
 }
-if (lean_is_scalar(x_166)) {
- x_167 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_168)) {
+ x_169 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_167 = x_166;
+ x_169 = x_168;
 }
-lean_ctor_set(x_167, 0, x_165);
-return x_167;
+lean_ctor_set(x_169, 0, x_167);
+return x_169;
 }
 }
 }
 else
 {
-lean_dec(x_113);
+lean_dec(x_114);
+lean_dec(x_112);
 lean_dec(x_111);
-lean_dec(x_110);
 lean_dec(x_36);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -7559,9 +7732,9 @@ goto block_32;
 }
 else
 {
-lean_object* x_168; lean_object* x_169; lean_object* x_170; 
+lean_object* x_170; lean_object* x_171; lean_object* x_172; 
+lean_dec(x_112);
 lean_dec(x_111);
-lean_dec(x_110);
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -7577,44 +7750,44 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_168 = lean_ctor_get(x_112, 0);
-lean_inc(x_168);
-if (lean_is_exclusive(x_112)) {
- lean_ctor_release(x_112, 0);
- x_169 = x_112;
+x_170 = lean_ctor_get(x_113, 0);
+lean_inc(x_170);
+if (lean_is_exclusive(x_113)) {
+ lean_ctor_release(x_113, 0);
+ x_171 = x_113;
 } else {
- lean_dec_ref(x_112);
- x_169 = lean_box(0);
+ lean_dec_ref(x_113);
+ x_171 = lean_box(0);
 }
-if (lean_is_scalar(x_169)) {
- x_170 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_171)) {
+ x_172 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_170 = x_169;
+ x_172 = x_171;
 }
-lean_ctor_set(x_170, 0, x_168);
-return x_170;
+lean_ctor_set(x_172, 0, x_170);
+return x_172;
 }
 }
 }
 else
 {
-lean_object* x_171; 
+lean_object* x_173; 
 lean_dec(x_39);
 lean_inc_ref(x_17);
 lean_inc_ref(x_7);
-x_171 = l_Lean_Meta_evalNat(x_7, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_171) == 0)
+x_173 = l_Lean_Meta_evalNat(x_7, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_173) == 0)
 {
-lean_object* x_172; 
-x_172 = lean_ctor_get(x_171, 0);
-lean_inc(x_172);
-lean_dec_ref(x_171);
-if (lean_obj_tag(x_172) == 1)
+lean_object* x_174; 
+x_174 = lean_ctor_get(x_173, 0);
+lean_inc(x_174);
+lean_dec_ref(x_173);
+if (lean_obj_tag(x_174) == 1)
 {
-lean_object* x_173; lean_object* x_174; 
-x_173 = lean_ctor_get(x_172, 0);
-lean_inc(x_173);
-lean_dec_ref(x_172);
+lean_object* x_175; lean_object* x_176; 
+x_175 = lean_ctor_get(x_174, 0);
+lean_inc(x_175);
+lean_dec_ref(x_174);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7627,24 +7800,24 @@ lean_inc(x_10);
 lean_inc(x_9);
 lean_inc_ref(x_1);
 lean_inc_ref(x_4);
-x_174 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignGenInfo_x3f(x_3, x_4, x_1, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_174) == 0)
+x_176 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignGenInfo_x3f(x_3, x_4, x_1, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_176) == 0)
 {
-lean_object* x_175; 
-x_175 = lean_ctor_get(x_174, 0);
-lean_inc(x_175);
-lean_dec_ref(x_174);
-if (lean_obj_tag(x_175) == 1)
+lean_object* x_177; 
+x_177 = lean_ctor_get(x_176, 0);
+lean_inc(x_177);
+lean_dec_ref(x_176);
+if (lean_obj_tag(x_177) == 1)
 {
-lean_object* x_176; uint8_t x_177; 
-x_176 = lean_ctor_get(x_175, 0);
-lean_inc(x_176);
-lean_dec_ref(x_175);
-x_177 = lean_nat_dec_le(x_5, x_173);
-if (x_177 == 0)
+lean_object* x_178; uint8_t x_179; 
+x_178 = lean_ctor_get(x_177, 0);
+lean_inc(x_178);
+lean_dec_ref(x_177);
+x_179 = lean_nat_dec_le(x_5, x_175);
+if (x_179 == 0)
 {
-lean_dec(x_176);
-lean_dec(x_173);
+lean_dec(x_178);
+lean_dec(x_175);
 lean_dec(x_36);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -7662,10 +7835,10 @@ goto block_32;
 }
 else
 {
-lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-x_178 = lean_nat_sub(x_173, x_5);
-lean_dec(x_173);
-x_179 = l_Lean_mkNatLit(x_178);
+lean_object* x_180; lean_object* x_181; lean_object* x_182; 
+x_180 = lean_nat_sub(x_175, x_5);
+lean_dec(x_175);
+x_181 = l_Lean_mkNatLit(x_180);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7676,23 +7849,23 @@ lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_180 = lean_grind_canon(x_179, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_180) == 0)
-{
-lean_object* x_181; lean_object* x_182; 
-x_181 = lean_ctor_get(x_180, 0);
-lean_inc(x_181);
-lean_dec_ref(x_180);
-x_182 = l_Lean_Meta_Sym_shareCommon___redArg(x_181, x_14);
+x_182 = lean_grind_canon(x_181, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
 if (lean_obj_tag(x_182) == 0)
 {
-lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
+lean_object* x_183; lean_object* x_184; 
 x_183 = lean_ctor_get(x_182, 0);
 lean_inc(x_183);
 lean_dec_ref(x_182);
-x_184 = lean_unsigned_to_nat(1u);
-x_185 = lean_nat_add(x_36, x_184);
-x_186 = lean_box(0);
+x_184 = l_Lean_Meta_Sym_shareCommon___redArg(x_183, x_14);
+if (lean_obj_tag(x_184) == 0)
+{
+lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; 
+x_185 = lean_ctor_get(x_184, 0);
+lean_inc(x_185);
+lean_dec_ref(x_184);
+x_186 = lean_unsigned_to_nat(1u);
+x_187 = lean_nat_add(x_36, x_186);
+x_188 = lean_box(0);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7703,12 +7876,12 @@ lean_inc(x_12);
 lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-lean_inc(x_183);
-x_187 = lean_grind_internalize(x_183, x_185, x_186, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_187) == 0)
+lean_inc(x_185);
+x_189 = lean_grind_internalize(x_185, x_187, x_188, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_189) == 0)
 {
-lean_object* x_188; 
-lean_dec_ref(x_187);
+lean_object* x_190; 
+lean_dec_ref(x_189);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7720,24 +7893,24 @@ lean_inc_ref(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc_ref(x_6);
-x_188 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_176, x_6, x_183, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_188) == 0)
+x_190 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_178, x_6, x_185, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+if (lean_obj_tag(x_190) == 0)
 {
-lean_object* x_189; 
-x_189 = lean_ctor_get(x_188, 0);
-lean_inc(x_189);
-lean_dec_ref(x_188);
-if (lean_obj_tag(x_189) == 1)
+lean_object* x_191; 
+x_191 = lean_ctor_get(x_190, 0);
+lean_inc(x_191);
+lean_dec_ref(x_190);
+if (lean_obj_tag(x_191) == 1)
 {
-lean_object* x_190; lean_object* x_191; lean_object* x_192; 
-x_190 = lean_ctor_get(x_189, 0);
-lean_inc(x_190);
-lean_dec_ref(x_189);
-x_191 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_190, x_36);
-x_192 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_191, x_8);
-if (lean_obj_tag(x_192) == 0)
+lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+x_192 = lean_ctor_get(x_191, 0);
+lean_inc(x_192);
+lean_dec_ref(x_191);
+x_193 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_Choice_updateGen(x_192, x_36);
+x_194 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_pushChoice___redArg(x_193, x_8);
+if (lean_obj_tag(x_194) == 0)
 {
-lean_dec_ref(x_192);
+lean_dec_ref(x_194);
 lean_inc(x_18);
 lean_inc_ref(x_17);
 lean_inc(x_16);
@@ -7754,7 +7927,7 @@ goto block_32;
 }
 else
 {
-uint8_t x_193; 
+uint8_t x_195; 
 lean_dec(x_18);
 lean_dec_ref(x_17);
 lean_dec(x_16);
@@ -7769,45 +7942,117 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_193 = !lean_is_exclusive(x_192);
-if (x_193 == 0)
+x_195 = !lean_is_exclusive(x_194);
+if (x_195 == 0)
 {
-return x_192;
+return x_194;
 }
 else
 {
-lean_object* x_194; lean_object* x_195; 
-x_194 = lean_ctor_get(x_192, 0);
-lean_inc(x_194);
-lean_dec(x_192);
-x_195 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_195, 0, x_194);
-return x_195;
+lean_object* x_196; lean_object* x_197; 
+x_196 = lean_ctor_get(x_194, 0);
+lean_inc(x_196);
+lean_dec(x_194);
+x_197 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_197, 0, x_196);
+return x_197;
 }
 }
 }
 else
 {
+lean_dec(x_191);
+lean_dec(x_36);
+lean_inc(x_18);
+lean_inc_ref(x_17);
+lean_inc(x_16);
+lean_inc_ref(x_15);
+lean_inc(x_9);
+x_20 = x_7;
+x_21 = x_9;
+x_22 = x_15;
+x_23 = x_16;
+x_24 = x_17;
+x_25 = x_18;
+x_26 = lean_box(0);
+goto block_32;
+}
+}
+else
+{
+uint8_t x_198; 
+lean_dec(x_36);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+x_198 = !lean_is_exclusive(x_190);
+if (x_198 == 0)
+{
+return x_190;
+}
+else
+{
+lean_object* x_199; lean_object* x_200; 
+x_199 = lean_ctor_get(x_190, 0);
+lean_inc(x_199);
+lean_dec(x_190);
+x_200 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_200, 0, x_199);
+return x_200;
+}
+}
+}
+else
+{
+uint8_t x_201; 
+lean_dec(x_185);
+lean_dec(x_178);
+lean_dec(x_36);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_7);
+lean_dec_ref(x_6);
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+x_201 = !lean_is_exclusive(x_189);
+if (x_201 == 0)
+{
+return x_189;
+}
+else
+{
+lean_object* x_202; lean_object* x_203; 
+x_202 = lean_ctor_get(x_189, 0);
+lean_inc(x_202);
 lean_dec(x_189);
-lean_dec(x_36);
-lean_inc(x_18);
-lean_inc_ref(x_17);
-lean_inc(x_16);
-lean_inc_ref(x_15);
-lean_inc(x_9);
-x_20 = x_7;
-x_21 = x_9;
-x_22 = x_15;
-x_23 = x_16;
-x_24 = x_17;
-x_25 = x_18;
-x_26 = lean_box(0);
-goto block_32;
+x_203 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_203, 0, x_202);
+return x_203;
+}
 }
 }
 else
 {
-uint8_t x_196; 
+lean_dec(x_178);
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -7823,63 +8068,12 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_196 = !lean_is_exclusive(x_188);
-if (x_196 == 0)
-{
-return x_188;
-}
-else
-{
-lean_object* x_197; lean_object* x_198; 
-x_197 = lean_ctor_get(x_188, 0);
-lean_inc(x_197);
-lean_dec(x_188);
-x_198 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_198, 0, x_197);
-return x_198;
-}
+return x_184;
 }
 }
 else
 {
-uint8_t x_199; 
-lean_dec(x_183);
-lean_dec(x_176);
-lean_dec(x_36);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-x_199 = !lean_is_exclusive(x_187);
-if (x_199 == 0)
-{
-return x_187;
-}
-else
-{
-lean_object* x_200; lean_object* x_201; 
-x_200 = lean_ctor_get(x_187, 0);
-lean_inc(x_200);
-lean_dec(x_187);
-x_201 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_201, 0, x_200);
-return x_201;
-}
-}
-}
-else
-{
-lean_dec(x_176);
+lean_dec(x_178);
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -7898,32 +8092,11 @@ lean_dec_ref(x_1);
 return x_182;
 }
 }
-else
-{
-lean_dec(x_176);
-lean_dec(x_36);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_7);
-lean_dec_ref(x_6);
-lean_dec_ref(x_4);
-lean_dec_ref(x_1);
-return x_180;
-}
-}
 }
 else
 {
+lean_dec(x_177);
 lean_dec(x_175);
-lean_dec(x_173);
 lean_dec(x_36);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -7942,8 +8115,8 @@ goto block_32;
 }
 else
 {
-uint8_t x_202; 
-lean_dec(x_173);
+uint8_t x_204; 
+lean_dec(x_175);
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -7959,26 +8132,26 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_202 = !lean_is_exclusive(x_174);
-if (x_202 == 0)
+x_204 = !lean_is_exclusive(x_176);
+if (x_204 == 0)
 {
-return x_174;
+return x_176;
+}
+else
+{
+lean_object* x_205; lean_object* x_206; 
+x_205 = lean_ctor_get(x_176, 0);
+lean_inc(x_205);
+lean_dec(x_176);
+x_206 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_206, 0, x_205);
+return x_206;
+}
+}
 }
 else
 {
-lean_object* x_203; lean_object* x_204; 
-x_203 = lean_ctor_get(x_174, 0);
-lean_inc(x_203);
 lean_dec(x_174);
-x_204 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_204, 0, x_203);
-return x_204;
-}
-}
-}
-else
-{
-lean_dec(x_172);
 lean_dec(x_36);
 lean_inc(x_18);
 lean_inc_ref(x_17);
@@ -7997,7 +8170,7 @@ goto block_32;
 }
 else
 {
-uint8_t x_205; 
+uint8_t x_207; 
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -8013,27 +8186,27 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_205 = !lean_is_exclusive(x_171);
-if (x_205 == 0)
+x_207 = !lean_is_exclusive(x_173);
+if (x_207 == 0)
 {
-return x_171;
+return x_173;
 }
 else
 {
-lean_object* x_206; lean_object* x_207; 
-x_206 = lean_ctor_get(x_171, 0);
-lean_inc(x_206);
-lean_dec(x_171);
-x_207 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_207, 0, x_206);
-return x_207;
+lean_object* x_208; lean_object* x_209; 
+x_208 = lean_ctor_get(x_173, 0);
+lean_inc(x_208);
+lean_dec(x_173);
+x_209 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_209, 0, x_208);
+return x_209;
 }
 }
 }
 }
 else
 {
-uint8_t x_208; 
+uint8_t x_210; 
 lean_dec(x_36);
 lean_dec(x_18);
 lean_dec_ref(x_17);
@@ -8049,27 +8222,27 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_208 = !lean_is_exclusive(x_38);
-if (x_208 == 0)
+x_210 = !lean_is_exclusive(x_38);
+if (x_210 == 0)
 {
 return x_38;
 }
 else
 {
-lean_object* x_209; lean_object* x_210; 
-x_209 = lean_ctor_get(x_38, 0);
-lean_inc(x_209);
+lean_object* x_211; lean_object* x_212; 
+x_211 = lean_ctor_get(x_38, 0);
+lean_inc(x_211);
 lean_dec(x_38);
-x_210 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_210, 0, x_209);
-return x_210;
+x_212 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_212, 0, x_211);
+return x_212;
 }
 }
 }
 }
 else
 {
-uint8_t x_211; 
+uint8_t x_213; 
 lean_dec(x_18);
 lean_dec_ref(x_17);
 lean_dec(x_16);
@@ -8084,20 +8257,20 @@ lean_dec_ref(x_7);
 lean_dec_ref(x_6);
 lean_dec_ref(x_4);
 lean_dec_ref(x_1);
-x_211 = !lean_is_exclusive(x_34);
-if (x_211 == 0)
+x_213 = !lean_is_exclusive(x_34);
+if (x_213 == 0)
 {
 return x_34;
 }
 else
 {
-lean_object* x_212; lean_object* x_213; 
-x_212 = lean_ctor_get(x_34, 0);
-lean_inc(x_212);
+lean_object* x_214; lean_object* x_215; 
+x_214 = lean_ctor_get(x_34, 0);
+lean_inc(x_214);
 lean_dec(x_34);
-x_213 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_213, 0, x_212);
-return x_213;
+x_215 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_215, 0, x_214);
+return x_215;
 }
 }
 block_32:
@@ -8841,7 +9014,7 @@ lean_inc(x_19);
 x_23 = l_Lean_Meta_Grind_Goal_getENode(x_22, x_19, x_13, x_14, x_15, x_16);
 if (lean_obj_tag(x_23) == 0)
 {
-lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_59; uint8_t x_62; 
+lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_61; uint8_t x_64; 
 x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
 lean_dec_ref(x_23);
@@ -8849,86 +9022,88 @@ x_25 = lean_ctor_get_uint8(x_24, sizeof(void*)*11 + 4);
 x_26 = lean_ctor_get(x_24, 8);
 lean_inc(x_26);
 x_27 = lean_box(0);
-x_62 = lean_nat_dec_lt(x_26, x_3);
-if (x_62 == 0)
+x_64 = lean_nat_dec_lt(x_26, x_3);
+if (x_64 == 0)
 {
 lean_dec(x_24);
-x_59 = x_62;
-goto block_61;
+x_61 = x_64;
+goto block_63;
 }
 else
 {
 if (x_25 == 0)
 {
-uint8_t x_63; 
-x_63 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_24);
+uint8_t x_65; 
+x_65 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_24);
 lean_dec(x_24);
-x_59 = x_63;
-goto block_61;
+x_61 = x_65;
+goto block_63;
 }
 else
 {
 lean_dec(x_24);
-goto block_58;
+goto block_60;
 }
 }
-block_46:
+block_47:
 {
-lean_object* x_32; uint8_t x_33; 
-x_32 = lean_st_ref_take(x_6);
-x_33 = !lean_is_exclusive(x_32);
-if (x_33 == 0)
+lean_object* x_33; uint8_t x_34; 
+x_33 = lean_st_ref_take(x_6);
+x_34 = !lean_is_exclusive(x_33);
+if (x_34 == 0)
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_34 = lean_ctor_get(x_32, 0);
-x_35 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_35, 0, x_28);
-lean_ctor_set(x_35, 1, x_31);
-lean_ctor_set(x_35, 2, x_29);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_35 = lean_ctor_get(x_33, 0);
+x_36 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_36, 0, x_28);
+lean_ctor_set(x_36, 1, x_32);
+lean_ctor_set(x_36, 2, x_31);
+lean_ctor_set(x_36, 3, x_30);
 if (lean_is_scalar(x_21)) {
- x_36 = lean_alloc_ctor(1, 2, 0);
+ x_37 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_36 = x_21;
+ x_37 = x_21;
 }
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-lean_ctor_set(x_32, 0, x_36);
-x_37 = lean_st_ref_set(x_6, x_32);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_35);
+lean_ctor_set(x_33, 0, x_37);
+x_38 = lean_st_ref_set(x_6, x_33);
 x_4 = x_20;
 x_5 = x_27;
 goto _start;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_39 = lean_ctor_get(x_32, 0);
-x_40 = lean_ctor_get(x_32, 1);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_40 = lean_ctor_get(x_33, 0);
+x_41 = lean_ctor_get(x_33, 1);
+lean_inc(x_41);
 lean_inc(x_40);
-lean_inc(x_39);
-lean_dec(x_32);
-x_41 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_41, 0, x_28);
-lean_ctor_set(x_41, 1, x_31);
-lean_ctor_set(x_41, 2, x_29);
+lean_dec(x_33);
+x_42 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_42, 0, x_28);
+lean_ctor_set(x_42, 1, x_32);
+lean_ctor_set(x_42, 2, x_31);
+lean_ctor_set(x_42, 3, x_30);
 if (lean_is_scalar(x_21)) {
- x_42 = lean_alloc_ctor(1, 2, 0);
+ x_43 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_42 = x_21;
+ x_43 = x_21;
 }
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_39);
-x_43 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_43, 0, x_42);
 lean_ctor_set(x_43, 1, x_40);
-x_44 = lean_st_ref_set(x_6, x_43);
+x_44 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_44, 0, x_43);
+lean_ctor_set(x_44, 1, x_41);
+x_45 = lean_st_ref_set(x_6, x_44);
 x_4 = x_20;
 x_5 = x_27;
 goto _start;
 }
 }
-block_58:
+block_60:
 {
-lean_object* x_47; 
+lean_object* x_48; 
 lean_inc(x_16);
 lean_inc_ref(x_15);
 lean_inc(x_14);
@@ -8941,94 +9116,98 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_47 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArgsPrefix_x3f(x_1, x_2, x_19, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_47) == 0)
+x_48 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArgsPrefix_x3f(x_1, x_2, x_19, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_48) == 0)
 {
-lean_object* x_48; 
-x_48 = lean_ctor_get(x_47, 0);
-lean_inc(x_48);
-lean_dec_ref(x_47);
-if (lean_obj_tag(x_48) == 1)
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+lean_object* x_49; 
 x_49 = lean_ctor_get(x_48, 0);
 lean_inc(x_49);
 lean_dec_ref(x_48);
+if (lean_obj_tag(x_49) == 1)
+{
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
 x_50 = lean_ctor_get(x_49, 0);
 lean_inc(x_50);
-x_51 = lean_ctor_get(x_49, 1);
+lean_dec_ref(x_49);
+x_51 = lean_ctor_get(x_50, 0);
 lean_inc(x_51);
-x_52 = lean_ctor_get(x_49, 2);
-lean_inc_ref(x_52);
-lean_dec(x_49);
-x_53 = lean_nat_dec_le(x_26, x_51);
-if (x_53 == 0)
-{
-lean_dec(x_51);
-x_28 = x_50;
-x_29 = x_52;
-x_30 = lean_box(0);
-x_31 = x_26;
-goto block_46;
-}
-else
-{
-lean_dec(x_26);
-x_28 = x_50;
-x_29 = x_52;
-x_30 = lean_box(0);
-x_31 = x_51;
-goto block_46;
-}
-}
-else
-{
-lean_dec(x_48);
-lean_dec(x_26);
-lean_dec(x_21);
-x_4 = x_20;
-x_5 = x_27;
-goto _start;
-}
-}
-else
-{
-uint8_t x_55; 
-lean_dec(x_26);
-lean_dec(x_21);
-lean_dec(x_20);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_55 = !lean_is_exclusive(x_47);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_50, 2);
+lean_inc_ref(x_53);
+x_54 = lean_ctor_get(x_50, 3);
+lean_inc_ref(x_54);
+lean_dec(x_50);
+x_55 = lean_nat_dec_le(x_26, x_52);
 if (x_55 == 0)
 {
-return x_47;
+lean_dec(x_52);
+x_28 = x_51;
+x_29 = lean_box(0);
+x_30 = x_54;
+x_31 = x_53;
+x_32 = x_26;
+goto block_47;
 }
 else
 {
-lean_object* x_56; lean_object* x_57; 
-x_56 = lean_ctor_get(x_47, 0);
-lean_inc(x_56);
-lean_dec(x_47);
-x_57 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_57, 0, x_56);
-return x_57;
+lean_dec(x_26);
+x_28 = x_51;
+x_29 = lean_box(0);
+x_30 = x_54;
+x_31 = x_53;
+x_32 = x_52;
+goto block_47;
 }
 }
-}
-block_61:
+else
 {
-if (x_59 == 0)
+lean_dec(x_49);
+lean_dec(x_26);
+lean_dec(x_21);
+x_4 = x_20;
+x_5 = x_27;
+goto _start;
+}
+}
+else
+{
+uint8_t x_57; 
+lean_dec(x_26);
+lean_dec(x_21);
+lean_dec(x_20);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_57 = !lean_is_exclusive(x_48);
+if (x_57 == 0)
+{
+return x_48;
+}
+else
+{
+lean_object* x_58; lean_object* x_59; 
+x_58 = lean_ctor_get(x_48, 0);
+lean_inc(x_58);
+lean_dec(x_48);
+x_59 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_59, 0, x_58);
+return x_59;
+}
+}
+}
+block_63:
+{
+if (x_61 == 0)
 {
 lean_dec(x_26);
 lean_dec(x_21);
@@ -9039,13 +9218,13 @@ goto _start;
 }
 else
 {
-goto block_58;
+goto block_60;
 }
 }
 }
 else
 {
-uint8_t x_64; 
+uint8_t x_66; 
 lean_dec(x_21);
 lean_dec(x_20);
 lean_dec(x_19);
@@ -9061,20 +9240,20 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_64 = !lean_is_exclusive(x_23);
-if (x_64 == 0)
+x_66 = !lean_is_exclusive(x_23);
+if (x_66 == 0)
 {
 return x_23;
 }
 else
 {
-lean_object* x_65; lean_object* x_66; 
-x_65 = lean_ctor_get(x_23, 0);
-lean_inc(x_65);
+lean_object* x_67; lean_object* x_68; 
+x_67 = lean_ctor_get(x_23, 0);
+lean_inc(x_67);
 lean_dec(x_23);
-x_66 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_66, 0, x_65);
-return x_66;
+x_68 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_68, 0, x_67);
+return x_68;
 }
 }
 }
@@ -15674,46 +15853,46 @@ return x_213;
 block_118:
 {
 lean_object* x_34; uint8_t x_35; 
-x_34 = l_Lean_Meta_Context_config(x_29);
+x_34 = l_Lean_Meta_Context_config(x_26);
 x_35 = !lean_is_exclusive(x_34);
 if (x_35 == 0)
 {
 uint8_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; uint8_t x_44; uint8_t x_45; uint64_t x_46; uint8_t x_47; 
-x_36 = lean_ctor_get_uint8(x_29, sizeof(void*)*7);
-x_37 = lean_ctor_get(x_29, 1);
+x_36 = lean_ctor_get_uint8(x_26, sizeof(void*)*7);
+x_37 = lean_ctor_get(x_26, 1);
 lean_inc(x_37);
-x_38 = lean_ctor_get(x_29, 2);
+x_38 = lean_ctor_get(x_26, 2);
 lean_inc_ref(x_38);
-x_39 = lean_ctor_get(x_29, 3);
+x_39 = lean_ctor_get(x_26, 3);
 lean_inc_ref(x_39);
-x_40 = lean_ctor_get(x_29, 4);
+x_40 = lean_ctor_get(x_26, 4);
 lean_inc(x_40);
-x_41 = lean_ctor_get(x_29, 5);
+x_41 = lean_ctor_get(x_26, 5);
 lean_inc(x_41);
-x_42 = lean_ctor_get(x_29, 6);
+x_42 = lean_ctor_get(x_26, 6);
 lean_inc(x_42);
-x_43 = lean_ctor_get_uint8(x_29, sizeof(void*)*7 + 1);
-x_44 = lean_ctor_get_uint8(x_29, sizeof(void*)*7 + 2);
-x_45 = lean_ctor_get_uint8(x_29, sizeof(void*)*7 + 3);
+x_43 = lean_ctor_get_uint8(x_26, sizeof(void*)*7 + 1);
+x_44 = lean_ctor_get_uint8(x_26, sizeof(void*)*7 + 2);
+x_45 = lean_ctor_get_uint8(x_26, sizeof(void*)*7 + 3);
 lean_ctor_set_uint8(x_34, 9, x_33);
-x_46 = l_Lean_Meta_Context_configKey(x_29);
-x_47 = !lean_is_exclusive(x_29);
+x_46 = l_Lean_Meta_Context_configKey(x_26);
+x_47 = !lean_is_exclusive(x_26);
 if (x_47 == 0)
 {
 lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint64_t x_55; uint64_t x_56; uint64_t x_57; uint64_t x_58; uint64_t x_59; lean_object* x_60; lean_object* x_61; 
-x_48 = lean_ctor_get(x_29, 6);
+x_48 = lean_ctor_get(x_26, 6);
 lean_dec(x_48);
-x_49 = lean_ctor_get(x_29, 5);
+x_49 = lean_ctor_get(x_26, 5);
 lean_dec(x_49);
-x_50 = lean_ctor_get(x_29, 4);
+x_50 = lean_ctor_get(x_26, 4);
 lean_dec(x_50);
-x_51 = lean_ctor_get(x_29, 3);
+x_51 = lean_ctor_get(x_26, 3);
 lean_dec(x_51);
-x_52 = lean_ctor_get(x_29, 2);
+x_52 = lean_ctor_get(x_26, 2);
 lean_dec(x_52);
-x_53 = lean_ctor_get(x_29, 1);
+x_53 = lean_ctor_get(x_26, 1);
 lean_dec(x_53);
-x_54 = lean_ctor_get(x_29, 0);
+x_54 = lean_ctor_get(x_26, 0);
 lean_dec(x_54);
 x_55 = 2;
 x_56 = lean_uint64_shift_right(x_46, x_55);
@@ -15723,8 +15902,8 @@ x_59 = lean_uint64_lor(x_57, x_58);
 x_60 = lean_alloc_ctor(0, 1, 8);
 lean_ctor_set(x_60, 0, x_34);
 lean_ctor_set_uint64(x_60, sizeof(void*)*1, x_59);
-lean_ctor_set(x_29, 0, x_60);
-x_61 = l_Lean_Meta_Grind_addTheoremInstance(x_1, x_23, x_24, x_22, x_3, x_21, x_19, x_27, x_28, x_20, x_32, x_29, x_30, x_25, x_31);
+lean_ctor_set(x_26, 0, x_60);
+x_61 = l_Lean_Meta_Grind_addTheoremInstance(x_1, x_24, x_30, x_23, x_3, x_27, x_28, x_19, x_31, x_21, x_25, x_26, x_22, x_32, x_29);
 if (lean_obj_tag(x_61) == 0)
 {
 uint8_t x_62; 
@@ -15752,7 +15931,7 @@ return x_61;
 else
 {
 uint64_t x_65; uint64_t x_66; uint64_t x_67; uint64_t x_68; uint64_t x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-lean_dec(x_29);
+lean_dec(x_26);
 x_65 = 2;
 x_66 = lean_uint64_shift_right(x_46, x_65);
 x_67 = lean_uint64_shift_left(x_66, x_65);
@@ -15773,7 +15952,7 @@ lean_ctor_set_uint8(x_71, sizeof(void*)*7, x_36);
 lean_ctor_set_uint8(x_71, sizeof(void*)*7 + 1, x_43);
 lean_ctor_set_uint8(x_71, sizeof(void*)*7 + 2, x_44);
 lean_ctor_set_uint8(x_71, sizeof(void*)*7 + 3, x_45);
-x_72 = l_Lean_Meta_Grind_addTheoremInstance(x_1, x_23, x_24, x_22, x_3, x_21, x_19, x_27, x_28, x_20, x_32, x_71, x_30, x_25, x_31);
+x_72 = l_Lean_Meta_Grind_addTheoremInstance(x_1, x_24, x_30, x_23, x_3, x_27, x_28, x_19, x_31, x_21, x_25, x_71, x_22, x_32, x_29);
 if (lean_obj_tag(x_72) == 0)
 {
 lean_object* x_73; lean_object* x_74; lean_object* x_75; 
@@ -15822,22 +16001,22 @@ x_91 = lean_ctor_get_uint8(x_34, 16);
 x_92 = lean_ctor_get_uint8(x_34, 17);
 x_93 = lean_ctor_get_uint8(x_34, 18);
 lean_dec(x_34);
-x_94 = lean_ctor_get_uint8(x_29, sizeof(void*)*7);
-x_95 = lean_ctor_get(x_29, 1);
+x_94 = lean_ctor_get_uint8(x_26, sizeof(void*)*7);
+x_95 = lean_ctor_get(x_26, 1);
 lean_inc(x_95);
-x_96 = lean_ctor_get(x_29, 2);
+x_96 = lean_ctor_get(x_26, 2);
 lean_inc_ref(x_96);
-x_97 = lean_ctor_get(x_29, 3);
+x_97 = lean_ctor_get(x_26, 3);
 lean_inc_ref(x_97);
-x_98 = lean_ctor_get(x_29, 4);
+x_98 = lean_ctor_get(x_26, 4);
 lean_inc(x_98);
-x_99 = lean_ctor_get(x_29, 5);
+x_99 = lean_ctor_get(x_26, 5);
 lean_inc(x_99);
-x_100 = lean_ctor_get(x_29, 6);
+x_100 = lean_ctor_get(x_26, 6);
 lean_inc(x_100);
-x_101 = lean_ctor_get_uint8(x_29, sizeof(void*)*7 + 1);
-x_102 = lean_ctor_get_uint8(x_29, sizeof(void*)*7 + 2);
-x_103 = lean_ctor_get_uint8(x_29, sizeof(void*)*7 + 3);
+x_101 = lean_ctor_get_uint8(x_26, sizeof(void*)*7 + 1);
+x_102 = lean_ctor_get_uint8(x_26, sizeof(void*)*7 + 2);
+x_103 = lean_ctor_get_uint8(x_26, sizeof(void*)*7 + 3);
 x_104 = lean_alloc_ctor(0, 0, 19);
 lean_ctor_set_uint8(x_104, 0, x_76);
 lean_ctor_set_uint8(x_104, 1, x_77);
@@ -15858,18 +16037,18 @@ lean_ctor_set_uint8(x_104, 15, x_90);
 lean_ctor_set_uint8(x_104, 16, x_91);
 lean_ctor_set_uint8(x_104, 17, x_92);
 lean_ctor_set_uint8(x_104, 18, x_93);
-x_105 = l_Lean_Meta_Context_configKey(x_29);
-if (lean_is_exclusive(x_29)) {
- lean_ctor_release(x_29, 0);
- lean_ctor_release(x_29, 1);
- lean_ctor_release(x_29, 2);
- lean_ctor_release(x_29, 3);
- lean_ctor_release(x_29, 4);
- lean_ctor_release(x_29, 5);
- lean_ctor_release(x_29, 6);
- x_106 = x_29;
+x_105 = l_Lean_Meta_Context_configKey(x_26);
+if (lean_is_exclusive(x_26)) {
+ lean_ctor_release(x_26, 0);
+ lean_ctor_release(x_26, 1);
+ lean_ctor_release(x_26, 2);
+ lean_ctor_release(x_26, 3);
+ lean_ctor_release(x_26, 4);
+ lean_ctor_release(x_26, 5);
+ lean_ctor_release(x_26, 6);
+ x_106 = x_26;
 } else {
- lean_dec_ref(x_29);
+ lean_dec_ref(x_26);
  x_106 = lean_box(0);
 }
 x_107 = 2;
@@ -15896,7 +16075,7 @@ lean_ctor_set_uint8(x_113, sizeof(void*)*7, x_94);
 lean_ctor_set_uint8(x_113, sizeof(void*)*7 + 1, x_101);
 lean_ctor_set_uint8(x_113, sizeof(void*)*7 + 2, x_102);
 lean_ctor_set_uint8(x_113, sizeof(void*)*7 + 3, x_103);
-x_114 = l_Lean_Meta_Grind_addTheoremInstance(x_1, x_23, x_24, x_22, x_3, x_21, x_19, x_27, x_28, x_20, x_32, x_113, x_30, x_25, x_31);
+x_114 = l_Lean_Meta_Grind_addTheoremInstance(x_1, x_24, x_30, x_23, x_3, x_27, x_28, x_19, x_31, x_21, x_25, x_113, x_22, x_32, x_29);
 if (lean_obj_tag(x_114) == 0)
 {
 lean_object* x_115; lean_object* x_116; lean_object* x_117; 
@@ -15941,20 +16120,20 @@ if (x_134 == 0)
 {
 uint8_t x_137; 
 x_137 = 1;
-x_19 = x_122;
-x_20 = x_125;
-x_21 = x_121;
-x_22 = x_136;
-x_23 = x_119;
-x_24 = x_120;
-x_25 = x_129;
-x_26 = lean_box(0);
-x_27 = x_123;
-x_28 = x_124;
-x_29 = x_127;
-x_30 = x_128;
-x_31 = x_130;
-x_32 = x_126;
+x_19 = x_123;
+x_20 = lean_box(0);
+x_21 = x_125;
+x_22 = x_128;
+x_23 = x_136;
+x_24 = x_119;
+x_25 = x_126;
+x_26 = x_127;
+x_27 = x_121;
+x_28 = x_122;
+x_29 = x_130;
+x_30 = x_120;
+x_31 = x_124;
+x_32 = x_129;
 x_33 = x_137;
 goto block_118;
 }
@@ -15962,20 +16141,20 @@ else
 {
 uint8_t x_138; 
 x_138 = 2;
-x_19 = x_122;
-x_20 = x_125;
-x_21 = x_121;
-x_22 = x_136;
-x_23 = x_119;
-x_24 = x_120;
-x_25 = x_129;
-x_26 = lean_box(0);
-x_27 = x_123;
-x_28 = x_124;
-x_29 = x_127;
-x_30 = x_128;
-x_31 = x_130;
-x_32 = x_126;
+x_19 = x_123;
+x_20 = lean_box(0);
+x_21 = x_125;
+x_22 = x_128;
+x_23 = x_136;
+x_24 = x_119;
+x_25 = x_126;
+x_26 = x_127;
+x_27 = x_121;
+x_28 = x_122;
+x_29 = x_130;
+x_30 = x_120;
+x_31 = x_124;
+x_32 = x_129;
 x_33 = x_138;
 goto block_118;
 }
@@ -18522,7 +18701,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_preprocessGeneralizedPatternRHS___closed__1));
 x_2 = lean_unsigned_to_nat(2u);
-x_3 = lean_unsigned_to_nat(519u);
+x_3 = lean_unsigned_to_nat(523u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_preprocessGeneralizedPatternRHS___closed__0));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -27583,11 +27762,11 @@ uint8_t x_81;
 x_81 = l_Lean_Expr_isLambda(x_1);
 if (x_81 == 0)
 {
-x_66 = x_79;
-x_67 = x_80;
-x_68 = lean_box(0);
+x_66 = lean_box(0);
+x_67 = x_77;
+x_68 = x_80;
 x_69 = x_78;
-x_70 = x_77;
+x_70 = x_79;
 x_71 = x_81;
 goto block_74;
 }
@@ -27595,21 +27774,21 @@ else
 {
 if (x_2 == 0)
 {
-x_66 = x_79;
-x_67 = x_80;
-x_68 = lean_box(0);
+x_66 = lean_box(0);
+x_67 = x_77;
+x_68 = x_80;
 x_69 = x_78;
-x_70 = x_77;
+x_70 = x_79;
 x_71 = x_81;
 goto block_74;
 }
 else
 {
-x_8 = x_79;
-x_9 = x_80;
-x_10 = lean_box(0);
+x_8 = lean_box(0);
+x_9 = x_77;
+x_10 = x_80;
 x_11 = x_78;
-x_12 = x_77;
+x_12 = x_79;
 goto block_65;
 }
 }
@@ -27642,12 +27821,12 @@ return x_126;
 block_65:
 {
 lean_object* x_13; 
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_11);
+lean_inc(x_10);
 lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_9);
 lean_inc_ref(x_1);
-x_13 = l_Lean_Meta_isLitValue(x_1, x_12, x_11, x_8, x_9);
+x_13 = l_Lean_Meta_isLitValue(x_1, x_9, x_11, x_12, x_10);
 if (lean_obj_tag(x_13) == 0)
 {
 lean_object* x_14; uint8_t x_15; 
@@ -27658,11 +27837,11 @@ if (x_15 == 0)
 {
 lean_object* x_16; 
 lean_dec_ref(x_13);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_11);
+lean_inc(x_10);
 lean_inc_ref(x_12);
-x_16 = l_Lean_Meta_constructorApp_x27_x3f(x_1, x_12, x_11, x_8, x_9);
+lean_inc(x_11);
+lean_inc_ref(x_9);
+x_16 = l_Lean_Meta_constructorApp_x27_x3f(x_1, x_9, x_11, x_12, x_10);
 if (lean_obj_tag(x_16) == 0)
 {
 uint8_t x_17; 
@@ -27689,7 +27868,7 @@ lean_inc(x_22);
 lean_dec(x_20);
 x_23 = lean_array_get_size(x_21);
 x_24 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_isValue_spec__0___redArg___closed__0));
-x_25 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_isValue_spec__0___redArg(x_23, x_21, x_2, x_22, x_24, x_12, x_11, x_8, x_9);
+x_25 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_isValue_spec__0___redArg(x_23, x_21, x_2, x_22, x_24, x_9, x_11, x_12, x_10);
 lean_dec(x_21);
 if (lean_obj_tag(x_25) == 0)
 {
@@ -27775,8 +27954,8 @@ else
 lean_dec(x_18);
 lean_dec_ref(x_12);
 lean_dec(x_11);
-lean_dec(x_9);
-lean_dec_ref(x_8);
+lean_dec(x_10);
+lean_dec_ref(x_9);
 lean_ctor_set(x_16, 0, x_14);
 return x_16;
 }
@@ -27804,7 +27983,7 @@ lean_inc(x_46);
 lean_dec(x_44);
 x_47 = lean_array_get_size(x_45);
 x_48 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_isValue_spec__0___redArg___closed__0));
-x_49 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_isValue_spec__0___redArg(x_47, x_45, x_2, x_46, x_48, x_12, x_11, x_8, x_9);
+x_49 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_isValue_spec__0___redArg(x_47, x_45, x_2, x_46, x_48, x_9, x_11, x_12, x_10);
 lean_dec(x_45);
 if (lean_obj_tag(x_49) == 0)
 {
@@ -27876,8 +28055,8 @@ lean_object* x_61;
 lean_dec(x_42);
 lean_dec_ref(x_12);
 lean_dec(x_11);
-lean_dec(x_9);
-lean_dec_ref(x_8);
+lean_dec(x_10);
+lean_dec_ref(x_9);
 x_61 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_61, 0, x_14);
 return x_61;
@@ -27890,8 +28069,8 @@ uint8_t x_62;
 lean_dec(x_14);
 lean_dec_ref(x_12);
 lean_dec(x_11);
-lean_dec(x_9);
-lean_dec_ref(x_8);
+lean_dec(x_10);
+lean_dec_ref(x_9);
 x_62 = !lean_is_exclusive(x_16);
 if (x_62 == 0)
 {
@@ -27914,8 +28093,8 @@ else
 lean_dec(x_14);
 lean_dec_ref(x_12);
 lean_dec(x_11);
-lean_dec(x_9);
-lean_dec_ref(x_8);
+lean_dec(x_10);
+lean_dec_ref(x_9);
 lean_dec_ref(x_1);
 return x_13;
 }
@@ -27924,8 +28103,8 @@ else
 {
 lean_dec_ref(x_12);
 lean_dec(x_11);
-lean_dec(x_9);
-lean_dec_ref(x_8);
+lean_dec(x_10);
+lean_dec_ref(x_9);
 lean_dec_ref(x_1);
 return x_13;
 }
@@ -27934,9 +28113,9 @@ block_74:
 {
 if (x_71 == 0)
 {
-x_8 = x_66;
+x_8 = lean_box(0);
 x_9 = x_67;
-x_10 = lean_box(0);
+x_10 = x_68;
 x_11 = x_69;
 x_12 = x_70;
 goto block_65;
@@ -27946,8 +28125,8 @@ else
 lean_object* x_72; lean_object* x_73; 
 lean_dec_ref(x_70);
 lean_dec(x_69);
-lean_dec(x_67);
-lean_dec_ref(x_66);
+lean_dec(x_68);
+lean_dec_ref(x_67);
 lean_dec_ref(x_1);
 x_72 = lean_box(x_71);
 x_73 = lean_alloc_ctor(0, 1, 0);
@@ -31186,7 +31365,7 @@ x_15 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Gri
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -31205,7 +31384,7 @@ else
 {
 lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; 
 x_8 = lean_ctor_get(x_2, 13);
-x_9 = ((lean_object*)(l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___closed__1));
+x_9 = ((lean_object*)(l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___closed__1));
 x_10 = l_Lean_Name_append(x_9, x_1);
 x_11 = l___private_Lean_Util_Trace_0__Lean_checkTraceOption_go(x_8, x_4, x_10);
 lean_dec(x_10);
@@ -31216,28 +31395,28 @@ return x_13;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg(x_1, x_2);
+x_4 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg(x_1, x_2);
 lean_dec_ref(x_2);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
 lean_object* x_15; 
-x_15 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg(x_1, x_12);
+x_15 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg(x_1, x_12);
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
 lean_object* x_15; 
-x_15 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_15 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -31253,7 +31432,7 @@ lean_dec_ref(x_2);
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
 lean_object* x_15; 
@@ -31261,19 +31440,19 @@ x_15 = lean_apply_13(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
 lean_object* x_15; 
-x_15 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_15 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
 lean_object* x_16; lean_object* x_17; 
-x_16 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___lam__0___boxed), 14, 9);
+x_16 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___lam__0___boxed), 14, 9);
 lean_closure_set(x_16, 0, x_1);
 lean_closure_set(x_16, 1, x_3);
 lean_closure_set(x_16, 2, x_4);
@@ -31309,29 +31488,29 @@ return x_20;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
 uint8_t x_16; lean_object* x_17; 
 x_16 = lean_unbox(x_2);
-x_17 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_1, x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+x_17 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(x_1, x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
 return x_17;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
 lean_object* x_17; 
-x_17 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+x_17 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
 return x_17;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+LEAN_EXPORT lean_object* l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
 uint8_t x_17; lean_object* x_18; 
 x_17 = lean_unbox(x_3);
-x_18 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8(x_1, x_2, x_17, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+x_18 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9(x_1, x_2, x_17, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
 return x_18;
 }
 }
@@ -31445,291 +31624,6 @@ lean_dec_ref(x_4);
 return x_20;
 }
 }
-static double _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0() {
-_start:
-{
-lean_object* x_1; double x_2; 
-x_1 = lean_unsigned_to_nat(0u);
-x_2 = lean_float_of_nat(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(0u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg(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_8; lean_object* x_9; uint8_t x_10; 
-x_8 = lean_ctor_get(x_5, 5);
-x_9 = l_Lean_addMessageContextFull___at___00Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_getLHS_spec__1_spec__1(x_2, x_3, x_4, x_5, x_6);
-x_10 = !lean_is_exclusive(x_9);
-if (x_10 == 0)
-{
-lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_11 = lean_ctor_get(x_9, 0);
-x_12 = lean_st_ref_take(x_6);
-x_13 = !lean_is_exclusive(x_12);
-if (x_13 == 0)
-{
-lean_object* x_14; uint8_t x_15; 
-x_14 = lean_ctor_get(x_12, 4);
-x_15 = !lean_is_exclusive(x_14);
-if (x_15 == 0)
-{
-lean_object* x_16; double x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_16 = lean_ctor_get(x_14, 0);
-x_17 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0;
-x_18 = 0;
-x_19 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1));
-x_20 = lean_alloc_ctor(0, 2, 17);
-lean_ctor_set(x_20, 0, x_1);
-lean_ctor_set(x_20, 1, x_19);
-lean_ctor_set_float(x_20, sizeof(void*)*2, x_17);
-lean_ctor_set_float(x_20, sizeof(void*)*2 + 8, x_17);
-lean_ctor_set_uint8(x_20, sizeof(void*)*2 + 16, x_18);
-x_21 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2;
-x_22 = lean_alloc_ctor(9, 3, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_11);
-lean_ctor_set(x_22, 2, x_21);
-lean_inc(x_8);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_8);
-lean_ctor_set(x_23, 1, x_22);
-x_24 = l_Lean_PersistentArray_push___redArg(x_16, x_23);
-lean_ctor_set(x_14, 0, x_24);
-x_25 = lean_st_ref_set(x_6, x_12);
-x_26 = lean_box(0);
-lean_ctor_set(x_9, 0, x_26);
-return x_9;
-}
-else
-{
-uint64_t x_27; lean_object* x_28; double x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_27 = lean_ctor_get_uint64(x_14, sizeof(void*)*1);
-x_28 = lean_ctor_get(x_14, 0);
-lean_inc(x_28);
-lean_dec(x_14);
-x_29 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0;
-x_30 = 0;
-x_31 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1));
-x_32 = lean_alloc_ctor(0, 2, 17);
-lean_ctor_set(x_32, 0, x_1);
-lean_ctor_set(x_32, 1, x_31);
-lean_ctor_set_float(x_32, sizeof(void*)*2, x_29);
-lean_ctor_set_float(x_32, sizeof(void*)*2 + 8, x_29);
-lean_ctor_set_uint8(x_32, sizeof(void*)*2 + 16, x_30);
-x_33 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2;
-x_34 = lean_alloc_ctor(9, 3, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_11);
-lean_ctor_set(x_34, 2, x_33);
-lean_inc(x_8);
-x_35 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_35, 0, x_8);
-lean_ctor_set(x_35, 1, x_34);
-x_36 = l_Lean_PersistentArray_push___redArg(x_28, x_35);
-x_37 = lean_alloc_ctor(0, 1, 8);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set_uint64(x_37, sizeof(void*)*1, x_27);
-lean_ctor_set(x_12, 4, x_37);
-x_38 = lean_st_ref_set(x_6, x_12);
-x_39 = lean_box(0);
-lean_ctor_set(x_9, 0, x_39);
-return x_9;
-}
-}
-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; lean_object* x_48; uint64_t x_49; lean_object* x_50; lean_object* x_51; double x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_40 = lean_ctor_get(x_12, 4);
-x_41 = lean_ctor_get(x_12, 0);
-x_42 = lean_ctor_get(x_12, 1);
-x_43 = lean_ctor_get(x_12, 2);
-x_44 = lean_ctor_get(x_12, 3);
-x_45 = lean_ctor_get(x_12, 5);
-x_46 = lean_ctor_get(x_12, 6);
-x_47 = lean_ctor_get(x_12, 7);
-x_48 = lean_ctor_get(x_12, 8);
-lean_inc(x_48);
-lean_inc(x_47);
-lean_inc(x_46);
-lean_inc(x_45);
-lean_inc(x_40);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_inc(x_42);
-lean_inc(x_41);
-lean_dec(x_12);
-x_49 = lean_ctor_get_uint64(x_40, sizeof(void*)*1);
-x_50 = lean_ctor_get(x_40, 0);
-lean_inc_ref(x_50);
-if (lean_is_exclusive(x_40)) {
- lean_ctor_release(x_40, 0);
- x_51 = x_40;
-} else {
- lean_dec_ref(x_40);
- x_51 = lean_box(0);
-}
-x_52 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0;
-x_53 = 0;
-x_54 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1));
-x_55 = lean_alloc_ctor(0, 2, 17);
-lean_ctor_set(x_55, 0, x_1);
-lean_ctor_set(x_55, 1, x_54);
-lean_ctor_set_float(x_55, sizeof(void*)*2, x_52);
-lean_ctor_set_float(x_55, sizeof(void*)*2 + 8, x_52);
-lean_ctor_set_uint8(x_55, sizeof(void*)*2 + 16, x_53);
-x_56 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2;
-x_57 = lean_alloc_ctor(9, 3, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_11);
-lean_ctor_set(x_57, 2, x_56);
-lean_inc(x_8);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_8);
-lean_ctor_set(x_58, 1, x_57);
-x_59 = l_Lean_PersistentArray_push___redArg(x_50, x_58);
-if (lean_is_scalar(x_51)) {
- x_60 = lean_alloc_ctor(0, 1, 8);
-} else {
- x_60 = x_51;
-}
-lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set_uint64(x_60, sizeof(void*)*1, x_49);
-x_61 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_61, 0, x_41);
-lean_ctor_set(x_61, 1, x_42);
-lean_ctor_set(x_61, 2, x_43);
-lean_ctor_set(x_61, 3, x_44);
-lean_ctor_set(x_61, 4, x_60);
-lean_ctor_set(x_61, 5, x_45);
-lean_ctor_set(x_61, 6, x_46);
-lean_ctor_set(x_61, 7, x_47);
-lean_ctor_set(x_61, 8, x_48);
-x_62 = lean_st_ref_set(x_6, x_61);
-x_63 = lean_box(0);
-lean_ctor_set(x_9, 0, x_63);
-return x_9;
-}
-}
-else
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint64_t x_76; lean_object* x_77; lean_object* x_78; double x_79; uint8_t x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_64 = lean_ctor_get(x_9, 0);
-lean_inc(x_64);
-lean_dec(x_9);
-x_65 = lean_st_ref_take(x_6);
-x_66 = lean_ctor_get(x_65, 4);
-lean_inc_ref(x_66);
-x_67 = lean_ctor_get(x_65, 0);
-lean_inc_ref(x_67);
-x_68 = lean_ctor_get(x_65, 1);
-lean_inc(x_68);
-x_69 = lean_ctor_get(x_65, 2);
-lean_inc_ref(x_69);
-x_70 = lean_ctor_get(x_65, 3);
-lean_inc_ref(x_70);
-x_71 = lean_ctor_get(x_65, 5);
-lean_inc_ref(x_71);
-x_72 = lean_ctor_get(x_65, 6);
-lean_inc_ref(x_72);
-x_73 = lean_ctor_get(x_65, 7);
-lean_inc_ref(x_73);
-x_74 = lean_ctor_get(x_65, 8);
-lean_inc_ref(x_74);
-if (lean_is_exclusive(x_65)) {
- lean_ctor_release(x_65, 0);
- lean_ctor_release(x_65, 1);
- lean_ctor_release(x_65, 2);
- lean_ctor_release(x_65, 3);
- lean_ctor_release(x_65, 4);
- lean_ctor_release(x_65, 5);
- lean_ctor_release(x_65, 6);
- lean_ctor_release(x_65, 7);
- lean_ctor_release(x_65, 8);
- x_75 = x_65;
-} else {
- lean_dec_ref(x_65);
- x_75 = lean_box(0);
-}
-x_76 = lean_ctor_get_uint64(x_66, sizeof(void*)*1);
-x_77 = lean_ctor_get(x_66, 0);
-lean_inc_ref(x_77);
-if (lean_is_exclusive(x_66)) {
- lean_ctor_release(x_66, 0);
- x_78 = x_66;
-} else {
- lean_dec_ref(x_66);
- x_78 = lean_box(0);
-}
-x_79 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0;
-x_80 = 0;
-x_81 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__1));
-x_82 = lean_alloc_ctor(0, 2, 17);
-lean_ctor_set(x_82, 0, x_1);
-lean_ctor_set(x_82, 1, x_81);
-lean_ctor_set_float(x_82, sizeof(void*)*2, x_79);
-lean_ctor_set_float(x_82, sizeof(void*)*2 + 8, x_79);
-lean_ctor_set_uint8(x_82, sizeof(void*)*2 + 16, x_80);
-x_83 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2;
-x_84 = lean_alloc_ctor(9, 3, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_64);
-lean_ctor_set(x_84, 2, x_83);
-lean_inc(x_8);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_8);
-lean_ctor_set(x_85, 1, x_84);
-x_86 = l_Lean_PersistentArray_push___redArg(x_77, x_85);
-if (lean_is_scalar(x_78)) {
- x_87 = lean_alloc_ctor(0, 1, 8);
-} else {
- x_87 = x_78;
-}
-lean_ctor_set(x_87, 0, x_86);
-lean_ctor_set_uint64(x_87, sizeof(void*)*1, x_76);
-if (lean_is_scalar(x_75)) {
- x_88 = lean_alloc_ctor(0, 9, 0);
-} else {
- x_88 = x_75;
-}
-lean_ctor_set(x_88, 0, x_67);
-lean_ctor_set(x_88, 1, x_68);
-lean_ctor_set(x_88, 2, x_69);
-lean_ctor_set(x_88, 3, x_70);
-lean_ctor_set(x_88, 4, x_87);
-lean_ctor_set(x_88, 5, x_71);
-lean_ctor_set(x_88, 6, x_72);
-lean_ctor_set(x_88, 7, x_73);
-lean_ctor_set(x_88, 8, x_74);
-x_89 = lean_st_ref_set(x_6, x_88);
-x_90 = lean_box(0);
-x_91 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_91, 0, x_90);
-return x_91;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; 
-x_8 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_6);
-lean_dec_ref(x_5);
-lean_dec(x_4);
-lean_dec_ref(x_3);
-return x_8;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -31758,7 +31652,154 @@ lean_dec(x_1);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(uint8_t x_1, uint8_t x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17) {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+lean_object* x_18; lean_object* x_19; uint8_t x_24; 
+x_24 = lean_usize_dec_eq(x_2, x_3);
+if (x_24 == 0)
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_29; lean_object* x_30; 
+x_25 = lean_array_uget(x_1, x_2);
+x_29 = l_Lean_Expr_mvarId_x21(x_25);
+x_30 = l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0___redArg(x_29, x_14);
+lean_dec(x_29);
+if (lean_obj_tag(x_30) == 0)
+{
+lean_object* x_31; uint8_t x_32; 
+x_31 = lean_ctor_get(x_30, 0);
+lean_inc(x_31);
+lean_dec_ref(x_30);
+x_32 = lean_unbox(x_31);
+lean_dec(x_31);
+if (x_32 == 0)
+{
+x_26 = lean_box(0);
+goto block_28;
+}
+else
+{
+lean_dec(x_25);
+x_18 = x_4;
+x_19 = lean_box(0);
+goto block_23;
+}
+}
+else
+{
+if (lean_obj_tag(x_30) == 0)
+{
+lean_object* x_33; uint8_t x_34; 
+x_33 = lean_ctor_get(x_30, 0);
+lean_inc(x_33);
+lean_dec_ref(x_30);
+x_34 = lean_unbox(x_33);
+lean_dec(x_33);
+if (x_34 == 0)
+{
+lean_dec(x_25);
+x_18 = x_4;
+x_19 = lean_box(0);
+goto block_23;
+}
+else
+{
+x_26 = lean_box(0);
+goto block_28;
+}
+}
+else
+{
+uint8_t x_35; 
+lean_dec(x_25);
+lean_dec_ref(x_4);
+x_35 = !lean_is_exclusive(x_30);
+if (x_35 == 0)
+{
+return x_30;
+}
+else
+{
+lean_object* x_36; lean_object* x_37; 
+x_36 = lean_ctor_get(x_30, 0);
+lean_inc(x_36);
+lean_dec(x_30);
+x_37 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_37, 0, x_36);
+return x_37;
+}
+}
+}
+block_28:
+{
+lean_object* x_27; 
+x_27 = lean_array_push(x_4, x_25);
+x_18 = x_27;
+x_19 = lean_box(0);
+goto block_23;
+}
+}
+else
+{
+lean_object* x_38; 
+x_38 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_38, 0, x_4);
+return x_38;
+}
+block_23:
+{
+size_t x_20; size_t x_21; 
+x_20 = 1;
+x_21 = lean_usize_add(x_2, x_20);
+x_2 = x_21;
+x_4 = x_18;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
+_start:
+{
+size_t x_18; size_t x_19; lean_object* x_20; 
+x_18 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_19 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_20 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_1, x_18, x_19, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec_ref(x_5);
+lean_dec_ref(x_1);
+return x_20;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(uint8_t x_1, uint8_t x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17) {
 _start:
 {
 uint8_t x_19; 
@@ -31843,7 +31884,7 @@ return x_38;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4___boxed(lean_object** _args) {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___boxed(lean_object** _args) {
 lean_object* x_1 = _args[0];
 lean_object* x_2 = _args[1];
 lean_object* x_3 = _args[2];
@@ -31871,7 +31912,7 @@ x_21 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_22 = lean_unbox_usize(x_5);
 lean_dec(x_5);
-x_23 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_19, x_20, x_3, x_21, x_22, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
+x_23 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(x_19, x_20, x_3, x_21, x_22, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
 lean_dec(x_17);
 lean_dec_ref(x_16);
 lean_dec(x_15);
@@ -31888,7 +31929,440 @@ lean_dec_ref(x_3);
 return x_23;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__1));
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+_start:
+{
+uint8_t x_17; 
+x_17 = lean_usize_dec_lt(x_5, x_4);
+if (x_17 == 0)
+{
+lean_object* x_18; 
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_18 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_18, 0, x_6);
+return x_18;
+}
+else
+{
+lean_object* x_19; uint8_t x_20; 
+lean_dec_ref(x_6);
+x_19 = lean_array_uget(x_3, x_5);
+x_20 = !lean_is_exclusive(x_19);
+if (x_20 == 0)
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_21 = lean_ctor_get(x_19, 0);
+x_22 = lean_ctor_get(x_19, 1);
+x_23 = lean_expr_instantiate_rev(x_21, x_1);
+lean_dec(x_21);
+lean_inc(x_15);
+lean_inc_ref(x_14);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+x_24 = l_Lean_Meta_isExprDefEq(x_23, x_22, x_12, x_13, x_14, x_15);
+if (lean_obj_tag(x_24) == 0)
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_31; 
+x_25 = lean_ctor_get(x_24, 0);
+lean_inc(x_25);
+if (lean_is_exclusive(x_24)) {
+ lean_ctor_release(x_24, 0);
+ x_26 = x_24;
+} else {
+ lean_dec_ref(x_24);
+ x_26 = lean_box(0);
+}
+x_31 = lean_unbox(x_25);
+lean_dec(x_25);
+if (x_31 == 0)
+{
+lean_object* x_32; 
+x_32 = l_Lean_Meta_Grind_getConfig___redArg(x_8);
+if (lean_obj_tag(x_32) == 0)
+{
+lean_object* x_33; uint8_t x_34; 
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+lean_dec_ref(x_32);
+x_34 = lean_ctor_get_uint8(x_33, sizeof(void*)*11 + 14);
+lean_dec(x_33);
+if (x_34 == 0)
+{
+lean_free_object(x_19);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_27 = lean_box(0);
+goto block_30;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; uint8_t x_37; 
+x_35 = lean_ctor_get(x_14, 2);
+x_36 = l_Lean_Meta_Grind_grind_debug;
+x_37 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_35, x_36);
+if (x_37 == 0)
+{
+lean_free_object(x_19);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_27 = lean_box(0);
+goto block_30;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_38 = lean_ctor_get(x_2, 5);
+lean_inc_ref(x_38);
+lean_dec_ref(x_2);
+x_39 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2;
+x_40 = l_Lean_Meta_Grind_Origin_pp(x_38);
+lean_ctor_set_tag(x_19, 7);
+lean_ctor_set(x_19, 1, x_40);
+lean_ctor_set(x_19, 0, x_39);
+x_41 = l_Lean_Meta_Grind_reportIssue(x_19, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+if (lean_obj_tag(x_41) == 0)
+{
+lean_dec_ref(x_41);
+x_27 = lean_box(0);
+goto block_30;
+}
+else
+{
+uint8_t x_42; 
+lean_dec(x_26);
+x_42 = !lean_is_exclusive(x_41);
+if (x_42 == 0)
+{
+return x_41;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; 
+x_43 = lean_ctor_get(x_41, 0);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_44, 0, x_43);
+return x_44;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_45; 
+lean_dec(x_26);
+lean_free_object(x_19);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_45 = !lean_is_exclusive(x_32);
+if (x_45 == 0)
+{
+return x_32;
+}
+else
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = lean_ctor_get(x_32, 0);
+lean_inc(x_46);
+lean_dec(x_32);
+x_47 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_47, 0, x_46);
+return x_47;
+}
+}
+}
+else
+{
+lean_object* x_48; size_t x_49; size_t x_50; 
+lean_dec(x_26);
+lean_free_object(x_19);
+x_48 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
+x_49 = 1;
+x_50 = lean_usize_add(x_5, x_49);
+x_5 = x_50;
+x_6 = x_48;
+goto _start;
+}
+block_30:
+{
+lean_object* x_28; lean_object* x_29; 
+x_28 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+if (lean_is_scalar(x_26)) {
+ x_29 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_29 = x_26;
+}
+lean_ctor_set(x_29, 0, x_28);
+return x_29;
+}
+}
+else
+{
+uint8_t x_52; 
+lean_free_object(x_19);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_52 = !lean_is_exclusive(x_24);
+if (x_52 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_53; lean_object* x_54; 
+x_53 = lean_ctor_get(x_24, 0);
+lean_inc(x_53);
+lean_dec(x_24);
+x_54 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_54, 0, x_53);
+return x_54;
+}
+}
+}
+else
+{
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_55 = lean_ctor_get(x_19, 0);
+x_56 = lean_ctor_get(x_19, 1);
+lean_inc(x_56);
+lean_inc(x_55);
+lean_dec(x_19);
+x_57 = lean_expr_instantiate_rev(x_55, x_1);
+lean_dec(x_55);
+lean_inc(x_15);
+lean_inc_ref(x_14);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+x_58 = l_Lean_Meta_isExprDefEq(x_57, x_56, x_12, x_13, x_14, x_15);
+if (lean_obj_tag(x_58) == 0)
+{
+lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_65; 
+x_59 = lean_ctor_get(x_58, 0);
+lean_inc(x_59);
+if (lean_is_exclusive(x_58)) {
+ lean_ctor_release(x_58, 0);
+ x_60 = x_58;
+} else {
+ lean_dec_ref(x_58);
+ x_60 = lean_box(0);
+}
+x_65 = lean_unbox(x_59);
+lean_dec(x_59);
+if (x_65 == 0)
+{
+lean_object* x_66; 
+x_66 = l_Lean_Meta_Grind_getConfig___redArg(x_8);
+if (lean_obj_tag(x_66) == 0)
+{
+lean_object* x_67; uint8_t x_68; 
+x_67 = lean_ctor_get(x_66, 0);
+lean_inc(x_67);
+lean_dec_ref(x_66);
+x_68 = lean_ctor_get_uint8(x_67, sizeof(void*)*11 + 14);
+lean_dec(x_67);
+if (x_68 == 0)
+{
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_61 = lean_box(0);
+goto block_64;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; uint8_t x_71; 
+x_69 = lean_ctor_get(x_14, 2);
+x_70 = l_Lean_Meta_Grind_grind_debug;
+x_71 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_69, x_70);
+if (x_71 == 0)
+{
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_61 = lean_box(0);
+goto block_64;
+}
+else
+{
+lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_72 = lean_ctor_get(x_2, 5);
+lean_inc_ref(x_72);
+lean_dec_ref(x_2);
+x_73 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2;
+x_74 = l_Lean_Meta_Grind_Origin_pp(x_72);
+x_75 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+x_76 = l_Lean_Meta_Grind_reportIssue(x_75, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+if (lean_obj_tag(x_76) == 0)
+{
+lean_dec_ref(x_76);
+x_61 = lean_box(0);
+goto block_64;
+}
+else
+{
+lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+lean_dec(x_60);
+x_77 = lean_ctor_get(x_76, 0);
+lean_inc(x_77);
+if (lean_is_exclusive(x_76)) {
+ lean_ctor_release(x_76, 0);
+ x_78 = x_76;
+} else {
+ lean_dec_ref(x_76);
+ x_78 = lean_box(0);
+}
+if (lean_is_scalar(x_78)) {
+ x_79 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_79 = x_78;
+}
+lean_ctor_set(x_79, 0, x_77);
+return x_79;
+}
+}
+}
+}
+else
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+lean_dec(x_60);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_80 = lean_ctor_get(x_66, 0);
+lean_inc(x_80);
+if (lean_is_exclusive(x_66)) {
+ lean_ctor_release(x_66, 0);
+ x_81 = x_66;
+} else {
+ lean_dec_ref(x_66);
+ x_81 = lean_box(0);
+}
+if (lean_is_scalar(x_81)) {
+ x_82 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_82 = x_81;
+}
+lean_ctor_set(x_82, 0, x_80);
+return x_82;
+}
+}
+else
+{
+lean_object* x_83; size_t x_84; size_t x_85; 
+lean_dec(x_60);
+x_83 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
+x_84 = 1;
+x_85 = lean_usize_add(x_5, x_84);
+x_5 = x_85;
+x_6 = x_83;
+goto _start;
+}
+block_64:
+{
+lean_object* x_62; lean_object* x_63; 
+x_62 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+if (lean_is_scalar(x_60)) {
+ x_63 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_63 = x_60;
+}
+lean_ctor_set(x_63, 0, x_62);
+return x_63;
+}
+}
+else
+{
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec_ref(x_2);
+x_87 = lean_ctor_get(x_58, 0);
+lean_inc(x_87);
+if (lean_is_exclusive(x_58)) {
+ lean_ctor_release(x_58, 0);
+ x_88 = x_58;
+} else {
+ lean_dec_ref(x_58);
+ x_88 = lean_box(0);
+}
+if (lean_is_scalar(x_88)) {
+ x_89 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_89 = x_88;
+}
+lean_ctor_set(x_89, 0, x_87);
+return x_89;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+size_t x_17; size_t x_18; lean_object* x_19; 
+x_17 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_18 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_19 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_1, x_2, x_3, x_17, x_18, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_3);
+lean_dec_ref(x_1);
+return x_19;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_10; lean_object* x_11; uint8_t x_16; 
@@ -31909,7 +32383,7 @@ else
 lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_27; 
 lean_dec_ref(x_4);
 x_18 = lean_box(0);
-x_19 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+x_19 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg___closed__0));
 x_20 = lean_array_uget(x_1, x_3);
 lean_inc(x_8);
 lean_inc_ref(x_7);
@@ -32020,7 +32494,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___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_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 size_t x_10; size_t x_11; lean_object* x_12; 
@@ -32028,159 +32502,12 @@ x_10 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_11 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_12 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_1, x_10, x_11, x_4, x_5, x_6, x_7, x_8);
+x_12 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg(x_1, x_10, x_11, x_4, x_5, x_6, x_7, x_8);
 lean_dec_ref(x_1);
 return x_12;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
-_start:
-{
-lean_object* x_18; lean_object* x_19; uint8_t x_24; 
-x_24 = lean_usize_dec_eq(x_2, x_3);
-if (x_24 == 0)
-{
-lean_object* x_25; lean_object* x_26; lean_object* x_29; lean_object* x_30; 
-x_25 = lean_array_uget(x_1, x_2);
-x_29 = l_Lean_Expr_mvarId_x21(x_25);
-x_30 = l_Lean_MVarId_isAssigned___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__0___redArg(x_29, x_14);
-lean_dec(x_29);
-if (lean_obj_tag(x_30) == 0)
-{
-lean_object* x_31; uint8_t x_32; 
-x_31 = lean_ctor_get(x_30, 0);
-lean_inc(x_31);
-lean_dec_ref(x_30);
-x_32 = lean_unbox(x_31);
-lean_dec(x_31);
-if (x_32 == 0)
-{
-x_26 = lean_box(0);
-goto block_28;
-}
-else
-{
-lean_dec(x_25);
-x_18 = x_4;
-x_19 = lean_box(0);
-goto block_23;
-}
-}
-else
-{
-if (lean_obj_tag(x_30) == 0)
-{
-lean_object* x_33; uint8_t x_34; 
-x_33 = lean_ctor_get(x_30, 0);
-lean_inc(x_33);
-lean_dec_ref(x_30);
-x_34 = lean_unbox(x_33);
-lean_dec(x_33);
-if (x_34 == 0)
-{
-lean_dec(x_25);
-x_18 = x_4;
-x_19 = lean_box(0);
-goto block_23;
-}
-else
-{
-x_26 = lean_box(0);
-goto block_28;
-}
-}
-else
-{
-uint8_t x_35; 
-lean_dec(x_25);
-lean_dec_ref(x_4);
-x_35 = !lean_is_exclusive(x_30);
-if (x_35 == 0)
-{
-return x_30;
-}
-else
-{
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_ctor_get(x_30, 0);
-lean_inc(x_36);
-lean_dec(x_30);
-x_37 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_37, 0, x_36);
-return x_37;
-}
-}
-}
-block_28:
-{
-lean_object* x_27; 
-x_27 = lean_array_push(x_4, x_25);
-x_18 = x_27;
-x_19 = lean_box(0);
-goto block_23;
-}
-}
-else
-{
-lean_object* x_38; 
-x_38 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_38, 0, x_4);
-return x_38;
-}
-block_23:
-{
-size_t x_20; size_t x_21; 
-x_20 = 1;
-x_21 = lean_usize_add(x_2, x_20);
-x_2 = x_21;
-x_4 = x_18;
-goto _start;
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___boxed(lean_object** _args) {
-lean_object* x_1 = _args[0];
-lean_object* x_2 = _args[1];
-lean_object* x_3 = _args[2];
-lean_object* x_4 = _args[3];
-lean_object* x_5 = _args[4];
-lean_object* x_6 = _args[5];
-lean_object* x_7 = _args[6];
-lean_object* x_8 = _args[7];
-lean_object* x_9 = _args[8];
-lean_object* x_10 = _args[9];
-lean_object* x_11 = _args[10];
-lean_object* x_12 = _args[11];
-lean_object* x_13 = _args[12];
-lean_object* x_14 = _args[13];
-lean_object* x_15 = _args[14];
-lean_object* x_16 = _args[15];
-lean_object* x_17 = _args[16];
-_start:
-{
-size_t x_18; size_t x_19; lean_object* x_20; 
-x_18 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_19 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_20 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(x_1, x_18, x_19, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec_ref(x_11);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec_ref(x_5);
-lean_dec_ref(x_1);
-return x_20;
-}
-}
-LEAN_EXPORT lean_object* l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -32224,6 +32551,291 @@ goto _start;
 }
 }
 }
+static double _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0() {
+_start:
+{
+lean_object* x_1; double x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = lean_float_of_nat(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(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_8; lean_object* x_9; uint8_t x_10; 
+x_8 = lean_ctor_get(x_5, 5);
+x_9 = l_Lean_addMessageContextFull___at___00Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_getLHS_spec__1_spec__1(x_2, x_3, x_4, x_5, x_6);
+x_10 = !lean_is_exclusive(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_9, 0);
+x_12 = lean_st_ref_take(x_6);
+x_13 = !lean_is_exclusive(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; uint8_t x_15; 
+x_14 = lean_ctor_get(x_12, 4);
+x_15 = !lean_is_exclusive(x_14);
+if (x_15 == 0)
+{
+lean_object* x_16; double x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_16 = lean_ctor_get(x_14, 0);
+x_17 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0;
+x_18 = 0;
+x_19 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1));
+x_20 = lean_alloc_ctor(0, 2, 17);
+lean_ctor_set(x_20, 0, x_1);
+lean_ctor_set(x_20, 1, x_19);
+lean_ctor_set_float(x_20, sizeof(void*)*2, x_17);
+lean_ctor_set_float(x_20, sizeof(void*)*2 + 8, x_17);
+lean_ctor_set_uint8(x_20, sizeof(void*)*2 + 16, x_18);
+x_21 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2;
+x_22 = lean_alloc_ctor(9, 3, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_11);
+lean_ctor_set(x_22, 2, x_21);
+lean_inc(x_8);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_8);
+lean_ctor_set(x_23, 1, x_22);
+x_24 = l_Lean_PersistentArray_push___redArg(x_16, x_23);
+lean_ctor_set(x_14, 0, x_24);
+x_25 = lean_st_ref_set(x_6, x_12);
+x_26 = lean_box(0);
+lean_ctor_set(x_9, 0, x_26);
+return x_9;
+}
+else
+{
+uint64_t x_27; lean_object* x_28; double x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_27 = lean_ctor_get_uint64(x_14, sizeof(void*)*1);
+x_28 = lean_ctor_get(x_14, 0);
+lean_inc(x_28);
+lean_dec(x_14);
+x_29 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0;
+x_30 = 0;
+x_31 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1));
+x_32 = lean_alloc_ctor(0, 2, 17);
+lean_ctor_set(x_32, 0, x_1);
+lean_ctor_set(x_32, 1, x_31);
+lean_ctor_set_float(x_32, sizeof(void*)*2, x_29);
+lean_ctor_set_float(x_32, sizeof(void*)*2 + 8, x_29);
+lean_ctor_set_uint8(x_32, sizeof(void*)*2 + 16, x_30);
+x_33 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2;
+x_34 = lean_alloc_ctor(9, 3, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_11);
+lean_ctor_set(x_34, 2, x_33);
+lean_inc(x_8);
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_8);
+lean_ctor_set(x_35, 1, x_34);
+x_36 = l_Lean_PersistentArray_push___redArg(x_28, x_35);
+x_37 = lean_alloc_ctor(0, 1, 8);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set_uint64(x_37, sizeof(void*)*1, x_27);
+lean_ctor_set(x_12, 4, x_37);
+x_38 = lean_st_ref_set(x_6, x_12);
+x_39 = lean_box(0);
+lean_ctor_set(x_9, 0, x_39);
+return x_9;
+}
+}
+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; lean_object* x_48; uint64_t x_49; lean_object* x_50; lean_object* x_51; double x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_40 = lean_ctor_get(x_12, 4);
+x_41 = lean_ctor_get(x_12, 0);
+x_42 = lean_ctor_get(x_12, 1);
+x_43 = lean_ctor_get(x_12, 2);
+x_44 = lean_ctor_get(x_12, 3);
+x_45 = lean_ctor_get(x_12, 5);
+x_46 = lean_ctor_get(x_12, 6);
+x_47 = lean_ctor_get(x_12, 7);
+x_48 = lean_ctor_get(x_12, 8);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_inc(x_46);
+lean_inc(x_45);
+lean_inc(x_40);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_inc(x_42);
+lean_inc(x_41);
+lean_dec(x_12);
+x_49 = lean_ctor_get_uint64(x_40, sizeof(void*)*1);
+x_50 = lean_ctor_get(x_40, 0);
+lean_inc_ref(x_50);
+if (lean_is_exclusive(x_40)) {
+ lean_ctor_release(x_40, 0);
+ x_51 = x_40;
+} else {
+ lean_dec_ref(x_40);
+ x_51 = lean_box(0);
+}
+x_52 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0;
+x_53 = 0;
+x_54 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1));
+x_55 = lean_alloc_ctor(0, 2, 17);
+lean_ctor_set(x_55, 0, x_1);
+lean_ctor_set(x_55, 1, x_54);
+lean_ctor_set_float(x_55, sizeof(void*)*2, x_52);
+lean_ctor_set_float(x_55, sizeof(void*)*2 + 8, x_52);
+lean_ctor_set_uint8(x_55, sizeof(void*)*2 + 16, x_53);
+x_56 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2;
+x_57 = lean_alloc_ctor(9, 3, 0);
+lean_ctor_set(x_57, 0, x_55);
+lean_ctor_set(x_57, 1, x_11);
+lean_ctor_set(x_57, 2, x_56);
+lean_inc(x_8);
+x_58 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_58, 0, x_8);
+lean_ctor_set(x_58, 1, x_57);
+x_59 = l_Lean_PersistentArray_push___redArg(x_50, x_58);
+if (lean_is_scalar(x_51)) {
+ x_60 = lean_alloc_ctor(0, 1, 8);
+} else {
+ x_60 = x_51;
+}
+lean_ctor_set(x_60, 0, x_59);
+lean_ctor_set_uint64(x_60, sizeof(void*)*1, x_49);
+x_61 = lean_alloc_ctor(0, 9, 0);
+lean_ctor_set(x_61, 0, x_41);
+lean_ctor_set(x_61, 1, x_42);
+lean_ctor_set(x_61, 2, x_43);
+lean_ctor_set(x_61, 3, x_44);
+lean_ctor_set(x_61, 4, x_60);
+lean_ctor_set(x_61, 5, x_45);
+lean_ctor_set(x_61, 6, x_46);
+lean_ctor_set(x_61, 7, x_47);
+lean_ctor_set(x_61, 8, x_48);
+x_62 = lean_st_ref_set(x_6, x_61);
+x_63 = lean_box(0);
+lean_ctor_set(x_9, 0, x_63);
+return x_9;
+}
+}
+else
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint64_t x_76; lean_object* x_77; lean_object* x_78; double x_79; uint8_t x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_64 = lean_ctor_get(x_9, 0);
+lean_inc(x_64);
+lean_dec(x_9);
+x_65 = lean_st_ref_take(x_6);
+x_66 = lean_ctor_get(x_65, 4);
+lean_inc_ref(x_66);
+x_67 = lean_ctor_get(x_65, 0);
+lean_inc_ref(x_67);
+x_68 = lean_ctor_get(x_65, 1);
+lean_inc(x_68);
+x_69 = lean_ctor_get(x_65, 2);
+lean_inc_ref(x_69);
+x_70 = lean_ctor_get(x_65, 3);
+lean_inc_ref(x_70);
+x_71 = lean_ctor_get(x_65, 5);
+lean_inc_ref(x_71);
+x_72 = lean_ctor_get(x_65, 6);
+lean_inc_ref(x_72);
+x_73 = lean_ctor_get(x_65, 7);
+lean_inc_ref(x_73);
+x_74 = lean_ctor_get(x_65, 8);
+lean_inc_ref(x_74);
+if (lean_is_exclusive(x_65)) {
+ lean_ctor_release(x_65, 0);
+ lean_ctor_release(x_65, 1);
+ lean_ctor_release(x_65, 2);
+ lean_ctor_release(x_65, 3);
+ lean_ctor_release(x_65, 4);
+ lean_ctor_release(x_65, 5);
+ lean_ctor_release(x_65, 6);
+ lean_ctor_release(x_65, 7);
+ lean_ctor_release(x_65, 8);
+ x_75 = x_65;
+} else {
+ lean_dec_ref(x_65);
+ x_75 = lean_box(0);
+}
+x_76 = lean_ctor_get_uint64(x_66, sizeof(void*)*1);
+x_77 = lean_ctor_get(x_66, 0);
+lean_inc_ref(x_77);
+if (lean_is_exclusive(x_66)) {
+ lean_ctor_release(x_66, 0);
+ x_78 = x_66;
+} else {
+ lean_dec_ref(x_66);
+ x_78 = lean_box(0);
+}
+x_79 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0;
+x_80 = 0;
+x_81 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__1));
+x_82 = lean_alloc_ctor(0, 2, 17);
+lean_ctor_set(x_82, 0, x_1);
+lean_ctor_set(x_82, 1, x_81);
+lean_ctor_set_float(x_82, sizeof(void*)*2, x_79);
+lean_ctor_set_float(x_82, sizeof(void*)*2 + 8, x_79);
+lean_ctor_set_uint8(x_82, sizeof(void*)*2 + 16, x_80);
+x_83 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2;
+x_84 = lean_alloc_ctor(9, 3, 0);
+lean_ctor_set(x_84, 0, x_82);
+lean_ctor_set(x_84, 1, x_64);
+lean_ctor_set(x_84, 2, x_83);
+lean_inc(x_8);
+x_85 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_85, 0, x_8);
+lean_ctor_set(x_85, 1, x_84);
+x_86 = l_Lean_PersistentArray_push___redArg(x_77, x_85);
+if (lean_is_scalar(x_78)) {
+ x_87 = lean_alloc_ctor(0, 1, 8);
+} else {
+ x_87 = x_78;
+}
+lean_ctor_set(x_87, 0, x_86);
+lean_ctor_set_uint64(x_87, sizeof(void*)*1, x_76);
+if (lean_is_scalar(x_75)) {
+ x_88 = lean_alloc_ctor(0, 9, 0);
+} else {
+ x_88 = x_75;
+}
+lean_ctor_set(x_88, 0, x_67);
+lean_ctor_set(x_88, 1, x_68);
+lean_ctor_set(x_88, 2, x_69);
+lean_ctor_set(x_88, 3, x_70);
+lean_ctor_set(x_88, 4, x_87);
+lean_ctor_set(x_88, 5, x_71);
+lean_ctor_set(x_88, 6, x_72);
+lean_ctor_set(x_88, 7, x_73);
+lean_ctor_set(x_88, 8, x_74);
+x_89 = lean_st_ref_set(x_6, x_88);
+x_90 = lean_box(0);
+x_91 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_91, 0, x_90);
+return x_91;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_6);
+lean_dec_ref(x_5);
+lean_dec(x_4);
+lean_dec_ref(x_3);
+return x_8;
+}
+}
 static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1() {
 _start:
 {
@@ -32248,7 +32860,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__5));
 x_2 = lean_unsigned_to_nat(2u);
-x_3 = lean_unsigned_to_nat(788u);
+x_3 = lean_unsigned_to_nat(792u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__4));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -32302,14 +32914,14 @@ lean_inc_ref(x_23);
 x_50 = l_Lean_Meta_Grind_markTheoremInstance___redArg(x_23, x_26, x_4);
 if (lean_obj_tag(x_50) == 0)
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; uint8_t x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; uint8_t x_221; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; uint8_t x_319; 
+lean_object* x_51; uint8_t x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; uint8_t x_80; size_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; uint8_t x_150; size_t x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; size_t x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; uint8_t x_225; 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; uint8_t x_330; 
 x_51 = lean_ctor_get(x_50, 0);
 lean_inc(x_51);
 lean_dec_ref(x_50);
-x_319 = lean_unbox(x_51);
-if (x_319 == 0)
+x_330 = lean_unbox(x_51);
+if (x_330 == 0)
 {
-lean_object* x_320; 
+lean_object* x_331; 
 lean_dec(x_51);
 lean_dec_ref(x_21);
 lean_dec_ref(x_12);
@@ -32324,81 +32936,81 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_320 = lean_box(0);
-x_35 = x_320;
+x_331 = lean_box(0);
+x_35 = x_331;
 x_36 = lean_box(0);
 goto block_42;
 }
 else
 {
-lean_object* x_321; lean_object* x_322; lean_object* x_323; uint8_t x_324; 
-x_321 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__11));
-x_322 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg(x_321, x_12);
-x_323 = lean_ctor_get(x_322, 0);
-lean_inc(x_323);
-lean_dec_ref(x_322);
-x_324 = lean_unbox(x_323);
-lean_dec(x_323);
-if (x_324 == 0)
+lean_object* x_332; lean_object* x_333; lean_object* x_334; uint8_t x_335; 
+x_332 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__11));
+x_333 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg(x_332, x_12);
+x_334 = lean_ctor_get(x_333, 0);
+lean_inc(x_334);
+lean_dec_ref(x_333);
+x_335 = lean_unbox(x_334);
+lean_dec(x_334);
+if (x_335 == 0)
 {
 lean_inc(x_13);
-x_258 = x_2;
-x_259 = x_3;
-x_260 = x_4;
-x_261 = x_5;
-x_262 = x_6;
-x_263 = x_7;
-x_264 = x_8;
-x_265 = x_9;
-x_266 = x_10;
-x_267 = x_11;
-x_268 = x_12;
-x_269 = x_13;
-x_270 = lean_box(0);
-goto block_318;
+x_269 = x_2;
+x_270 = x_3;
+x_271 = x_4;
+x_272 = x_5;
+x_273 = x_6;
+x_274 = x_7;
+x_275 = x_8;
+x_276 = x_9;
+x_277 = x_10;
+x_278 = x_11;
+x_279 = x_12;
+x_280 = x_13;
+x_281 = lean_box(0);
+goto block_329;
 }
 else
 {
-lean_object* x_325; 
-x_325 = l_Lean_Meta_Grind_updateLastTag(x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_325) == 0)
+lean_object* x_336; 
+x_336 = l_Lean_Meta_Grind_updateLastTag(x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_336) == 0)
 {
-lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; 
-lean_dec_ref(x_325);
+lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; 
+lean_dec_ref(x_336);
 lean_inc_ref(x_25);
-x_326 = l_Lean_Meta_Grind_Origin_pp(x_25);
-x_327 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13;
-x_328 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_328, 0, x_326);
-lean_ctor_set(x_328, 1, x_327);
+x_337 = l_Lean_Meta_Grind_Origin_pp(x_25);
+x_338 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13;
+x_339 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_339, 0, x_337);
+lean_ctor_set(x_339, 1, x_338);
 lean_inc_ref(x_26);
-x_329 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignmentToMessageData(x_26);
-x_330 = lean_array_to_list(x_329);
-x_331 = lean_box(0);
-x_332 = l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(x_330, x_331);
-x_333 = l_Lean_MessageData_ofList(x_332);
-x_334 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_334, 0, x_328);
-lean_ctor_set(x_334, 1, x_333);
-x_335 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg(x_321, x_334, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_335) == 0)
+x_340 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignmentToMessageData(x_26);
+x_341 = lean_array_to_list(x_340);
+x_342 = lean_box(0);
+x_343 = l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(x_341, x_342);
+x_344 = l_Lean_MessageData_ofList(x_343);
+x_345 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_345, 0, x_339);
+lean_ctor_set(x_345, 1, x_344);
+x_346 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_332, x_345, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_346) == 0)
 {
-lean_dec_ref(x_335);
+lean_dec_ref(x_346);
 lean_inc(x_13);
-x_258 = x_2;
-x_259 = x_3;
-x_260 = x_4;
-x_261 = x_5;
-x_262 = x_6;
-x_263 = x_7;
-x_264 = x_8;
-x_265 = x_9;
-x_266 = x_10;
-x_267 = x_11;
-x_268 = x_12;
-x_269 = x_13;
-x_270 = lean_box(0);
-goto block_318;
+x_269 = x_2;
+x_270 = x_3;
+x_271 = x_4;
+x_272 = x_5;
+x_273 = x_6;
+x_274 = x_7;
+x_275 = x_8;
+x_276 = x_9;
+x_277 = x_10;
+x_278 = x_11;
+x_279 = x_12;
+x_280 = x_13;
+x_281 = lean_box(0);
+goto block_329;
 }
 else
 {
@@ -32416,7 +33028,7 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_46 = x_335;
+x_46 = x_346;
 goto block_49;
 }
 }
@@ -32436,7 +33048,7 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_46 = x_325;
+x_46 = x_336;
 goto block_49;
 }
 }
@@ -32444,7 +33056,7 @@ goto block_49;
 block_79:
 {
 lean_object* x_70; lean_object* x_71; uint8_t x_72; uint8_t x_73; uint8_t x_74; lean_object* x_75; 
-x_70 = l_Lean_instantiateMVars___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__0___redArg(x_54, x_66);
+x_70 = l_Lean_instantiateMVars___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__0___redArg(x_53, x_66);
 x_71 = lean_ctor_get(x_70, 0);
 lean_inc(x_71);
 lean_dec_ref(x_70);
@@ -32452,7 +33064,7 @@ x_72 = 0;
 x_73 = lean_unbox(x_51);
 x_74 = lean_unbox(x_51);
 lean_dec(x_51);
-x_75 = l_Lean_Meta_mkLambdaFVars(x_56, x_71, x_55, x_73, x_55, x_74, x_72, x_65, x_66, x_67, x_68);
+x_75 = l_Lean_Meta_mkLambdaFVars(x_56, x_71, x_52, x_73, x_52, x_74, x_72, x_65, x_66, x_67, x_68);
 lean_dec_ref(x_56);
 if (lean_obj_tag(x_75) == 0)
 {
@@ -32460,8 +33072,8 @@ lean_object* x_76; lean_object* x_77;
 x_76 = lean_ctor_get(x_75, 0);
 lean_inc(x_76);
 lean_dec_ref(x_75);
-x_77 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_21, x_76, x_52, x_53, x_57, x_58, x_59, x_60, x_61, x_62, x_63, x_64, x_65, x_66, x_67, x_68);
-lean_dec(x_52);
+x_77 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_21, x_76, x_55, x_54, x_57, x_58, x_59, x_60, x_61, x_62, x_63, x_64, x_65, x_66, x_67, x_68);
+lean_dec(x_55);
 x_46 = x_77;
 goto block_49;
 }
@@ -32480,8 +33092,8 @@ lean_dec(x_60);
 lean_dec(x_59);
 lean_dec(x_58);
 lean_dec_ref(x_57);
-lean_dec(x_53);
-lean_dec(x_52);
+lean_dec(x_55);
+lean_dec(x_54);
 lean_dec_ref(x_21);
 x_78 = lean_ctor_get(x_75, 0);
 lean_inc(x_78);
@@ -32491,1569 +33103,1496 @@ x_28 = lean_box(0);
 goto block_34;
 }
 }
-block_147:
+block_149:
 {
-lean_object* x_98; size_t x_99; size_t x_100; lean_object* x_101; 
-x_98 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
-x_99 = lean_array_size(x_96);
-x_100 = 0;
-lean_inc(x_86);
-lean_inc_ref(x_94);
+lean_object* x_100; lean_object* x_101; size_t x_102; lean_object* x_103; 
+x_100 = lean_box(0);
+x_101 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_95);
+x_102 = lean_array_size(x_98);
 lean_inc(x_89);
-lean_inc_ref(x_82);
-x_101 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_96, x_99, x_100, x_98, x_82, x_89, x_94, x_86);
-if (lean_obj_tag(x_101) == 0)
+lean_inc_ref(x_92);
+lean_inc(x_93);
+lean_inc_ref(x_87);
+x_103 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg(x_98, x_102, x_81, x_101, x_87, x_93, x_92, x_89);
+if (lean_obj_tag(x_103) == 0)
 {
-lean_object* x_102; uint8_t x_103; 
-x_102 = lean_ctor_get(x_101, 0);
-lean_inc(x_102);
-lean_dec_ref(x_101);
-x_103 = !lean_is_exclusive(x_102);
-if (x_103 == 0)
+lean_object* x_104; uint8_t x_105; 
+x_104 = lean_ctor_get(x_103, 0);
+lean_inc(x_104);
+lean_dec_ref(x_103);
+x_105 = !lean_is_exclusive(x_104);
+if (x_105 == 0)
 {
-lean_object* x_104; lean_object* x_105; 
-x_104 = lean_ctor_get(x_102, 0);
-x_105 = lean_ctor_get(x_102, 1);
-lean_dec(x_105);
-if (lean_obj_tag(x_104) == 0)
+lean_object* x_106; lean_object* x_107; 
+x_106 = lean_ctor_get(x_104, 0);
+x_107 = lean_ctor_get(x_104, 1);
+lean_dec(x_107);
+if (lean_obj_tag(x_106) == 0)
 {
-lean_free_object(x_102);
+lean_free_object(x_104);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_object* x_106; 
-x_106 = lean_ctor_get(x_104, 0);
-lean_inc(x_106);
-lean_dec_ref(x_104);
-if (lean_obj_tag(x_106) == 1)
-{
-lean_object* x_107; lean_object* x_108; 
-x_107 = lean_ctor_get(x_106, 0);
-lean_inc(x_107);
+lean_object* x_108; 
+x_108 = lean_ctor_get(x_106, 0);
+lean_inc(x_108);
 lean_dec_ref(x_106);
-x_108 = l_Lean_Meta_Grind_getConfig___redArg(x_95);
-if (lean_obj_tag(x_108) == 0)
+if (lean_obj_tag(x_108) == 1)
 {
-lean_object* x_109; uint8_t x_110; 
+lean_object* x_109; lean_object* x_110; 
 x_109 = lean_ctor_get(x_108, 0);
 lean_inc(x_109);
 lean_dec_ref(x_108);
-x_110 = lean_ctor_get_uint8(x_109, sizeof(void*)*11 + 14);
+x_110 = l_Lean_Meta_Grind_getConfig___redArg(x_91);
+if (lean_obj_tag(x_110) == 0)
+{
+lean_object* x_111; uint8_t x_112; 
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+lean_dec_ref(x_110);
+x_112 = lean_ctor_get_uint8(x_111, sizeof(void*)*11 + 14);
+lean_dec(x_111);
+if (x_112 == 0)
+{
 lean_dec(x_109);
-if (x_110 == 0)
-{
-lean_dec(x_107);
-lean_free_object(x_102);
+lean_free_object(x_104);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_object* x_111; lean_object* x_112; uint8_t x_113; 
-x_111 = lean_ctor_get(x_94, 2);
-x_112 = l_Lean_Meta_Grind_grind_debug;
-x_113 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_111, x_112);
-if (x_113 == 0)
+lean_object* x_113; lean_object* x_114; uint8_t x_115; 
+x_113 = lean_ctor_get(x_92, 2);
+x_114 = l_Lean_Meta_Grind_grind_debug;
+x_115 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_113, x_114);
+if (x_115 == 0)
 {
-lean_dec(x_107);
-lean_free_object(x_102);
+lean_dec(x_109);
+lean_free_object(x_104);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_object* x_114; 
-lean_inc(x_86);
-lean_inc_ref(x_94);
+lean_object* x_116; 
 lean_inc(x_89);
-lean_inc_ref(x_82);
-x_114 = lean_infer_type(x_107, x_82, x_89, x_94, x_86);
-if (lean_obj_tag(x_114) == 0)
+lean_inc_ref(x_92);
+lean_inc(x_93);
+lean_inc_ref(x_87);
+x_116 = lean_infer_type(x_109, x_87, x_93, x_92, x_89);
+if (lean_obj_tag(x_116) == 0)
 {
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-x_115 = lean_ctor_get(x_114, 0);
-lean_inc(x_115);
-lean_dec_ref(x_114);
-x_116 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
+lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+x_117 = lean_ctor_get(x_116, 0);
+lean_inc(x_117);
+lean_dec_ref(x_116);
+x_118 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
 lean_inc_ref(x_25);
-x_117 = l_Lean_Meta_Grind_Origin_pp(x_25);
-lean_ctor_set_tag(x_102, 7);
-lean_ctor_set(x_102, 1, x_117);
-lean_ctor_set(x_102, 0, x_116);
-x_118 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3;
-x_119 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_119, 0, x_102);
-lean_ctor_set(x_119, 1, x_118);
-x_120 = l_Lean_indentExpr(x_115);
+x_119 = l_Lean_Meta_Grind_Origin_pp(x_25);
+lean_ctor_set_tag(x_104, 7);
+lean_ctor_set(x_104, 1, x_119);
+lean_ctor_set(x_104, 0, x_118);
+x_120 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3;
 x_121 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_121, 0, x_119);
+lean_ctor_set(x_121, 0, x_104);
 lean_ctor_set(x_121, 1, x_120);
-x_122 = l_Lean_Meta_Grind_reportIssue(x_121, x_91, x_95, x_87, x_92, x_85, x_82, x_89, x_94, x_86);
-if (lean_obj_tag(x_122) == 0)
+x_122 = l_Lean_indentExpr(x_117);
+x_123 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_123, 0, x_121);
+lean_ctor_set(x_123, 1, x_122);
+x_124 = l_Lean_Meta_Grind_reportIssue(x_123, x_86, x_91, x_97, x_83, x_85, x_87, x_93, x_92, x_89);
+if (lean_obj_tag(x_124) == 0)
 {
-lean_dec_ref(x_122);
+lean_dec_ref(x_124);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
 lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
 lean_dec(x_89);
 lean_dec(x_88);
-lean_dec(x_87);
+lean_dec_ref(x_87);
 lean_dec(x_86);
 lean_dec(x_85);
+lean_dec(x_84);
 lean_dec_ref(x_83);
 lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_46 = x_122;
+x_46 = x_124;
 goto block_49;
 }
 }
 else
 {
-lean_object* x_123; 
-lean_free_object(x_102);
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
-lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-lean_dec(x_88);
-lean_dec(x_87);
-lean_dec(x_86);
-lean_dec(x_85);
-lean_dec_ref(x_83);
-lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_123 = lean_ctor_get(x_114, 0);
-lean_inc(x_123);
-lean_dec_ref(x_114);
-x_27 = x_123;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-}
-}
-else
-{
-lean_object* x_124; 
-lean_dec(x_107);
-lean_free_object(x_102);
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
-lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-lean_dec(x_88);
-lean_dec(x_87);
-lean_dec(x_86);
-lean_dec(x_85);
-lean_dec_ref(x_83);
-lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_124 = lean_ctor_get(x_108, 0);
-lean_inc(x_124);
-lean_dec_ref(x_108);
-x_27 = x_124;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-else
-{
-lean_dec(x_106);
-lean_free_object(x_102);
-x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
-x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
-x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
-x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
-x_69 = lean_box(0);
-goto block_79;
-}
-}
-}
-else
-{
 lean_object* x_125; 
-x_125 = lean_ctor_get(x_102, 0);
+lean_free_object(x_104);
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
+lean_dec_ref(x_92);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec(x_88);
+lean_dec_ref(x_87);
+lean_dec(x_86);
+lean_dec(x_85);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec_ref(x_82);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_125 = lean_ctor_get(x_116, 0);
 lean_inc(x_125);
-lean_dec(x_102);
-if (lean_obj_tag(x_125) == 0)
-{
-x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
-x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
-x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
-x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
-x_69 = lean_box(0);
-goto block_79;
+lean_dec_ref(x_116);
+x_27 = x_125;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+}
 }
 else
 {
 lean_object* x_126; 
-x_126 = lean_ctor_get(x_125, 0);
+lean_dec(x_109);
+lean_free_object(x_104);
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
+lean_dec_ref(x_92);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec(x_88);
+lean_dec_ref(x_87);
+lean_dec(x_86);
+lean_dec(x_85);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec_ref(x_82);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_126 = lean_ctor_get(x_110, 0);
 lean_inc(x_126);
-lean_dec_ref(x_125);
-if (lean_obj_tag(x_126) == 1)
+lean_dec_ref(x_110);
+x_27 = x_126;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+else
 {
-lean_object* x_127; lean_object* x_128; 
-x_127 = lean_ctor_get(x_126, 0);
+lean_dec(x_108);
+lean_free_object(x_104);
+x_52 = x_80;
+x_53 = x_82;
+x_54 = x_94;
+x_55 = x_84;
+x_56 = x_98;
+x_57 = x_90;
+x_58 = x_88;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
+x_64 = x_85;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
+x_69 = lean_box(0);
+goto block_79;
+}
+}
+}
+else
+{
+lean_object* x_127; 
+x_127 = lean_ctor_get(x_104, 0);
 lean_inc(x_127);
-lean_dec_ref(x_126);
-x_128 = l_Lean_Meta_Grind_getConfig___redArg(x_95);
-if (lean_obj_tag(x_128) == 0)
+lean_dec(x_104);
+if (lean_obj_tag(x_127) == 0)
 {
-lean_object* x_129; uint8_t x_130; 
+x_52 = x_80;
+x_53 = x_82;
+x_54 = x_94;
+x_55 = x_84;
+x_56 = x_98;
+x_57 = x_90;
+x_58 = x_88;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
+x_64 = x_85;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
+x_69 = lean_box(0);
+goto block_79;
+}
+else
+{
+lean_object* x_128; 
+x_128 = lean_ctor_get(x_127, 0);
+lean_inc(x_128);
+lean_dec_ref(x_127);
+if (lean_obj_tag(x_128) == 1)
+{
+lean_object* x_129; lean_object* x_130; 
 x_129 = lean_ctor_get(x_128, 0);
 lean_inc(x_129);
 lean_dec_ref(x_128);
-x_130 = lean_ctor_get_uint8(x_129, sizeof(void*)*11 + 14);
+x_130 = l_Lean_Meta_Grind_getConfig___redArg(x_91);
+if (lean_obj_tag(x_130) == 0)
+{
+lean_object* x_131; uint8_t x_132; 
+x_131 = lean_ctor_get(x_130, 0);
+lean_inc(x_131);
+lean_dec_ref(x_130);
+x_132 = lean_ctor_get_uint8(x_131, sizeof(void*)*11 + 14);
+lean_dec(x_131);
+if (x_132 == 0)
+{
 lean_dec(x_129);
-if (x_130 == 0)
-{
-lean_dec(x_127);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_object* x_131; lean_object* x_132; uint8_t x_133; 
-x_131 = lean_ctor_get(x_94, 2);
-x_132 = l_Lean_Meta_Grind_grind_debug;
-x_133 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_131, x_132);
-if (x_133 == 0)
+lean_object* x_133; lean_object* x_134; uint8_t x_135; 
+x_133 = lean_ctor_get(x_92, 2);
+x_134 = l_Lean_Meta_Grind_grind_debug;
+x_135 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_133, x_134);
+if (x_135 == 0)
 {
-lean_dec(x_127);
+lean_dec(x_129);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_object* x_134; 
-lean_inc(x_86);
-lean_inc_ref(x_94);
+lean_object* x_136; 
 lean_inc(x_89);
-lean_inc_ref(x_82);
-x_134 = lean_infer_type(x_127, x_82, x_89, x_94, x_86);
-if (lean_obj_tag(x_134) == 0)
+lean_inc_ref(x_92);
+lean_inc(x_93);
+lean_inc_ref(x_87);
+x_136 = lean_infer_type(x_129, x_87, x_93, x_92, x_89);
+if (lean_obj_tag(x_136) == 0)
 {
-lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_135 = lean_ctor_get(x_134, 0);
-lean_inc(x_135);
-lean_dec_ref(x_134);
-x_136 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
+lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+x_137 = lean_ctor_get(x_136, 0);
+lean_inc(x_137);
+lean_dec_ref(x_136);
+x_138 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
 lean_inc_ref(x_25);
-x_137 = l_Lean_Meta_Grind_Origin_pp(x_25);
-x_138 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_138, 0, x_136);
-lean_ctor_set(x_138, 1, x_137);
-x_139 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3;
+x_139 = l_Lean_Meta_Grind_Origin_pp(x_25);
 x_140 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_140, 0, x_138);
 lean_ctor_set(x_140, 1, x_139);
-x_141 = l_Lean_indentExpr(x_135);
+x_141 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3;
 x_142 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_142, 0, x_140);
 lean_ctor_set(x_142, 1, x_141);
-x_143 = l_Lean_Meta_Grind_reportIssue(x_142, x_91, x_95, x_87, x_92, x_85, x_82, x_89, x_94, x_86);
-if (lean_obj_tag(x_143) == 0)
+x_143 = l_Lean_indentExpr(x_137);
+x_144 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_144, 0, x_142);
+lean_ctor_set(x_144, 1, x_143);
+x_145 = l_Lean_Meta_Grind_reportIssue(x_144, x_86, x_91, x_97, x_83, x_85, x_87, x_93, x_92, x_89);
+if (lean_obj_tag(x_145) == 0)
 {
-lean_dec_ref(x_143);
+lean_dec_ref(x_145);
 x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
+x_53 = x_82;
+x_54 = x_94;
 x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
+x_56 = x_98;
+x_57 = x_90;
 x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
 x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
 x_69 = lean_box(0);
 goto block_79;
 }
 else
 {
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
 lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
 lean_dec(x_89);
 lean_dec(x_88);
-lean_dec(x_87);
+lean_dec_ref(x_87);
 lean_dec(x_86);
 lean_dec(x_85);
+lean_dec(x_84);
 lean_dec_ref(x_83);
 lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_46 = x_143;
+x_46 = x_145;
 goto block_49;
 }
 }
 else
 {
-lean_object* x_144; 
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
-lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-lean_dec(x_88);
-lean_dec(x_87);
-lean_dec(x_86);
-lean_dec(x_85);
-lean_dec_ref(x_83);
-lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_144 = lean_ctor_get(x_134, 0);
-lean_inc(x_144);
-lean_dec_ref(x_134);
-x_27 = x_144;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-}
-}
-else
-{
-lean_object* x_145; 
-lean_dec(x_127);
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
-lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-lean_dec(x_88);
-lean_dec(x_87);
-lean_dec(x_86);
-lean_dec(x_85);
-lean_dec_ref(x_83);
-lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_145 = lean_ctor_get(x_128, 0);
-lean_inc(x_145);
-lean_dec_ref(x_128);
-x_27 = x_145;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-else
-{
-lean_dec(x_126);
-x_52 = x_80;
-x_53 = x_90;
-x_54 = x_93;
-x_55 = x_84;
-x_56 = x_96;
-x_57 = x_83;
-x_58 = x_88;
-x_59 = x_81;
-x_60 = x_91;
-x_61 = x_95;
-x_62 = x_87;
-x_63 = x_92;
-x_64 = x_85;
-x_65 = x_82;
-x_66 = x_89;
-x_67 = x_94;
-x_68 = x_86;
-x_69 = lean_box(0);
-goto block_79;
-}
-}
-}
-}
-else
-{
 lean_object* x_146; 
-lean_dec_ref(x_96);
-lean_dec_ref(x_95);
-lean_dec_ref(x_94);
-lean_dec_ref(x_93);
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
 lean_dec_ref(x_92);
-lean_dec(x_91);
-lean_dec(x_90);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
 lean_dec(x_89);
 lean_dec(x_88);
-lean_dec(x_87);
+lean_dec_ref(x_87);
 lean_dec(x_86);
 lean_dec(x_85);
+lean_dec(x_84);
 lean_dec_ref(x_83);
 lean_dec_ref(x_82);
-lean_dec(x_81);
-lean_dec(x_80);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_146 = lean_ctor_get(x_101, 0);
+x_146 = lean_ctor_get(x_136, 0);
 lean_inc(x_146);
-lean_dec_ref(x_101);
+lean_dec_ref(x_136);
 x_27 = x_146;
 x_28 = lean_box(0);
 goto block_34;
 }
 }
-block_167:
-{
-if (lean_obj_tag(x_164) == 0)
-{
-lean_object* x_165; 
-x_165 = lean_ctor_get(x_164, 0);
-lean_inc(x_165);
-lean_dec_ref(x_164);
-x_80 = x_148;
-x_81 = x_149;
-x_82 = x_150;
-x_83 = x_151;
-x_84 = x_152;
-x_85 = x_153;
-x_86 = x_154;
-x_87 = x_155;
-x_88 = x_156;
-x_89 = x_157;
-x_90 = x_158;
-x_91 = x_159;
-x_92 = x_160;
-x_93 = x_161;
-x_94 = x_163;
-x_95 = x_162;
-x_96 = x_165;
-x_97 = lean_box(0);
-goto block_147;
+}
 }
 else
 {
-lean_object* x_166; 
-lean_dec_ref(x_163);
-lean_dec_ref(x_162);
-lean_dec_ref(x_161);
-lean_dec_ref(x_160);
-lean_dec(x_159);
-lean_dec(x_158);
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_153);
-lean_dec_ref(x_151);
-lean_dec_ref(x_150);
-lean_dec(x_149);
-lean_dec(x_148);
+lean_object* x_147; 
+lean_dec(x_129);
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
+lean_dec_ref(x_92);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec(x_88);
+lean_dec_ref(x_87);
+lean_dec(x_86);
+lean_dec(x_85);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec_ref(x_82);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_166 = lean_ctor_get(x_164, 0);
-lean_inc(x_166);
-lean_dec_ref(x_164);
-x_27 = x_166;
+x_147 = lean_ctor_get(x_130, 0);
+lean_inc(x_147);
+lean_dec_ref(x_130);
+x_27 = x_147;
 x_28 = lean_box(0);
 goto block_34;
 }
 }
-block_204:
-{
-if (lean_obj_tag(x_186) == 0)
-{
-lean_object* x_187; uint8_t x_188; 
-x_187 = lean_ctor_get(x_186, 0);
-lean_inc(x_187);
-lean_dec_ref(x_186);
-x_188 = lean_unbox(x_187);
-if (x_188 == 0)
-{
-lean_object* x_189; uint8_t x_190; 
-x_189 = lean_mk_empty_array_with_capacity(x_171);
-x_190 = lean_nat_dec_lt(x_171, x_170);
-if (x_190 == 0)
-{
-uint8_t x_191; 
-lean_dec(x_170);
-lean_dec_ref(x_168);
-x_191 = lean_unbox(x_187);
-lean_dec(x_187);
-x_80 = x_169;
-x_81 = x_172;
-x_82 = x_173;
-x_83 = x_174;
-x_84 = x_191;
-x_85 = x_175;
-x_86 = x_176;
-x_87 = x_177;
-x_88 = x_178;
-x_89 = x_179;
-x_90 = x_180;
-x_91 = x_181;
-x_92 = x_182;
-x_93 = x_183;
-x_94 = x_185;
-x_95 = x_184;
-x_96 = x_189;
-x_97 = lean_box(0);
-goto block_147;
-}
 else
 {
-uint8_t x_192; 
-x_192 = lean_nat_dec_le(x_170, x_170);
-if (x_192 == 0)
-{
-if (x_190 == 0)
-{
-uint8_t x_193; 
-lean_dec(x_170);
-lean_dec_ref(x_168);
-x_193 = lean_unbox(x_187);
-lean_dec(x_187);
-x_80 = x_169;
-x_81 = x_172;
-x_82 = x_173;
-x_83 = x_174;
-x_84 = x_193;
-x_85 = x_175;
-x_86 = x_176;
-x_87 = x_177;
-x_88 = x_178;
-x_89 = x_179;
-x_90 = x_180;
-x_91 = x_181;
-x_92 = x_182;
-x_93 = x_183;
-x_94 = x_185;
-x_95 = x_184;
-x_96 = x_189;
-x_97 = lean_box(0);
-goto block_147;
+lean_dec(x_128);
+x_52 = x_80;
+x_53 = x_82;
+x_54 = x_94;
+x_55 = x_84;
+x_56 = x_98;
+x_57 = x_90;
+x_58 = x_88;
+x_59 = x_96;
+x_60 = x_86;
+x_61 = x_91;
+x_62 = x_97;
+x_63 = x_83;
+x_64 = x_85;
+x_65 = x_87;
+x_66 = x_93;
+x_67 = x_92;
+x_68 = x_89;
+x_69 = lean_box(0);
+goto block_79;
 }
-else
-{
-size_t x_194; size_t x_195; lean_object* x_196; uint8_t x_197; 
-x_194 = 0;
-x_195 = lean_usize_of_nat(x_170);
-lean_dec(x_170);
-x_196 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(x_168, x_194, x_195, x_189, x_174, x_178, x_172, x_181, x_184, x_177, x_182, x_175, x_173, x_179, x_185, x_176);
-lean_dec_ref(x_168);
-x_197 = lean_unbox(x_187);
-lean_dec(x_187);
-x_148 = x_169;
-x_149 = x_172;
-x_150 = x_173;
-x_151 = x_174;
-x_152 = x_197;
-x_153 = x_175;
-x_154 = x_176;
-x_155 = x_177;
-x_156 = x_178;
-x_157 = x_179;
-x_158 = x_180;
-x_159 = x_181;
-x_160 = x_182;
-x_161 = x_183;
-x_162 = x_184;
-x_163 = x_185;
-x_164 = x_196;
-goto block_167;
-}
-}
-else
-{
-size_t x_198; size_t x_199; lean_object* x_200; uint8_t x_201; 
-x_198 = 0;
-x_199 = lean_usize_of_nat(x_170);
-lean_dec(x_170);
-x_200 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(x_168, x_198, x_199, x_189, x_174, x_178, x_172, x_181, x_184, x_177, x_182, x_175, x_173, x_179, x_185, x_176);
-lean_dec_ref(x_168);
-x_201 = lean_unbox(x_187);
-lean_dec(x_187);
-x_148 = x_169;
-x_149 = x_172;
-x_150 = x_173;
-x_151 = x_174;
-x_152 = x_201;
-x_153 = x_175;
-x_154 = x_176;
-x_155 = x_177;
-x_156 = x_178;
-x_157 = x_179;
-x_158 = x_180;
-x_159 = x_181;
-x_160 = x_182;
-x_161 = x_183;
-x_162 = x_184;
-x_163 = x_185;
-x_164 = x_200;
-goto block_167;
 }
 }
 }
 else
 {
-lean_object* x_202; 
-lean_dec(x_187);
-lean_dec(x_170);
-lean_dec_ref(x_168);
+lean_object* x_148; 
+lean_dec_ref(x_98);
+lean_dec(x_97);
+lean_dec(x_96);
+lean_dec(x_94);
+lean_dec(x_93);
+lean_dec_ref(x_92);
+lean_dec_ref(x_91);
+lean_dec_ref(x_90);
+lean_dec(x_89);
+lean_dec(x_88);
+lean_dec_ref(x_87);
+lean_dec(x_86);
+lean_dec(x_85);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec_ref(x_82);
 lean_dec(x_51);
-x_202 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_21, x_183, x_169, x_180, x_174, x_178, x_172, x_181, x_184, x_177, x_182, x_175, x_173, x_179, x_185, x_176);
-lean_dec(x_169);
-x_46 = x_202;
+lean_dec_ref(x_21);
+x_148 = lean_ctor_get(x_103, 0);
+lean_inc(x_148);
+lean_dec_ref(x_103);
+x_27 = x_148;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+block_171:
+{
+if (lean_obj_tag(x_168) == 0)
+{
+lean_object* x_169; 
+x_169 = lean_ctor_get(x_168, 0);
+lean_inc(x_169);
+lean_dec_ref(x_168);
+x_80 = x_150;
+x_81 = x_151;
+x_82 = x_152;
+x_83 = x_153;
+x_84 = x_154;
+x_85 = x_155;
+x_86 = x_156;
+x_87 = x_157;
+x_88 = x_158;
+x_89 = x_159;
+x_90 = x_160;
+x_91 = x_161;
+x_92 = x_164;
+x_93 = x_163;
+x_94 = x_162;
+x_95 = x_166;
+x_96 = x_165;
+x_97 = x_167;
+x_98 = x_169;
+x_99 = lean_box(0);
+goto block_149;
+}
+else
+{
+lean_object* x_170; 
+lean_dec(x_167);
+lean_dec(x_165);
+lean_dec_ref(x_164);
+lean_dec(x_163);
+lean_dec(x_162);
+lean_dec_ref(x_161);
+lean_dec_ref(x_160);
+lean_dec(x_159);
+lean_dec(x_158);
+lean_dec_ref(x_157);
+lean_dec(x_156);
+lean_dec(x_155);
+lean_dec(x_154);
+lean_dec_ref(x_153);
+lean_dec_ref(x_152);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_170 = lean_ctor_get(x_168, 0);
+lean_inc(x_170);
+lean_dec_ref(x_168);
+x_27 = x_170;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+block_208:
+{
+if (lean_obj_tag(x_192) == 0)
+{
+lean_object* x_193; uint8_t x_194; 
+x_193 = lean_ctor_get(x_192, 0);
+lean_inc(x_193);
+lean_dec_ref(x_192);
+x_194 = lean_unbox(x_193);
+if (x_194 == 0)
+{
+lean_object* x_195; uint8_t x_196; 
+x_195 = lean_mk_empty_array_with_capacity(x_175);
+x_196 = lean_nat_dec_lt(x_175, x_177);
+if (x_196 == 0)
+{
+uint8_t x_197; 
+lean_dec(x_177);
+lean_dec_ref(x_176);
+x_197 = lean_unbox(x_193);
+lean_dec(x_193);
+x_80 = x_197;
+x_81 = x_172;
+x_82 = x_173;
+x_83 = x_174;
+x_84 = x_178;
+x_85 = x_179;
+x_86 = x_180;
+x_87 = x_181;
+x_88 = x_182;
+x_89 = x_183;
+x_90 = x_184;
+x_91 = x_185;
+x_92 = x_187;
+x_93 = x_188;
+x_94 = x_186;
+x_95 = x_190;
+x_96 = x_189;
+x_97 = x_191;
+x_98 = x_195;
+x_99 = lean_box(0);
+goto block_149;
+}
+else
+{
+uint8_t x_198; 
+x_198 = lean_nat_dec_le(x_177, x_177);
+if (x_198 == 0)
+{
+if (x_196 == 0)
+{
+uint8_t x_199; 
+lean_dec(x_177);
+lean_dec_ref(x_176);
+x_199 = lean_unbox(x_193);
+lean_dec(x_193);
+x_80 = x_199;
+x_81 = x_172;
+x_82 = x_173;
+x_83 = x_174;
+x_84 = x_178;
+x_85 = x_179;
+x_86 = x_180;
+x_87 = x_181;
+x_88 = x_182;
+x_89 = x_183;
+x_90 = x_184;
+x_91 = x_185;
+x_92 = x_187;
+x_93 = x_188;
+x_94 = x_186;
+x_95 = x_190;
+x_96 = x_189;
+x_97 = x_191;
+x_98 = x_195;
+x_99 = lean_box(0);
+goto block_149;
+}
+else
+{
+size_t x_200; lean_object* x_201; uint8_t x_202; 
+x_200 = lean_usize_of_nat(x_177);
+lean_dec(x_177);
+x_201 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_176, x_172, x_200, x_195, x_184, x_182, x_189, x_180, x_185, x_191, x_174, x_179, x_181, x_188, x_187, x_183);
+lean_dec_ref(x_176);
+x_202 = lean_unbox(x_193);
+lean_dec(x_193);
+x_150 = x_202;
+x_151 = x_172;
+x_152 = x_173;
+x_153 = x_174;
+x_154 = x_178;
+x_155 = x_179;
+x_156 = x_180;
+x_157 = x_181;
+x_158 = x_182;
+x_159 = x_183;
+x_160 = x_184;
+x_161 = x_185;
+x_162 = x_186;
+x_163 = x_188;
+x_164 = x_187;
+x_165 = x_189;
+x_166 = x_190;
+x_167 = x_191;
+x_168 = x_201;
+goto block_171;
+}
+}
+else
+{
+size_t x_203; lean_object* x_204; uint8_t x_205; 
+x_203 = lean_usize_of_nat(x_177);
+lean_dec(x_177);
+x_204 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_176, x_172, x_203, x_195, x_184, x_182, x_189, x_180, x_185, x_191, x_174, x_179, x_181, x_188, x_187, x_183);
+lean_dec_ref(x_176);
+x_205 = lean_unbox(x_193);
+lean_dec(x_193);
+x_150 = x_205;
+x_151 = x_172;
+x_152 = x_173;
+x_153 = x_174;
+x_154 = x_178;
+x_155 = x_179;
+x_156 = x_180;
+x_157 = x_181;
+x_158 = x_182;
+x_159 = x_183;
+x_160 = x_184;
+x_161 = x_185;
+x_162 = x_186;
+x_163 = x_188;
+x_164 = x_187;
+x_165 = x_189;
+x_166 = x_190;
+x_167 = x_191;
+x_168 = x_204;
+goto block_171;
+}
+}
+}
+else
+{
+lean_object* x_206; 
+lean_dec(x_193);
+lean_dec(x_177);
+lean_dec_ref(x_176);
+lean_dec(x_51);
+x_206 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_21, x_173, x_178, x_186, x_184, x_182, x_189, x_180, x_185, x_191, x_174, x_179, x_181, x_188, x_187, x_183);
+lean_dec(x_178);
+x_46 = x_206;
 goto block_49;
 }
 }
 else
 {
-lean_object* x_203; 
+lean_object* x_207; 
+lean_dec(x_191);
+lean_dec(x_189);
+lean_dec(x_188);
+lean_dec_ref(x_187);
+lean_dec(x_186);
 lean_dec_ref(x_185);
 lean_dec_ref(x_184);
-lean_dec_ref(x_183);
-lean_dec_ref(x_182);
-lean_dec(x_181);
+lean_dec(x_183);
+lean_dec(x_182);
+lean_dec_ref(x_181);
 lean_dec(x_180);
 lean_dec(x_179);
 lean_dec(x_178);
 lean_dec(x_177);
-lean_dec(x_176);
-lean_dec(x_175);
+lean_dec_ref(x_176);
 lean_dec_ref(x_174);
 lean_dec_ref(x_173);
-lean_dec(x_172);
-lean_dec(x_170);
-lean_dec(x_169);
-lean_dec_ref(x_168);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_203 = lean_ctor_get(x_186, 0);
-lean_inc(x_203);
-lean_dec_ref(x_186);
-x_27 = x_203;
+x_207 = lean_ctor_get(x_192, 0);
+lean_inc(x_207);
+lean_dec_ref(x_192);
+x_27 = x_207;
 x_28 = lean_box(0);
 goto block_34;
 }
 }
-block_257:
+block_268:
 {
-lean_object* x_222; 
-lean_inc(x_212);
-lean_inc_ref(x_220);
+lean_object* x_226; 
 lean_inc(x_216);
-lean_inc_ref(x_209);
-lean_inc(x_211);
-lean_inc_ref(x_218);
+lean_inc_ref(x_222);
+lean_inc(x_221);
+lean_inc_ref(x_214);
 lean_inc(x_213);
+lean_inc_ref(x_210);
+lean_inc(x_224);
 lean_inc_ref(x_219);
-lean_inc(x_217);
-lean_inc(x_207);
-lean_inc(x_215);
-lean_inc_ref(x_210);
-x_222 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_applyAssignment(x_205, x_1, x_210, x_215, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-if (lean_obj_tag(x_222) == 0)
-{
-lean_object* x_223; lean_object* x_224; 
-x_223 = lean_ctor_get(x_222, 0);
-lean_inc(x_223);
-lean_dec_ref(x_222);
-x_224 = lean_ctor_get(x_223, 0);
-if (lean_obj_tag(x_224) == 1)
-{
-lean_object* x_225; lean_object* x_226; 
-x_225 = lean_ctor_get(x_223, 1);
-lean_inc(x_225);
-lean_dec(x_223);
 lean_inc(x_212);
-lean_inc_ref(x_220);
-lean_inc(x_216);
-lean_inc_ref(x_209);
-lean_inc_ref(x_210);
-x_226 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts(x_205, x_206, x_210, x_215, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
+lean_inc(x_223);
+lean_inc(x_215);
+lean_inc_ref(x_217);
+x_226 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_applyAssignment(x_211, x_1, x_217, x_215, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
 if (lean_obj_tag(x_226) == 0)
 {
-lean_object* x_227; 
+lean_object* x_227; lean_object* x_228; 
 x_227 = lean_ctor_get(x_226, 0);
 lean_inc(x_227);
 lean_dec_ref(x_226);
-if (lean_obj_tag(x_227) == 1)
+x_228 = lean_ctor_get(x_227, 0);
+if (lean_obj_tag(x_228) == 1)
 {
-lean_object* x_228; lean_object* x_229; 
-lean_dec_ref(x_227);
-x_228 = lean_ctor_get(x_225, 1);
-lean_inc(x_228);
-lean_dec(x_225);
-lean_inc(x_212);
-lean_inc_ref(x_220);
+lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; size_t x_234; size_t x_235; lean_object* x_236; 
+x_229 = lean_ctor_get(x_227, 1);
+lean_inc(x_229);
+lean_dec(x_227);
+x_230 = lean_ctor_get(x_229, 1);
+lean_inc(x_230);
+x_231 = lean_ctor_get(x_229, 3);
+lean_inc_ref(x_231);
+lean_dec(x_229);
+x_232 = lean_box(0);
+x_233 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
+x_234 = lean_array_size(x_231);
+x_235 = 0;
 lean_inc(x_216);
-lean_inc_ref(x_209);
-lean_inc(x_211);
-lean_inc_ref(x_218);
-lean_inc(x_213);
-lean_inc_ref(x_219);
-lean_inc(x_217);
-lean_inc(x_207);
+lean_inc_ref(x_222);
+lean_inc(x_221);
 lean_inc_ref(x_214);
 lean_inc_ref(x_21);
-x_229 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_checkConstraints(x_21, x_228, x_214, x_205, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-if (lean_obj_tag(x_229) == 0)
+x_236 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_211, x_21, x_231, x_234, x_235, x_233, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+lean_dec_ref(x_231);
+if (lean_obj_tag(x_236) == 0)
 {
-lean_object* x_230; uint8_t x_231; 
-x_230 = lean_ctor_get(x_229, 0);
-lean_inc(x_230);
-lean_dec_ref(x_229);
-x_231 = lean_unbox(x_230);
-if (x_231 == 0)
+lean_object* x_237; lean_object* x_238; 
+x_237 = lean_ctor_get(x_236, 0);
+lean_inc(x_237);
+lean_dec_ref(x_236);
+x_238 = lean_ctor_get(x_237, 0);
+lean_inc(x_238);
+lean_dec(x_237);
+if (lean_obj_tag(x_238) == 0)
 {
-lean_object* x_232; 
+lean_object* x_239; 
+lean_inc(x_216);
+lean_inc_ref(x_222);
+lean_inc(x_221);
+lean_inc_ref(x_214);
+lean_inc_ref(x_217);
+x_239 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts(x_211, x_209, x_217, x_215, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+if (lean_obj_tag(x_239) == 0)
+{
+lean_object* x_240; 
+x_240 = lean_ctor_get(x_239, 0);
+lean_inc(x_240);
+lean_dec_ref(x_239);
+if (lean_obj_tag(x_240) == 1)
+{
+lean_object* x_241; 
+lean_dec_ref(x_240);
+lean_inc(x_216);
+lean_inc_ref(x_222);
+lean_inc(x_221);
+lean_inc_ref(x_214);
+lean_inc(x_213);
+lean_inc_ref(x_210);
+lean_inc(x_224);
+lean_inc_ref(x_219);
+lean_inc(x_212);
+lean_inc(x_223);
+lean_inc_ref(x_218);
+lean_inc_ref(x_21);
+x_241 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_checkConstraints(x_21, x_230, x_218, x_211, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+if (lean_obj_tag(x_241) == 0)
+{
+lean_object* x_242; uint8_t x_243; 
+x_242 = lean_ctor_get(x_241, 0);
+lean_inc(x_242);
+lean_dec_ref(x_241);
+x_243 = lean_unbox(x_242);
+if (x_243 == 0)
+{
+lean_dec(x_242);
 lean_dec(x_230);
-lean_dec(x_228);
-lean_dec_ref(x_220);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
 lean_dec_ref(x_219);
 lean_dec_ref(x_218);
-lean_dec(x_217);
+lean_dec_ref(x_217);
 lean_dec(x_216);
 lean_dec(x_215);
 lean_dec_ref(x_214);
 lean_dec(x_213);
 lean_dec(x_212);
-lean_dec(x_211);
+lean_dec_ref(x_211);
 lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_205);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_232 = lean_box(0);
 x_35 = x_232;
 x_36 = lean_box(0);
 goto block_42;
 }
 else
 {
-lean_object* x_233; 
-lean_inc_ref(x_220);
-lean_inc_ref(x_214);
+lean_object* x_244; 
+lean_inc_ref(x_222);
+lean_inc_ref(x_218);
 lean_inc_ref(x_21);
-x_233 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards(x_21, x_214, x_205, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-if (lean_obj_tag(x_233) == 0)
+x_244 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards(x_21, x_218, x_211, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+if (lean_obj_tag(x_244) == 0)
 {
-lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; uint8_t x_238; 
-x_234 = lean_ctor_get(x_233, 0);
-lean_inc(x_234);
-lean_dec_ref(x_233);
-x_235 = l_Lean_mkAppN(x_214, x_205);
-x_236 = lean_unsigned_to_nat(0u);
-x_237 = lean_array_get_size(x_205);
-x_238 = lean_nat_dec_lt(x_236, x_237);
-if (x_238 == 0)
+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_244, 0);
+lean_inc(x_245);
+lean_dec_ref(x_244);
+x_246 = l_Lean_mkAppN(x_218, x_211);
+x_247 = lean_unsigned_to_nat(0u);
+x_248 = lean_array_get_size(x_211);
+x_249 = lean_nat_dec_lt(x_247, x_248);
+if (x_249 == 0)
 {
-uint8_t x_239; lean_object* x_240; 
-x_239 = lean_unbox(x_230);
-lean_dec(x_230);
-x_240 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_239, x_221, x_221, x_210, x_215, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-x_168 = x_205;
-x_169 = x_228;
-x_170 = x_237;
-x_171 = x_236;
-x_172 = x_207;
-x_173 = x_209;
+uint8_t x_250; lean_object* x_251; 
+x_250 = lean_unbox(x_242);
+lean_dec(x_242);
+x_251 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_250, x_225, x_225, x_217, x_215, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+x_172 = x_235;
+x_173 = x_246;
 x_174 = x_210;
-x_175 = x_211;
-x_176 = x_212;
-x_177 = x_213;
-x_178 = x_215;
-x_179 = x_216;
-x_180 = x_234;
-x_181 = x_217;
-x_182 = x_218;
-x_183 = x_235;
-x_184 = x_219;
-x_185 = x_220;
-x_186 = x_240;
-goto block_204;
+x_175 = x_247;
+x_176 = x_211;
+x_177 = x_248;
+x_178 = x_230;
+x_179 = x_213;
+x_180 = x_212;
+x_181 = x_214;
+x_182 = x_215;
+x_183 = x_216;
+x_184 = x_217;
+x_185 = x_219;
+x_186 = x_245;
+x_187 = x_222;
+x_188 = x_221;
+x_189 = x_223;
+x_190 = x_232;
+x_191 = x_224;
+x_192 = x_251;
+goto block_208;
 }
 else
 {
-if (x_238 == 0)
+if (x_249 == 0)
 {
-uint8_t x_241; lean_object* x_242; 
-x_241 = lean_unbox(x_230);
-lean_dec(x_230);
-x_242 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_241, x_221, x_221, x_210, x_215, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-x_168 = x_205;
-x_169 = x_228;
-x_170 = x_237;
-x_171 = x_236;
-x_172 = x_207;
-x_173 = x_209;
+uint8_t x_252; lean_object* x_253; 
+x_252 = lean_unbox(x_242);
+lean_dec(x_242);
+x_253 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_252, x_225, x_225, x_217, x_215, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+x_172 = x_235;
+x_173 = x_246;
 x_174 = x_210;
-x_175 = x_211;
-x_176 = x_212;
-x_177 = x_213;
-x_178 = x_215;
-x_179 = x_216;
-x_180 = x_234;
-x_181 = x_217;
-x_182 = x_218;
-x_183 = x_235;
-x_184 = x_219;
-x_185 = x_220;
-x_186 = x_242;
-goto block_204;
+x_175 = x_247;
+x_176 = x_211;
+x_177 = x_248;
+x_178 = x_230;
+x_179 = x_213;
+x_180 = x_212;
+x_181 = x_214;
+x_182 = x_215;
+x_183 = x_216;
+x_184 = x_217;
+x_185 = x_219;
+x_186 = x_245;
+x_187 = x_222;
+x_188 = x_221;
+x_189 = x_223;
+x_190 = x_232;
+x_191 = x_224;
+x_192 = x_253;
+goto block_208;
 }
 else
 {
-size_t x_243; size_t x_244; uint8_t x_245; lean_object* x_246; 
-x_243 = 0;
-x_244 = lean_usize_of_nat(x_237);
-x_245 = lean_unbox(x_230);
-x_246 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_245, x_221, x_205, x_243, x_244, x_210, x_215, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-if (lean_obj_tag(x_246) == 0)
+size_t x_254; uint8_t x_255; lean_object* x_256; 
+x_254 = lean_usize_of_nat(x_248);
+x_255 = lean_unbox(x_242);
+x_256 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(x_255, x_225, x_211, x_235, x_254, x_217, x_215, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+if (lean_obj_tag(x_256) == 0)
 {
-lean_object* x_247; uint8_t x_248; uint8_t x_249; lean_object* x_250; 
-x_247 = lean_ctor_get(x_246, 0);
-lean_inc(x_247);
-lean_dec_ref(x_246);
-x_248 = lean_unbox(x_230);
-lean_dec(x_230);
-x_249 = lean_unbox(x_247);
-lean_dec(x_247);
-x_250 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_248, x_221, x_249, x_210, x_215, x_207, x_217, x_219, x_213, x_218, x_211, x_209, x_216, x_220, x_212);
-x_168 = x_205;
-x_169 = x_228;
-x_170 = x_237;
-x_171 = x_236;
-x_172 = x_207;
-x_173 = x_209;
+lean_object* x_257; uint8_t x_258; uint8_t x_259; lean_object* x_260; 
+x_257 = lean_ctor_get(x_256, 0);
+lean_inc(x_257);
+lean_dec_ref(x_256);
+x_258 = lean_unbox(x_242);
+lean_dec(x_242);
+x_259 = lean_unbox(x_257);
+lean_dec(x_257);
+x_260 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_258, x_225, x_259, x_217, x_215, x_223, x_212, x_219, x_224, x_210, x_213, x_214, x_221, x_222, x_216);
+x_172 = x_235;
+x_173 = x_246;
 x_174 = x_210;
-x_175 = x_211;
-x_176 = x_212;
-x_177 = x_213;
-x_178 = x_215;
-x_179 = x_216;
-x_180 = x_234;
-x_181 = x_217;
-x_182 = x_218;
-x_183 = x_235;
-x_184 = x_219;
-x_185 = x_220;
-x_186 = x_250;
-goto block_204;
+x_175 = x_247;
+x_176 = x_211;
+x_177 = x_248;
+x_178 = x_230;
+x_179 = x_213;
+x_180 = x_212;
+x_181 = x_214;
+x_182 = x_215;
+x_183 = x_216;
+x_184 = x_217;
+x_185 = x_219;
+x_186 = x_245;
+x_187 = x_222;
+x_188 = x_221;
+x_189 = x_223;
+x_190 = x_232;
+x_191 = x_224;
+x_192 = x_260;
+goto block_208;
 }
 else
 {
-lean_dec(x_230);
-x_168 = x_205;
-x_169 = x_228;
-x_170 = x_237;
-x_171 = x_236;
-x_172 = x_207;
-x_173 = x_209;
+lean_dec(x_242);
+x_172 = x_235;
+x_173 = x_246;
 x_174 = x_210;
-x_175 = x_211;
-x_176 = x_212;
-x_177 = x_213;
-x_178 = x_215;
-x_179 = x_216;
-x_180 = x_234;
-x_181 = x_217;
-x_182 = x_218;
-x_183 = x_235;
-x_184 = x_219;
-x_185 = x_220;
-x_186 = x_246;
-goto block_204;
+x_175 = x_247;
+x_176 = x_211;
+x_177 = x_248;
+x_178 = x_230;
+x_179 = x_213;
+x_180 = x_212;
+x_181 = x_214;
+x_182 = x_215;
+x_183 = x_216;
+x_184 = x_217;
+x_185 = x_219;
+x_186 = x_245;
+x_187 = x_222;
+x_188 = x_221;
+x_189 = x_223;
+x_190 = x_232;
+x_191 = x_224;
+x_192 = x_256;
+goto block_208;
 }
 }
 }
 }
 else
 {
-lean_object* x_251; 
+lean_object* x_261; 
+lean_dec(x_242);
 lean_dec(x_230);
-lean_dec(x_228);
-lean_dec_ref(x_220);
-lean_dec_ref(x_219);
-lean_dec_ref(x_218);
-lean_dec(x_217);
-lean_dec(x_216);
-lean_dec(x_215);
-lean_dec_ref(x_214);
-lean_dec(x_213);
-lean_dec(x_212);
-lean_dec(x_211);
-lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_205);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_251 = lean_ctor_get(x_233, 0);
-lean_inc(x_251);
-lean_dec_ref(x_233);
-x_27 = x_251;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-}
-else
-{
-lean_object* x_252; 
-lean_dec(x_228);
-lean_dec_ref(x_220);
-lean_dec_ref(x_219);
-lean_dec_ref(x_218);
-lean_dec(x_217);
-lean_dec(x_216);
-lean_dec(x_215);
-lean_dec_ref(x_214);
-lean_dec(x_213);
-lean_dec(x_212);
-lean_dec(x_211);
-lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_205);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_252 = lean_ctor_get(x_229, 0);
-lean_inc(x_252);
-lean_dec_ref(x_229);
-x_27 = x_252;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-else
-{
-lean_object* x_253; 
-lean_dec(x_227);
-lean_dec(x_225);
-lean_dec_ref(x_220);
-lean_dec_ref(x_219);
-lean_dec_ref(x_218);
-lean_dec(x_217);
-lean_dec(x_216);
-lean_dec(x_215);
-lean_dec_ref(x_214);
-lean_dec(x_213);
-lean_dec(x_212);
-lean_dec(x_211);
-lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_205);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_253 = lean_box(0);
-x_35 = x_253;
-x_36 = lean_box(0);
-goto block_42;
-}
-}
-else
-{
-lean_object* x_254; 
-lean_dec(x_225);
-lean_dec_ref(x_220);
-lean_dec_ref(x_219);
-lean_dec_ref(x_218);
-lean_dec(x_217);
-lean_dec(x_216);
-lean_dec(x_215);
-lean_dec_ref(x_214);
-lean_dec(x_213);
-lean_dec(x_212);
-lean_dec(x_211);
-lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_205);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-x_254 = lean_ctor_get(x_226, 0);
-lean_inc(x_254);
-lean_dec_ref(x_226);
-x_27 = x_254;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-else
-{
-lean_object* x_255; 
+lean_dec(x_224);
 lean_dec(x_223);
-lean_dec_ref(x_220);
+lean_dec_ref(x_222);
+lean_dec(x_221);
 lean_dec_ref(x_219);
 lean_dec_ref(x_218);
-lean_dec(x_217);
+lean_dec_ref(x_217);
 lean_dec(x_216);
 lean_dec(x_215);
 lean_dec_ref(x_214);
 lean_dec(x_213);
 lean_dec(x_212);
-lean_dec(x_211);
+lean_dec_ref(x_211);
 lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_206);
-lean_dec_ref(x_205);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_255 = lean_box(0);
-x_35 = x_255;
+x_261 = lean_ctor_get(x_244, 0);
+lean_inc(x_261);
+lean_dec_ref(x_244);
+x_27 = x_261;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+}
+else
+{
+lean_object* x_262; 
+lean_dec(x_230);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
+lean_dec_ref(x_219);
+lean_dec_ref(x_218);
+lean_dec_ref(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec_ref(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec_ref(x_211);
+lean_dec_ref(x_210);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_262 = lean_ctor_get(x_241, 0);
+lean_inc(x_262);
+lean_dec_ref(x_241);
+x_27 = x_262;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+else
+{
+lean_dec(x_240);
+lean_dec(x_230);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
+lean_dec_ref(x_219);
+lean_dec_ref(x_218);
+lean_dec_ref(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec_ref(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec_ref(x_211);
+lean_dec_ref(x_210);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_35 = x_232;
 x_36 = lean_box(0);
 goto block_42;
 }
 }
 else
 {
-lean_object* x_256; 
-lean_dec_ref(x_220);
+lean_object* x_263; 
+lean_dec(x_230);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
 lean_dec_ref(x_219);
 lean_dec_ref(x_218);
-lean_dec(x_217);
+lean_dec_ref(x_217);
 lean_dec(x_216);
 lean_dec(x_215);
 lean_dec_ref(x_214);
 lean_dec(x_213);
 lean_dec(x_212);
-lean_dec(x_211);
+lean_dec_ref(x_211);
 lean_dec_ref(x_210);
-lean_dec_ref(x_209);
-lean_dec(x_207);
-lean_dec_ref(x_206);
-lean_dec_ref(x_205);
 lean_dec(x_51);
 lean_dec_ref(x_21);
-x_256 = lean_ctor_get(x_222, 0);
-lean_inc(x_256);
-lean_dec_ref(x_222);
-x_27 = x_256;
+x_263 = lean_ctor_get(x_239, 0);
+lean_inc(x_263);
+lean_dec_ref(x_239);
+x_27 = x_263;
 x_28 = lean_box(0);
 goto block_34;
 }
 }
-block_318:
+else
 {
-lean_object* x_271; 
-lean_inc_ref(x_268);
+lean_object* x_264; 
+lean_dec(x_230);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
+lean_dec_ref(x_219);
+lean_dec_ref(x_218);
+lean_dec_ref(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec_ref(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec_ref(x_211);
+lean_dec_ref(x_210);
+lean_dec_ref(x_209);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_264 = lean_ctor_get(x_238, 0);
+lean_inc(x_264);
+lean_dec_ref(x_238);
+x_35 = x_264;
+x_36 = lean_box(0);
+goto block_42;
+}
+}
+else
+{
+lean_object* x_265; 
+lean_dec(x_230);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
+lean_dec_ref(x_219);
+lean_dec_ref(x_218);
+lean_dec_ref(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec_ref(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec_ref(x_211);
+lean_dec_ref(x_210);
+lean_dec_ref(x_209);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_265 = lean_ctor_get(x_236, 0);
+lean_inc(x_265);
+lean_dec_ref(x_236);
+x_27 = x_265;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+else
+{
+lean_object* x_266; 
+lean_dec(x_227);
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
+lean_dec_ref(x_219);
+lean_dec_ref(x_218);
+lean_dec_ref(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec_ref(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec_ref(x_211);
+lean_dec_ref(x_210);
+lean_dec_ref(x_209);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_266 = lean_box(0);
+x_35 = x_266;
+x_36 = lean_box(0);
+goto block_42;
+}
+}
+else
+{
+lean_object* x_267; 
+lean_dec(x_224);
+lean_dec(x_223);
+lean_dec_ref(x_222);
+lean_dec(x_221);
+lean_dec_ref(x_219);
+lean_dec_ref(x_218);
+lean_dec_ref(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec_ref(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec_ref(x_211);
+lean_dec_ref(x_210);
+lean_dec_ref(x_209);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+x_267 = lean_ctor_get(x_226, 0);
+lean_inc(x_267);
+lean_dec_ref(x_226);
+x_27 = x_267;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+block_329:
+{
+lean_object* x_282; 
+lean_inc_ref(x_279);
 lean_inc_ref(x_21);
-x_271 = l_Lean_Meta_Grind_EMatchTheorem_getProofWithFreshMVarLevels(x_21, x_266, x_267, x_268, x_269);
-if (lean_obj_tag(x_271) == 0)
+x_282 = l_Lean_Meta_Grind_EMatchTheorem_getProofWithFreshMVarLevels(x_21, x_277, x_278, x_279, x_280);
+if (lean_obj_tag(x_282) == 0)
 {
-lean_object* x_272; lean_object* x_273; uint8_t x_274; 
-x_272 = lean_ctor_get(x_271, 0);
-lean_inc(x_272);
-lean_dec_ref(x_271);
-x_273 = lean_array_get_size(x_26);
-x_274 = lean_nat_dec_eq(x_273, x_24);
-if (x_274 == 0)
+lean_object* x_283; lean_object* x_284; uint8_t x_285; 
+x_283 = lean_ctor_get(x_282, 0);
+lean_inc(x_283);
+lean_dec_ref(x_282);
+x_284 = lean_array_get_size(x_26);
+x_285 = lean_nat_dec_eq(x_284, x_24);
+if (x_285 == 0)
 {
-lean_object* x_275; lean_object* x_276; 
-lean_dec(x_272);
+lean_object* x_286; lean_object* x_287; 
+lean_dec(x_283);
 lean_dec(x_51);
 lean_dec_ref(x_21);
 lean_dec_ref(x_1);
-x_275 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__6;
-x_276 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__1(x_275, x_258, x_259, x_260, x_261, x_262, x_263, x_264, x_265, x_266, x_267, x_268, x_269);
-x_46 = x_276;
+x_286 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__6;
+x_287 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__1(x_286, x_269, x_270, x_271, x_272, x_273, x_274, x_275, x_276, x_277, x_278, x_279, x_280);
+x_46 = x_287;
 goto block_49;
 }
 else
 {
-lean_object* x_277; 
-lean_inc(x_269);
-lean_inc_ref(x_268);
-lean_inc(x_267);
-lean_inc_ref(x_266);
-lean_inc(x_272);
-x_277 = lean_infer_type(x_272, x_266, x_267, x_268, x_269);
-if (lean_obj_tag(x_277) == 0)
-{
-lean_object* x_278; uint8_t x_279; lean_object* x_280; 
-x_278 = lean_ctor_get(x_277, 0);
+lean_object* x_288; 
+lean_inc(x_280);
+lean_inc_ref(x_279);
 lean_inc(x_278);
-lean_dec_ref(x_277);
-x_279 = 0;
-lean_inc(x_269);
-lean_inc_ref(x_268);
-lean_inc(x_267);
-lean_inc_ref(x_266);
-lean_inc(x_24);
-x_280 = l_Lean_Meta_forallMetaBoundedTelescope(x_278, x_24, x_279, x_266, x_267, x_268, x_269);
-if (lean_obj_tag(x_280) == 0)
-{
-lean_object* x_281; lean_object* x_282; lean_object* x_283; uint8_t x_284; 
-x_281 = lean_ctor_get(x_280, 0);
-lean_inc(x_281);
-lean_dec_ref(x_280);
-x_282 = lean_ctor_get(x_281, 1);
-lean_inc(x_282);
-x_283 = lean_ctor_get(x_281, 0);
+lean_inc_ref(x_277);
 lean_inc(x_283);
-lean_dec(x_281);
-x_284 = !lean_is_exclusive(x_282);
-if (x_284 == 0)
+x_288 = lean_infer_type(x_283, x_277, x_278, x_279, x_280);
+if (lean_obj_tag(x_288) == 0)
 {
-lean_object* x_285; lean_object* x_286; lean_object* x_287; uint8_t x_288; 
-x_285 = lean_ctor_get(x_282, 0);
-x_286 = lean_ctor_get(x_282, 1);
-lean_dec(x_286);
-x_287 = lean_array_get_size(x_283);
-x_288 = lean_nat_dec_eq(x_287, x_24);
-if (x_288 == 0)
+lean_object* x_289; uint8_t x_290; lean_object* x_291; 
+x_289 = lean_ctor_get(x_288, 0);
+lean_inc(x_289);
+lean_dec_ref(x_288);
+x_290 = 0;
+lean_inc(x_280);
+lean_inc_ref(x_279);
+lean_inc(x_278);
+lean_inc_ref(x_277);
+lean_inc(x_24);
+x_291 = l_Lean_Meta_forallMetaBoundedTelescope(x_289, x_24, x_290, x_277, x_278, x_279, x_280);
+if (lean_obj_tag(x_291) == 0)
 {
-if (x_274 == 0)
+lean_object* x_292; lean_object* x_293; lean_object* x_294; uint8_t x_295; 
+x_292 = lean_ctor_get(x_291, 0);
+lean_inc(x_292);
+lean_dec_ref(x_291);
+x_293 = lean_ctor_get(x_292, 1);
+lean_inc(x_293);
+x_294 = lean_ctor_get(x_292, 0);
+lean_inc(x_294);
+lean_dec(x_292);
+x_295 = !lean_is_exclusive(x_293);
+if (x_295 == 0)
 {
-lean_free_object(x_282);
-x_205 = x_283;
-x_206 = x_285;
-x_207 = x_260;
-x_208 = lean_box(0);
-x_209 = x_266;
-x_210 = x_258;
-x_211 = x_265;
-x_212 = x_269;
-x_213 = x_263;
-x_214 = x_272;
-x_215 = x_259;
-x_216 = x_267;
-x_217 = x_261;
-x_218 = x_264;
-x_219 = x_262;
-x_220 = x_268;
-x_221 = x_274;
-goto block_257;
+lean_object* x_296; lean_object* x_297; lean_object* x_298; uint8_t x_299; 
+x_296 = lean_ctor_get(x_293, 0);
+x_297 = lean_ctor_get(x_293, 1);
+lean_dec(x_297);
+x_298 = lean_array_get_size(x_294);
+x_299 = lean_nat_dec_eq(x_298, x_24);
+if (x_299 == 0)
+{
+if (x_285 == 0)
+{
+lean_free_object(x_293);
+x_209 = x_296;
+x_210 = x_275;
+x_211 = x_294;
+x_212 = x_272;
+x_213 = x_276;
+x_214 = x_277;
+x_215 = x_270;
+x_216 = x_280;
+x_217 = x_269;
+x_218 = x_283;
+x_219 = x_273;
+x_220 = lean_box(0);
+x_221 = x_278;
+x_222 = x_279;
+x_223 = x_271;
+x_224 = x_274;
+x_225 = x_285;
+goto block_268;
 }
 else
 {
-lean_object* x_289; 
-lean_dec(x_285);
+lean_object* x_300; 
+lean_dec(x_296);
+lean_dec(x_294);
 lean_dec(x_283);
-lean_dec(x_272);
-lean_dec(x_260);
-lean_dec(x_259);
-lean_dec_ref(x_258);
+lean_dec(x_271);
+lean_dec(x_270);
+lean_dec_ref(x_269);
 lean_dec(x_51);
 lean_inc_ref(x_25);
 lean_dec_ref(x_21);
 lean_dec_ref(x_1);
-x_289 = l_Lean_Meta_Grind_getConfig___redArg(x_262);
-if (lean_obj_tag(x_289) == 0)
+x_300 = l_Lean_Meta_Grind_getConfig___redArg(x_273);
+if (lean_obj_tag(x_300) == 0)
 {
-lean_object* x_290; uint8_t x_291; 
-x_290 = lean_ctor_get(x_289, 0);
-lean_inc(x_290);
-lean_dec_ref(x_289);
-x_291 = lean_ctor_get_uint8(x_290, sizeof(void*)*11 + 14);
-lean_dec(x_290);
-if (x_291 == 0)
-{
-lean_free_object(x_282);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec_ref(x_25);
-x_43 = lean_box(0);
-goto block_45;
-}
-else
-{
-lean_object* x_292; lean_object* x_293; uint8_t x_294; 
-x_292 = lean_ctor_get(x_268, 2);
-x_293 = l_Lean_Meta_Grind_grind_debug;
-x_294 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_292, x_293);
-if (x_294 == 0)
-{
-lean_free_object(x_282);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec_ref(x_25);
-x_43 = lean_box(0);
-goto block_45;
-}
-else
-{
-lean_object* x_295; lean_object* x_296; lean_object* x_297; 
-x_295 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__8;
-x_296 = l_Lean_Meta_Grind_Origin_pp(x_25);
-lean_ctor_set_tag(x_282, 7);
-lean_ctor_set(x_282, 1, x_296);
-lean_ctor_set(x_282, 0, x_295);
-x_297 = l_Lean_Meta_Grind_reportIssue(x_282, x_261, x_262, x_263, x_264, x_265, x_266, x_267, x_268, x_269);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-if (lean_obj_tag(x_297) == 0)
-{
-lean_dec_ref(x_297);
-x_43 = lean_box(0);
-goto block_45;
-}
-else
-{
-x_46 = x_297;
-goto block_49;
-}
-}
-}
-}
-else
-{
-lean_object* x_298; 
-lean_free_object(x_282);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec_ref(x_25);
-x_298 = lean_ctor_get(x_289, 0);
-lean_inc(x_298);
-lean_dec_ref(x_289);
-x_27 = x_298;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-}
-else
-{
-uint8_t x_299; 
-lean_free_object(x_282);
-x_299 = 0;
-x_205 = x_283;
-x_206 = x_285;
-x_207 = x_260;
-x_208 = lean_box(0);
-x_209 = x_266;
-x_210 = x_258;
-x_211 = x_265;
-x_212 = x_269;
-x_213 = x_263;
-x_214 = x_272;
-x_215 = x_259;
-x_216 = x_267;
-x_217 = x_261;
-x_218 = x_264;
-x_219 = x_262;
-x_220 = x_268;
-x_221 = x_299;
-goto block_257;
-}
-}
-else
-{
-lean_object* x_300; lean_object* x_301; uint8_t x_302; 
-x_300 = lean_ctor_get(x_282, 0);
-lean_inc(x_300);
-lean_dec(x_282);
-x_301 = lean_array_get_size(x_283);
-x_302 = lean_nat_dec_eq(x_301, x_24);
+lean_object* x_301; uint8_t x_302; 
+x_301 = lean_ctor_get(x_300, 0);
+lean_inc(x_301);
+lean_dec_ref(x_300);
+x_302 = lean_ctor_get_uint8(x_301, sizeof(void*)*11 + 14);
+lean_dec(x_301);
 if (x_302 == 0)
 {
-if (x_274 == 0)
-{
-x_205 = x_283;
-x_206 = x_300;
-x_207 = x_260;
-x_208 = lean_box(0);
-x_209 = x_266;
-x_210 = x_258;
-x_211 = x_265;
-x_212 = x_269;
-x_213 = x_263;
-x_214 = x_272;
-x_215 = x_259;
-x_216 = x_267;
-x_217 = x_261;
-x_218 = x_264;
-x_219 = x_262;
-x_220 = x_268;
-x_221 = x_274;
-goto block_257;
+lean_free_object(x_293);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec_ref(x_25);
+x_43 = lean_box(0);
+goto block_45;
 }
 else
 {
-lean_object* x_303; 
-lean_dec(x_300);
-lean_dec(x_283);
-lean_dec(x_272);
-lean_dec(x_260);
-lean_dec(x_259);
-lean_dec_ref(x_258);
-lean_dec(x_51);
-lean_inc_ref(x_25);
-lean_dec_ref(x_21);
-lean_dec_ref(x_1);
-x_303 = l_Lean_Meta_Grind_getConfig___redArg(x_262);
-if (lean_obj_tag(x_303) == 0)
-{
-lean_object* x_304; uint8_t x_305; 
-x_304 = lean_ctor_get(x_303, 0);
-lean_inc(x_304);
-lean_dec_ref(x_303);
-x_305 = lean_ctor_get_uint8(x_304, sizeof(void*)*11 + 14);
-lean_dec(x_304);
+lean_object* x_303; lean_object* x_304; uint8_t x_305; 
+x_303 = lean_ctor_get(x_279, 2);
+x_304 = l_Lean_Meta_Grind_grind_debug;
+x_305 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_303, x_304);
 if (x_305 == 0)
 {
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
+lean_free_object(x_293);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
 lean_dec_ref(x_25);
 x_43 = lean_box(0);
 goto block_45;
 }
 else
 {
-lean_object* x_306; lean_object* x_307; uint8_t x_308; 
-x_306 = lean_ctor_get(x_268, 2);
-x_307 = l_Lean_Meta_Grind_grind_debug;
-x_308 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_306, x_307);
-if (x_308 == 0)
+lean_object* x_306; lean_object* x_307; lean_object* x_308; 
+x_306 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__8;
+x_307 = l_Lean_Meta_Grind_Origin_pp(x_25);
+lean_ctor_set_tag(x_293, 7);
+lean_ctor_set(x_293, 1, x_307);
+lean_ctor_set(x_293, 0, x_306);
+x_308 = l_Lean_Meta_Grind_reportIssue(x_293, x_272, x_273, x_274, x_275, x_276, x_277, x_278, x_279, x_280);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+if (lean_obj_tag(x_308) == 0)
 {
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec_ref(x_25);
+lean_dec_ref(x_308);
 x_43 = lean_box(0);
 goto block_45;
 }
 else
 {
-lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; 
-x_309 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__8;
-x_310 = l_Lean_Meta_Grind_Origin_pp(x_25);
-x_311 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_311, 0, x_309);
-lean_ctor_set(x_311, 1, x_310);
-x_312 = l_Lean_Meta_Grind_reportIssue(x_311, x_261, x_262, x_263, x_264, x_265, x_266, x_267, x_268, x_269);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-if (lean_obj_tag(x_312) == 0)
-{
-lean_dec_ref(x_312);
-x_43 = lean_box(0);
-goto block_45;
-}
-else
-{
-x_46 = x_312;
+x_46 = x_308;
 goto block_49;
 }
 }
@@ -34061,101 +34600,22 @@ goto block_49;
 }
 else
 {
-lean_object* x_313; 
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec_ref(x_25);
-x_313 = lean_ctor_get(x_303, 0);
-lean_inc(x_313);
-lean_dec_ref(x_303);
-x_27 = x_313;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-}
-else
-{
-uint8_t x_314; 
-x_314 = 0;
-x_205 = x_283;
-x_206 = x_300;
-x_207 = x_260;
-x_208 = lean_box(0);
-x_209 = x_266;
-x_210 = x_258;
-x_211 = x_265;
-x_212 = x_269;
-x_213 = x_263;
-x_214 = x_272;
-x_215 = x_259;
-x_216 = x_267;
-x_217 = x_261;
-x_218 = x_264;
-x_219 = x_262;
-x_220 = x_268;
-x_221 = x_314;
-goto block_257;
-}
-}
-}
-else
-{
-lean_object* x_315; 
-lean_dec(x_272);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec(x_260);
-lean_dec(x_259);
-lean_dec_ref(x_258);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-lean_dec_ref(x_1);
-x_315 = lean_ctor_get(x_280, 0);
-lean_inc(x_315);
-lean_dec_ref(x_280);
-x_27 = x_315;
-x_28 = lean_box(0);
-goto block_34;
-}
-}
-else
-{
-lean_object* x_316; 
-lean_dec(x_272);
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec(x_260);
-lean_dec(x_259);
-lean_dec_ref(x_258);
-lean_dec(x_51);
-lean_dec_ref(x_21);
-lean_dec_ref(x_1);
-x_316 = lean_ctor_get(x_277, 0);
-lean_inc(x_316);
+lean_object* x_309; 
+lean_free_object(x_293);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
 lean_dec_ref(x_277);
-x_27 = x_316;
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec_ref(x_25);
+x_309 = lean_ctor_get(x_300, 0);
+lean_inc(x_309);
+lean_dec_ref(x_300);
+x_27 = x_309;
 x_28 = lean_box(0);
 goto block_34;
 }
@@ -34163,26 +34623,247 @@ goto block_34;
 }
 else
 {
-lean_object* x_317; 
-lean_dec(x_269);
-lean_dec_ref(x_268);
-lean_dec(x_267);
-lean_dec_ref(x_266);
-lean_dec(x_265);
-lean_dec_ref(x_264);
-lean_dec(x_263);
-lean_dec_ref(x_262);
-lean_dec(x_261);
-lean_dec(x_260);
-lean_dec(x_259);
-lean_dec_ref(x_258);
+uint8_t x_310; 
+lean_free_object(x_293);
+x_310 = 0;
+x_209 = x_296;
+x_210 = x_275;
+x_211 = x_294;
+x_212 = x_272;
+x_213 = x_276;
+x_214 = x_277;
+x_215 = x_270;
+x_216 = x_280;
+x_217 = x_269;
+x_218 = x_283;
+x_219 = x_273;
+x_220 = lean_box(0);
+x_221 = x_278;
+x_222 = x_279;
+x_223 = x_271;
+x_224 = x_274;
+x_225 = x_310;
+goto block_268;
+}
+}
+else
+{
+lean_object* x_311; lean_object* x_312; uint8_t x_313; 
+x_311 = lean_ctor_get(x_293, 0);
+lean_inc(x_311);
+lean_dec(x_293);
+x_312 = lean_array_get_size(x_294);
+x_313 = lean_nat_dec_eq(x_312, x_24);
+if (x_313 == 0)
+{
+if (x_285 == 0)
+{
+x_209 = x_311;
+x_210 = x_275;
+x_211 = x_294;
+x_212 = x_272;
+x_213 = x_276;
+x_214 = x_277;
+x_215 = x_270;
+x_216 = x_280;
+x_217 = x_269;
+x_218 = x_283;
+x_219 = x_273;
+x_220 = lean_box(0);
+x_221 = x_278;
+x_222 = x_279;
+x_223 = x_271;
+x_224 = x_274;
+x_225 = x_285;
+goto block_268;
+}
+else
+{
+lean_object* x_314; 
+lean_dec(x_311);
+lean_dec(x_294);
+lean_dec(x_283);
+lean_dec(x_271);
+lean_dec(x_270);
+lean_dec_ref(x_269);
+lean_dec(x_51);
+lean_inc_ref(x_25);
+lean_dec_ref(x_21);
+lean_dec_ref(x_1);
+x_314 = l_Lean_Meta_Grind_getConfig___redArg(x_273);
+if (lean_obj_tag(x_314) == 0)
+{
+lean_object* x_315; uint8_t x_316; 
+x_315 = lean_ctor_get(x_314, 0);
+lean_inc(x_315);
+lean_dec_ref(x_314);
+x_316 = lean_ctor_get_uint8(x_315, sizeof(void*)*11 + 14);
+lean_dec(x_315);
+if (x_316 == 0)
+{
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec_ref(x_25);
+x_43 = lean_box(0);
+goto block_45;
+}
+else
+{
+lean_object* x_317; lean_object* x_318; uint8_t x_319; 
+x_317 = lean_ctor_get(x_279, 2);
+x_318 = l_Lean_Meta_Grind_grind_debug;
+x_319 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_317, x_318);
+if (x_319 == 0)
+{
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec_ref(x_25);
+x_43 = lean_box(0);
+goto block_45;
+}
+else
+{
+lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; 
+x_320 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__8;
+x_321 = l_Lean_Meta_Grind_Origin_pp(x_25);
+x_322 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_322, 0, x_320);
+lean_ctor_set(x_322, 1, x_321);
+x_323 = l_Lean_Meta_Grind_reportIssue(x_322, x_272, x_273, x_274, x_275, x_276, x_277, x_278, x_279, x_280);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+if (lean_obj_tag(x_323) == 0)
+{
+lean_dec_ref(x_323);
+x_43 = lean_box(0);
+goto block_45;
+}
+else
+{
+x_46 = x_323;
+goto block_49;
+}
+}
+}
+}
+else
+{
+lean_object* x_324; 
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec_ref(x_25);
+x_324 = lean_ctor_get(x_314, 0);
+lean_inc(x_324);
+lean_dec_ref(x_314);
+x_27 = x_324;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+}
+else
+{
+uint8_t x_325; 
+x_325 = 0;
+x_209 = x_311;
+x_210 = x_275;
+x_211 = x_294;
+x_212 = x_272;
+x_213 = x_276;
+x_214 = x_277;
+x_215 = x_270;
+x_216 = x_280;
+x_217 = x_269;
+x_218 = x_283;
+x_219 = x_273;
+x_220 = lean_box(0);
+x_221 = x_278;
+x_222 = x_279;
+x_223 = x_271;
+x_224 = x_274;
+x_225 = x_325;
+goto block_268;
+}
+}
+}
+else
+{
+lean_object* x_326; 
+lean_dec(x_283);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec(x_271);
+lean_dec(x_270);
+lean_dec_ref(x_269);
 lean_dec(x_51);
 lean_dec_ref(x_21);
 lean_dec_ref(x_1);
-x_317 = lean_ctor_get(x_271, 0);
-lean_inc(x_317);
-lean_dec_ref(x_271);
-x_27 = x_317;
+x_326 = lean_ctor_get(x_291, 0);
+lean_inc(x_326);
+lean_dec_ref(x_291);
+x_27 = x_326;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+else
+{
+lean_object* x_327; 
+lean_dec(x_283);
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec(x_271);
+lean_dec(x_270);
+lean_dec_ref(x_269);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+lean_dec_ref(x_1);
+x_327 = lean_ctor_get(x_288, 0);
+lean_inc(x_327);
+lean_dec_ref(x_288);
+x_27 = x_327;
 x_28 = lean_box(0);
 goto block_34;
 }
@@ -34190,7 +34871,34 @@ goto block_34;
 }
 else
 {
-lean_object* x_336; 
+lean_object* x_328; 
+lean_dec(x_280);
+lean_dec_ref(x_279);
+lean_dec(x_278);
+lean_dec_ref(x_277);
+lean_dec(x_276);
+lean_dec_ref(x_275);
+lean_dec(x_274);
+lean_dec_ref(x_273);
+lean_dec(x_272);
+lean_dec(x_271);
+lean_dec(x_270);
+lean_dec_ref(x_269);
+lean_dec(x_51);
+lean_dec_ref(x_21);
+lean_dec_ref(x_1);
+x_328 = lean_ctor_get(x_282, 0);
+lean_inc(x_328);
+lean_dec_ref(x_282);
+x_27 = x_328;
+x_28 = lean_box(0);
+goto block_34;
+}
+}
+}
+else
+{
+lean_object* x_347; 
 lean_dec_ref(x_21);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -34204,10 +34912,10 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_336 = lean_ctor_get(x_50, 0);
-lean_inc(x_336);
+x_347 = lean_ctor_get(x_50, 0);
+lean_inc(x_347);
 lean_dec_ref(x_50);
-x_27 = x_336;
+x_27 = x_347;
 x_28 = lean_box(0);
 goto block_34;
 }
@@ -34296,1524 +35004,1620 @@ goto block_34;
 }
 else
 {
-lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_361; lean_object* x_362; lean_object* x_368; lean_object* x_371; lean_object* x_375; 
-x_337 = lean_ctor_get(x_16, 0);
-x_338 = lean_ctor_get(x_16, 1);
-x_339 = lean_ctor_get(x_16, 3);
-x_340 = lean_ctor_get(x_16, 4);
-x_341 = lean_ctor_get(x_16, 5);
-x_342 = lean_ctor_get(x_16, 6);
-x_343 = lean_ctor_get(x_16, 7);
-x_344 = lean_ctor_get(x_16, 8);
-lean_inc(x_344);
-lean_inc(x_343);
-lean_inc(x_342);
-lean_inc(x_341);
-lean_inc(x_340);
-lean_inc(x_339);
-lean_inc(x_338);
-lean_inc(x_337);
+lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_372; lean_object* x_373; lean_object* x_379; lean_object* x_382; lean_object* x_386; 
+x_348 = lean_ctor_get(x_16, 0);
+x_349 = lean_ctor_get(x_16, 1);
+x_350 = lean_ctor_get(x_16, 3);
+x_351 = lean_ctor_get(x_16, 4);
+x_352 = lean_ctor_get(x_16, 5);
+x_353 = lean_ctor_get(x_16, 6);
+x_354 = lean_ctor_get(x_16, 7);
+x_355 = lean_ctor_get(x_16, 8);
+lean_inc(x_355);
+lean_inc(x_354);
+lean_inc(x_353);
+lean_inc(x_352);
+lean_inc(x_351);
+lean_inc(x_350);
+lean_inc(x_349);
+lean_inc(x_348);
 lean_dec(x_16);
-x_345 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_withFreshNGen___redArg___closed__3));
-x_346 = lean_alloc_ctor(0, 9, 0);
-lean_ctor_set(x_346, 0, x_337);
-lean_ctor_set(x_346, 1, x_338);
-lean_ctor_set(x_346, 2, x_345);
-lean_ctor_set(x_346, 3, x_339);
-lean_ctor_set(x_346, 4, x_340);
-lean_ctor_set(x_346, 5, x_341);
-lean_ctor_set(x_346, 6, x_342);
-lean_ctor_set(x_346, 7, x_343);
-lean_ctor_set(x_346, 8, x_344);
-x_347 = lean_st_ref_set(x_13, x_346);
-x_348 = lean_ctor_get(x_2, 0);
-lean_inc_ref(x_348);
-x_349 = lean_ctor_get(x_15, 2);
-lean_inc_ref(x_349);
+x_356 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_withFreshNGen___redArg___closed__3));
+x_357 = lean_alloc_ctor(0, 9, 0);
+lean_ctor_set(x_357, 0, x_348);
+lean_ctor_set(x_357, 1, x_349);
+lean_ctor_set(x_357, 2, x_356);
+lean_ctor_set(x_357, 3, x_350);
+lean_ctor_set(x_357, 4, x_351);
+lean_ctor_set(x_357, 5, x_352);
+lean_ctor_set(x_357, 6, x_353);
+lean_ctor_set(x_357, 7, x_354);
+lean_ctor_set(x_357, 8, x_355);
+x_358 = lean_st_ref_set(x_13, x_357);
+x_359 = lean_ctor_get(x_2, 0);
+lean_inc_ref(x_359);
+x_360 = lean_ctor_get(x_15, 2);
+lean_inc_ref(x_360);
 lean_dec(x_15);
-x_350 = lean_ctor_get(x_348, 1);
-x_351 = lean_ctor_get(x_348, 2);
-x_352 = lean_ctor_get(x_348, 5);
-x_353 = lean_ctor_get(x_1, 2);
-lean_inc_ref(x_353);
-lean_inc_ref(x_350);
-x_375 = l_Lean_Meta_Grind_markTheoremInstance___redArg(x_350, x_353, x_4);
-if (lean_obj_tag(x_375) == 0)
+x_361 = lean_ctor_get(x_359, 1);
+x_362 = lean_ctor_get(x_359, 2);
+x_363 = lean_ctor_get(x_359, 5);
+x_364 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_364);
+lean_inc_ref(x_361);
+x_386 = l_Lean_Meta_Grind_markTheoremInstance___redArg(x_361, x_364, x_4);
+if (lean_obj_tag(x_386) == 0)
 {
-lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; uint8_t x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; uint8_t x_409; lean_object* x_410; lean_object* x_411; lean_object* x_412; lean_object* x_413; lean_object* x_414; lean_object* x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; lean_object* x_422; lean_object* x_452; lean_object* x_453; lean_object* x_454; lean_object* x_455; uint8_t x_456; lean_object* x_457; lean_object* x_458; lean_object* x_459; lean_object* x_460; lean_object* x_461; lean_object* x_462; lean_object* x_463; lean_object* x_464; lean_object* x_465; lean_object* x_466; lean_object* x_467; lean_object* x_468; lean_object* x_472; lean_object* x_473; lean_object* x_474; lean_object* x_475; lean_object* x_476; lean_object* x_477; lean_object* x_478; lean_object* x_479; lean_object* x_480; lean_object* x_481; lean_object* x_482; lean_object* x_483; lean_object* x_484; lean_object* x_485; lean_object* x_486; lean_object* x_487; lean_object* x_488; lean_object* x_489; lean_object* x_490; lean_object* x_509; lean_object* x_510; lean_object* x_511; lean_object* x_512; lean_object* x_513; lean_object* x_514; lean_object* x_515; lean_object* x_516; lean_object* x_517; lean_object* x_518; lean_object* x_519; lean_object* x_520; lean_object* x_521; lean_object* x_522; lean_object* x_523; lean_object* x_524; uint8_t x_525; lean_object* x_562; lean_object* x_563; lean_object* x_564; lean_object* x_565; lean_object* x_566; lean_object* x_567; lean_object* x_568; lean_object* x_569; lean_object* x_570; lean_object* x_571; lean_object* x_572; lean_object* x_573; lean_object* x_574; uint8_t x_608; 
-x_376 = lean_ctor_get(x_375, 0);
-lean_inc(x_376);
-lean_dec_ref(x_375);
-x_608 = lean_unbox(x_376);
-if (x_608 == 0)
-{
-lean_object* x_609; 
-lean_dec(x_376);
-lean_dec_ref(x_348);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_609 = lean_box(0);
-x_361 = x_609;
-x_362 = lean_box(0);
-goto block_367;
-}
-else
-{
-lean_object* x_610; lean_object* x_611; lean_object* x_612; uint8_t x_613; 
-x_610 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__11));
-x_611 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5___redArg(x_610, x_12);
-x_612 = lean_ctor_get(x_611, 0);
-lean_inc(x_612);
-lean_dec_ref(x_611);
-x_613 = lean_unbox(x_612);
-lean_dec(x_612);
-if (x_613 == 0)
-{
-lean_inc(x_13);
-x_562 = x_2;
-x_563 = x_3;
-x_564 = x_4;
-x_565 = x_5;
-x_566 = x_6;
-x_567 = x_7;
-x_568 = x_8;
-x_569 = x_9;
-x_570 = x_10;
-x_571 = x_11;
-x_572 = x_12;
-x_573 = x_13;
-x_574 = lean_box(0);
-goto block_607;
-}
-else
-{
-lean_object* x_614; 
-x_614 = l_Lean_Meta_Grind_updateLastTag(x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_614) == 0)
-{
-lean_object* x_615; lean_object* x_616; lean_object* x_617; lean_object* x_618; lean_object* x_619; lean_object* x_620; lean_object* x_621; lean_object* x_622; lean_object* x_623; lean_object* x_624; 
-lean_dec_ref(x_614);
-lean_inc_ref(x_352);
-x_615 = l_Lean_Meta_Grind_Origin_pp(x_352);
-x_616 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13;
-x_617 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_617, 0, x_615);
-lean_ctor_set(x_617, 1, x_616);
-lean_inc_ref(x_353);
-x_618 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignmentToMessageData(x_353);
-x_619 = lean_array_to_list(x_618);
-x_620 = lean_box(0);
-x_621 = l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6(x_619, x_620);
-x_622 = l_Lean_MessageData_ofList(x_621);
-x_623 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_623, 0, x_617);
-lean_ctor_set(x_623, 1, x_622);
-x_624 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg(x_610, x_623, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_624) == 0)
-{
-lean_dec_ref(x_624);
-lean_inc(x_13);
-x_562 = x_2;
-x_563 = x_3;
-x_564 = x_4;
-x_565 = x_5;
-x_566 = x_6;
-x_567 = x_7;
-x_568 = x_8;
-x_569 = x_9;
-x_570 = x_10;
-x_571 = x_11;
-x_572 = x_12;
-x_573 = x_13;
-x_574 = lean_box(0);
-goto block_607;
-}
-else
-{
-lean_dec(x_376);
-lean_dec_ref(x_348);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_371 = x_624;
-goto block_374;
-}
-}
-else
-{
-lean_dec(x_376);
-lean_dec_ref(x_348);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_371 = x_614;
-goto block_374;
-}
-}
-}
-block_404:
-{
-lean_object* x_395; lean_object* x_396; uint8_t x_397; uint8_t x_398; uint8_t x_399; lean_object* x_400; 
-x_395 = l_Lean_instantiateMVars___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__0___redArg(x_379, x_391);
-x_396 = lean_ctor_get(x_395, 0);
-lean_inc(x_396);
-lean_dec_ref(x_395);
-x_397 = 0;
-x_398 = lean_unbox(x_376);
-x_399 = lean_unbox(x_376);
-lean_dec(x_376);
-x_400 = l_Lean_Meta_mkLambdaFVars(x_381, x_396, x_380, x_398, x_380, x_399, x_397, x_390, x_391, x_392, x_393);
-lean_dec_ref(x_381);
-if (lean_obj_tag(x_400) == 0)
-{
-lean_object* x_401; lean_object* x_402; 
-x_401 = lean_ctor_get(x_400, 0);
-lean_inc(x_401);
-lean_dec_ref(x_400);
-x_402 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_348, x_401, x_377, x_378, x_382, x_383, x_384, x_385, x_386, x_387, x_388, x_389, x_390, x_391, x_392, x_393);
-lean_dec(x_377);
-x_371 = x_402;
-goto block_374;
-}
-else
-{
-lean_object* x_403; 
-lean_dec(x_393);
-lean_dec_ref(x_392);
-lean_dec(x_391);
-lean_dec_ref(x_390);
-lean_dec(x_389);
-lean_dec_ref(x_388);
-lean_dec(x_387);
+lean_object* x_387; uint8_t x_388; lean_object* x_389; 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; lean_object* x_403; lean_object* x_404; lean_object* x_405; uint8_t x_416; size_t x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; lean_object* x_422; lean_object* x_423; lean_object* x_424; lean_object* x_425; lean_object* x_426; lean_object* x_427; lean_object* x_428; lean_object* x_429; lean_object* x_430; lean_object* x_431; lean_object* x_432; lean_object* x_433; lean_object* x_434; lean_object* x_435; uint8_t x_465; size_t x_466; lean_object* x_467; lean_object* x_468; lean_object* x_469; lean_object* x_470; lean_object* x_471; lean_object* x_472; lean_object* x_473; lean_object* x_474; lean_object* x_475; lean_object* x_476; lean_object* x_477; lean_object* x_478; lean_object* x_479; lean_object* x_480; lean_object* x_481; lean_object* x_482; lean_object* x_483; size_t x_487; lean_object* x_488; lean_object* x_489; lean_object* x_490; lean_object* x_491; lean_object* x_492; lean_object* x_493; lean_object* x_494; lean_object* x_495; lean_object* x_496; lean_object* x_497; lean_object* x_498; lean_object* x_499; lean_object* x_500; lean_object* x_501; lean_object* x_502; lean_object* x_503; lean_object* x_504; lean_object* x_505; lean_object* x_506; lean_object* x_507; lean_object* x_524; lean_object* x_525; lean_object* x_526; lean_object* x_527; lean_object* x_528; lean_object* x_529; lean_object* x_530; lean_object* x_531; lean_object* x_532; lean_object* x_533; lean_object* x_534; lean_object* x_535; lean_object* x_536; lean_object* x_537; lean_object* x_538; lean_object* x_539; uint8_t x_540; lean_object* x_584; lean_object* x_585; lean_object* x_586; lean_object* x_587; lean_object* x_588; lean_object* x_589; lean_object* x_590; lean_object* x_591; lean_object* x_592; lean_object* x_593; lean_object* x_594; lean_object* x_595; lean_object* x_596; uint8_t x_630; 
+x_387 = lean_ctor_get(x_386, 0);
+lean_inc(x_387);
 lean_dec_ref(x_386);
-lean_dec(x_385);
-lean_dec(x_384);
-lean_dec(x_383);
-lean_dec_ref(x_382);
-lean_dec(x_378);
-lean_dec(x_377);
-lean_dec_ref(x_348);
-x_403 = lean_ctor_get(x_400, 0);
-lean_inc(x_403);
-lean_dec_ref(x_400);
-x_354 = x_403;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-block_451:
+x_630 = lean_unbox(x_387);
+if (x_630 == 0)
 {
-lean_object* x_423; size_t x_424; size_t x_425; lean_object* x_426; 
-x_423 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
-x_424 = lean_array_size(x_421);
-x_425 = 0;
-lean_inc(x_411);
-lean_inc_ref(x_419);
-lean_inc(x_414);
-lean_inc_ref(x_407);
-x_426 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_421, x_424, x_425, x_423, x_407, x_414, x_419, x_411);
-if (lean_obj_tag(x_426) == 0)
-{
-lean_object* x_427; lean_object* x_428; lean_object* x_429; 
-x_427 = lean_ctor_get(x_426, 0);
-lean_inc(x_427);
-lean_dec_ref(x_426);
-x_428 = lean_ctor_get(x_427, 0);
-lean_inc(x_428);
-if (lean_is_exclusive(x_427)) {
- lean_ctor_release(x_427, 0);
- lean_ctor_release(x_427, 1);
- x_429 = x_427;
-} else {
- lean_dec_ref(x_427);
- x_429 = lean_box(0);
-}
-if (lean_obj_tag(x_428) == 0)
-{
-lean_dec(x_429);
-x_377 = x_405;
-x_378 = x_415;
-x_379 = x_418;
-x_380 = x_409;
-x_381 = x_421;
-x_382 = x_408;
-x_383 = x_413;
-x_384 = x_406;
-x_385 = x_416;
-x_386 = x_420;
-x_387 = x_412;
-x_388 = x_417;
-x_389 = x_410;
-x_390 = x_407;
-x_391 = x_414;
-x_392 = x_419;
-x_393 = x_411;
-x_394 = lean_box(0);
-goto block_404;
+lean_object* x_631; 
+lean_dec(x_387);
+lean_dec_ref(x_359);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_631 = lean_box(0);
+x_372 = x_631;
+x_373 = lean_box(0);
+goto block_378;
 }
 else
 {
-lean_object* x_430; 
-x_430 = lean_ctor_get(x_428, 0);
-lean_inc(x_430);
-lean_dec_ref(x_428);
-if (lean_obj_tag(x_430) == 1)
+lean_object* x_632; lean_object* x_633; lean_object* x_634; uint8_t x_635; 
+x_632 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__11));
+x_633 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__6___redArg(x_632, x_12);
+x_634 = lean_ctor_get(x_633, 0);
+lean_inc(x_634);
+lean_dec_ref(x_633);
+x_635 = lean_unbox(x_634);
+lean_dec(x_634);
+if (x_635 == 0)
 {
-lean_object* x_431; lean_object* x_432; 
-x_431 = lean_ctor_get(x_430, 0);
-lean_inc(x_431);
-lean_dec_ref(x_430);
-x_432 = l_Lean_Meta_Grind_getConfig___redArg(x_420);
-if (lean_obj_tag(x_432) == 0)
+lean_inc(x_13);
+x_584 = x_2;
+x_585 = x_3;
+x_586 = x_4;
+x_587 = x_5;
+x_588 = x_6;
+x_589 = x_7;
+x_590 = x_8;
+x_591 = x_9;
+x_592 = x_10;
+x_593 = x_11;
+x_594 = x_12;
+x_595 = x_13;
+x_596 = lean_box(0);
+goto block_629;
+}
+else
 {
-lean_object* x_433; uint8_t x_434; 
-x_433 = lean_ctor_get(x_432, 0);
-lean_inc(x_433);
-lean_dec_ref(x_432);
-x_434 = lean_ctor_get_uint8(x_433, sizeof(void*)*11 + 14);
+lean_object* x_636; 
+x_636 = l_Lean_Meta_Grind_updateLastTag(x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_636) == 0)
+{
+lean_object* x_637; lean_object* x_638; lean_object* x_639; lean_object* x_640; lean_object* x_641; lean_object* x_642; lean_object* x_643; lean_object* x_644; lean_object* x_645; lean_object* x_646; 
+lean_dec_ref(x_636);
+lean_inc_ref(x_363);
+x_637 = l_Lean_Meta_Grind_Origin_pp(x_363);
+x_638 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13;
+x_639 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_639, 0, x_637);
+lean_ctor_set(x_639, 1, x_638);
+lean_inc_ref(x_364);
+x_640 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignmentToMessageData(x_364);
+x_641 = lean_array_to_list(x_640);
+x_642 = lean_box(0);
+x_643 = l_List_mapTR_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(x_641, x_642);
+x_644 = l_Lean_MessageData_ofList(x_643);
+x_645 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_645, 0, x_639);
+lean_ctor_set(x_645, 1, x_644);
+x_646 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_632, x_645, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_646) == 0)
+{
+lean_dec_ref(x_646);
+lean_inc(x_13);
+x_584 = x_2;
+x_585 = x_3;
+x_586 = x_4;
+x_587 = x_5;
+x_588 = x_6;
+x_589 = x_7;
+x_590 = x_8;
+x_591 = x_9;
+x_592 = x_10;
+x_593 = x_11;
+x_594 = x_12;
+x_595 = x_13;
+x_596 = lean_box(0);
+goto block_629;
+}
+else
+{
+lean_dec(x_387);
+lean_dec_ref(x_359);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_382 = x_646;
+goto block_385;
+}
+}
+else
+{
+lean_dec(x_387);
+lean_dec_ref(x_359);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_382 = x_636;
+goto block_385;
+}
+}
+}
+block_415:
+{
+lean_object* x_406; lean_object* x_407; uint8_t x_408; uint8_t x_409; uint8_t x_410; lean_object* x_411; 
+x_406 = l_Lean_instantiateMVars___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__0___redArg(x_389, x_402);
+x_407 = lean_ctor_get(x_406, 0);
+lean_inc(x_407);
+lean_dec_ref(x_406);
+x_408 = 0;
+x_409 = lean_unbox(x_387);
+x_410 = lean_unbox(x_387);
+lean_dec(x_387);
+x_411 = l_Lean_Meta_mkLambdaFVars(x_392, x_407, x_388, x_409, x_388, x_410, x_408, x_401, x_402, x_403, x_404);
+lean_dec_ref(x_392);
+if (lean_obj_tag(x_411) == 0)
+{
+lean_object* x_412; lean_object* x_413; 
+x_412 = lean_ctor_get(x_411, 0);
+lean_inc(x_412);
+lean_dec_ref(x_411);
+x_413 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_359, x_412, x_391, x_390, x_393, x_394, x_395, x_396, x_397, x_398, x_399, x_400, x_401, x_402, x_403, x_404);
+lean_dec(x_391);
+x_382 = x_413;
+goto block_385;
+}
+else
+{
+lean_object* x_414; 
+lean_dec(x_404);
+lean_dec_ref(x_403);
+lean_dec(x_402);
+lean_dec_ref(x_401);
+lean_dec(x_400);
+lean_dec_ref(x_399);
+lean_dec(x_398);
+lean_dec_ref(x_397);
+lean_dec(x_396);
+lean_dec(x_395);
+lean_dec(x_394);
+lean_dec_ref(x_393);
+lean_dec(x_391);
+lean_dec(x_390);
+lean_dec_ref(x_359);
+x_414 = lean_ctor_get(x_411, 0);
+lean_inc(x_414);
+lean_dec_ref(x_411);
+x_365 = x_414;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+block_464:
+{
+lean_object* x_436; lean_object* x_437; size_t x_438; lean_object* x_439; 
+x_436 = lean_box(0);
+x_437 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_437, 0, x_436);
+lean_ctor_set(x_437, 1, x_431);
+x_438 = lean_array_size(x_434);
+lean_inc(x_425);
+lean_inc_ref(x_428);
+lean_inc(x_429);
+lean_inc_ref(x_423);
+x_439 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg(x_434, x_438, x_417, x_437, x_423, x_429, x_428, x_425);
+if (lean_obj_tag(x_439) == 0)
+{
+lean_object* x_440; lean_object* x_441; lean_object* x_442; 
+x_440 = lean_ctor_get(x_439, 0);
+lean_inc(x_440);
+lean_dec_ref(x_439);
+x_441 = lean_ctor_get(x_440, 0);
+lean_inc(x_441);
+if (lean_is_exclusive(x_440)) {
+ lean_ctor_release(x_440, 0);
+ lean_ctor_release(x_440, 1);
+ x_442 = x_440;
+} else {
+ lean_dec_ref(x_440);
+ x_442 = lean_box(0);
+}
+if (lean_obj_tag(x_441) == 0)
+{
+lean_dec(x_442);
+x_388 = x_416;
+x_389 = x_418;
+x_390 = x_430;
+x_391 = x_420;
+x_392 = x_434;
+x_393 = x_426;
+x_394 = x_424;
+x_395 = x_432;
+x_396 = x_422;
+x_397 = x_427;
+x_398 = x_433;
+x_399 = x_419;
+x_400 = x_421;
+x_401 = x_423;
+x_402 = x_429;
+x_403 = x_428;
+x_404 = x_425;
+x_405 = lean_box(0);
+goto block_415;
+}
+else
+{
+lean_object* x_443; 
+x_443 = lean_ctor_get(x_441, 0);
+lean_inc(x_443);
+lean_dec_ref(x_441);
+if (lean_obj_tag(x_443) == 1)
+{
+lean_object* x_444; lean_object* x_445; 
+x_444 = lean_ctor_get(x_443, 0);
+lean_inc(x_444);
+lean_dec_ref(x_443);
+x_445 = l_Lean_Meta_Grind_getConfig___redArg(x_427);
+if (lean_obj_tag(x_445) == 0)
+{
+lean_object* x_446; uint8_t x_447; 
+x_446 = lean_ctor_get(x_445, 0);
+lean_inc(x_446);
+lean_dec_ref(x_445);
+x_447 = lean_ctor_get_uint8(x_446, sizeof(void*)*11 + 14);
+lean_dec(x_446);
+if (x_447 == 0)
+{
+lean_dec(x_444);
+lean_dec(x_442);
+x_388 = x_416;
+x_389 = x_418;
+x_390 = x_430;
+x_391 = x_420;
+x_392 = x_434;
+x_393 = x_426;
+x_394 = x_424;
+x_395 = x_432;
+x_396 = x_422;
+x_397 = x_427;
+x_398 = x_433;
+x_399 = x_419;
+x_400 = x_421;
+x_401 = x_423;
+x_402 = x_429;
+x_403 = x_428;
+x_404 = x_425;
+x_405 = lean_box(0);
+goto block_415;
+}
+else
+{
+lean_object* x_448; lean_object* x_449; uint8_t x_450; 
+x_448 = lean_ctor_get(x_428, 2);
+x_449 = l_Lean_Meta_Grind_grind_debug;
+x_450 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_448, x_449);
+if (x_450 == 0)
+{
+lean_dec(x_444);
+lean_dec(x_442);
+x_388 = x_416;
+x_389 = x_418;
+x_390 = x_430;
+x_391 = x_420;
+x_392 = x_434;
+x_393 = x_426;
+x_394 = x_424;
+x_395 = x_432;
+x_396 = x_422;
+x_397 = x_427;
+x_398 = x_433;
+x_399 = x_419;
+x_400 = x_421;
+x_401 = x_423;
+x_402 = x_429;
+x_403 = x_428;
+x_404 = x_425;
+x_405 = lean_box(0);
+goto block_415;
+}
+else
+{
+lean_object* x_451; 
+lean_inc(x_425);
+lean_inc_ref(x_428);
+lean_inc(x_429);
+lean_inc_ref(x_423);
+x_451 = lean_infer_type(x_444, x_423, x_429, x_428, x_425);
+if (lean_obj_tag(x_451) == 0)
+{
+lean_object* x_452; lean_object* x_453; lean_object* x_454; lean_object* x_455; lean_object* x_456; lean_object* x_457; lean_object* x_458; lean_object* x_459; lean_object* x_460; 
+x_452 = lean_ctor_get(x_451, 0);
+lean_inc(x_452);
+lean_dec_ref(x_451);
+x_453 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
+lean_inc_ref(x_363);
+x_454 = l_Lean_Meta_Grind_Origin_pp(x_363);
+if (lean_is_scalar(x_442)) {
+ x_455 = lean_alloc_ctor(7, 2, 0);
+} else {
+ x_455 = x_442;
+ lean_ctor_set_tag(x_455, 7);
+}
+lean_ctor_set(x_455, 0, x_453);
+lean_ctor_set(x_455, 1, x_454);
+x_456 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3;
+x_457 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_457, 0, x_455);
+lean_ctor_set(x_457, 1, x_456);
+x_458 = l_Lean_indentExpr(x_452);
+x_459 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_459, 0, x_457);
+lean_ctor_set(x_459, 1, x_458);
+x_460 = l_Lean_Meta_Grind_reportIssue(x_459, x_422, x_427, x_433, x_419, x_421, x_423, x_429, x_428, x_425);
+if (lean_obj_tag(x_460) == 0)
+{
+lean_dec_ref(x_460);
+x_388 = x_416;
+x_389 = x_418;
+x_390 = x_430;
+x_391 = x_420;
+x_392 = x_434;
+x_393 = x_426;
+x_394 = x_424;
+x_395 = x_432;
+x_396 = x_422;
+x_397 = x_427;
+x_398 = x_433;
+x_399 = x_419;
+x_400 = x_421;
+x_401 = x_423;
+x_402 = x_429;
+x_403 = x_428;
+x_404 = x_425;
+x_405 = lean_box(0);
+goto block_415;
+}
+else
+{
+lean_dec_ref(x_434);
 lean_dec(x_433);
-if (x_434 == 0)
-{
-lean_dec(x_431);
-lean_dec(x_429);
-x_377 = x_405;
-x_378 = x_415;
-x_379 = x_418;
-x_380 = x_409;
-x_381 = x_421;
-x_382 = x_408;
-x_383 = x_413;
-x_384 = x_406;
-x_385 = x_416;
-x_386 = x_420;
-x_387 = x_412;
-x_388 = x_417;
-x_389 = x_410;
-x_390 = x_407;
-x_391 = x_414;
-x_392 = x_419;
-x_393 = x_411;
-x_394 = lean_box(0);
-goto block_404;
-}
-else
-{
-lean_object* x_435; lean_object* x_436; uint8_t x_437; 
-x_435 = lean_ctor_get(x_419, 2);
-x_436 = l_Lean_Meta_Grind_grind_debug;
-x_437 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_435, x_436);
-if (x_437 == 0)
-{
-lean_dec(x_431);
-lean_dec(x_429);
-x_377 = x_405;
-x_378 = x_415;
-x_379 = x_418;
-x_380 = x_409;
-x_381 = x_421;
-x_382 = x_408;
-x_383 = x_413;
-x_384 = x_406;
-x_385 = x_416;
-x_386 = x_420;
-x_387 = x_412;
-x_388 = x_417;
-x_389 = x_410;
-x_390 = x_407;
-x_391 = x_414;
-x_392 = x_419;
-x_393 = x_411;
-x_394 = lean_box(0);
-goto block_404;
-}
-else
-{
-lean_object* x_438; 
-lean_inc(x_411);
-lean_inc_ref(x_419);
-lean_inc(x_414);
-lean_inc_ref(x_407);
-x_438 = lean_infer_type(x_431, x_407, x_414, x_419, x_411);
-if (lean_obj_tag(x_438) == 0)
-{
-lean_object* x_439; lean_object* x_440; lean_object* x_441; lean_object* x_442; lean_object* x_443; lean_object* x_444; lean_object* x_445; lean_object* x_446; lean_object* x_447; 
-x_439 = lean_ctor_get(x_438, 0);
-lean_inc(x_439);
-lean_dec_ref(x_438);
-x_440 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1;
-lean_inc_ref(x_352);
-x_441 = l_Lean_Meta_Grind_Origin_pp(x_352);
-if (lean_is_scalar(x_429)) {
- x_442 = lean_alloc_ctor(7, 2, 0);
-} else {
- x_442 = x_429;
- lean_ctor_set_tag(x_442, 7);
-}
-lean_ctor_set(x_442, 0, x_440);
-lean_ctor_set(x_442, 1, x_441);
-x_443 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3;
-x_444 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_444, 0, x_442);
-lean_ctor_set(x_444, 1, x_443);
-x_445 = l_Lean_indentExpr(x_439);
-x_446 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_446, 0, x_444);
-lean_ctor_set(x_446, 1, x_445);
-x_447 = l_Lean_Meta_Grind_reportIssue(x_446, x_416, x_420, x_412, x_417, x_410, x_407, x_414, x_419, x_411);
-if (lean_obj_tag(x_447) == 0)
-{
-lean_dec_ref(x_447);
-x_377 = x_405;
-x_378 = x_415;
-x_379 = x_418;
-x_380 = x_409;
-x_381 = x_421;
-x_382 = x_408;
-x_383 = x_413;
-x_384 = x_406;
-x_385 = x_416;
-x_386 = x_420;
-x_387 = x_412;
-x_388 = x_417;
-x_389 = x_410;
-x_390 = x_407;
-x_391 = x_414;
-x_392 = x_419;
-x_393 = x_411;
-x_394 = lean_box(0);
-goto block_404;
-}
-else
-{
-lean_dec_ref(x_421);
-lean_dec_ref(x_420);
-lean_dec_ref(x_419);
-lean_dec_ref(x_418);
-lean_dec_ref(x_417);
-lean_dec(x_416);
-lean_dec(x_415);
-lean_dec(x_414);
-lean_dec(x_413);
-lean_dec(x_412);
-lean_dec(x_411);
-lean_dec(x_410);
-lean_dec_ref(x_408);
-lean_dec_ref(x_407);
-lean_dec(x_406);
-lean_dec(x_405);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_371 = x_447;
-goto block_374;
-}
-}
-else
-{
-lean_object* x_448; 
-lean_dec(x_429);
-lean_dec_ref(x_421);
-lean_dec_ref(x_420);
-lean_dec_ref(x_419);
-lean_dec_ref(x_418);
-lean_dec_ref(x_417);
-lean_dec(x_416);
-lean_dec(x_415);
-lean_dec(x_414);
-lean_dec(x_413);
-lean_dec(x_412);
-lean_dec(x_411);
-lean_dec(x_410);
-lean_dec_ref(x_408);
-lean_dec_ref(x_407);
-lean_dec(x_406);
-lean_dec(x_405);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_448 = lean_ctor_get(x_438, 0);
-lean_inc(x_448);
-lean_dec_ref(x_438);
-x_354 = x_448;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-}
-}
-else
-{
-lean_object* x_449; 
-lean_dec(x_431);
-lean_dec(x_429);
-lean_dec_ref(x_421);
-lean_dec_ref(x_420);
-lean_dec_ref(x_419);
-lean_dec_ref(x_418);
-lean_dec_ref(x_417);
-lean_dec(x_416);
-lean_dec(x_415);
-lean_dec(x_414);
-lean_dec(x_413);
-lean_dec(x_412);
-lean_dec(x_411);
-lean_dec(x_410);
-lean_dec_ref(x_408);
-lean_dec_ref(x_407);
-lean_dec(x_406);
-lean_dec(x_405);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_449 = lean_ctor_get(x_432, 0);
-lean_inc(x_449);
-lean_dec_ref(x_432);
-x_354 = x_449;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-else
-{
+lean_dec(x_432);
 lean_dec(x_430);
 lean_dec(x_429);
-x_377 = x_405;
-x_378 = x_415;
-x_379 = x_418;
-x_380 = x_409;
-x_381 = x_421;
-x_382 = x_408;
-x_383 = x_413;
-x_384 = x_406;
-x_385 = x_416;
-x_386 = x_420;
-x_387 = x_412;
-x_388 = x_417;
-x_389 = x_410;
-x_390 = x_407;
-x_391 = x_414;
-x_392 = x_419;
-x_393 = x_411;
-x_394 = lean_box(0);
-goto block_404;
-}
-}
-}
-else
-{
-lean_object* x_450; 
-lean_dec_ref(x_421);
-lean_dec_ref(x_420);
+lean_dec_ref(x_428);
+lean_dec_ref(x_427);
+lean_dec_ref(x_426);
+lean_dec(x_425);
+lean_dec(x_424);
+lean_dec_ref(x_423);
+lean_dec(x_422);
+lean_dec(x_421);
+lean_dec(x_420);
 lean_dec_ref(x_419);
 lean_dec_ref(x_418);
-lean_dec_ref(x_417);
-lean_dec(x_416);
-lean_dec(x_415);
-lean_dec(x_414);
-lean_dec(x_413);
-lean_dec(x_412);
-lean_dec(x_411);
-lean_dec(x_410);
-lean_dec_ref(x_408);
-lean_dec_ref(x_407);
-lean_dec(x_406);
-lean_dec(x_405);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_450 = lean_ctor_get(x_426, 0);
-lean_inc(x_450);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_382 = x_460;
+goto block_385;
+}
+}
+else
+{
+lean_object* x_461; 
+lean_dec(x_442);
+lean_dec_ref(x_434);
+lean_dec(x_433);
+lean_dec(x_432);
+lean_dec(x_430);
+lean_dec(x_429);
+lean_dec_ref(x_428);
+lean_dec_ref(x_427);
 lean_dec_ref(x_426);
-x_354 = x_450;
-x_355 = lean_box(0);
-goto block_360;
+lean_dec(x_425);
+lean_dec(x_424);
+lean_dec_ref(x_423);
+lean_dec(x_422);
+lean_dec(x_421);
+lean_dec(x_420);
+lean_dec_ref(x_419);
+lean_dec_ref(x_418);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_461 = lean_ctor_get(x_451, 0);
+lean_inc(x_461);
+lean_dec_ref(x_451);
+x_365 = x_461;
+x_366 = lean_box(0);
+goto block_371;
 }
 }
-block_471:
-{
-if (lean_obj_tag(x_468) == 0)
-{
-lean_object* x_469; 
-x_469 = lean_ctor_get(x_468, 0);
-lean_inc(x_469);
-lean_dec_ref(x_468);
-x_405 = x_452;
-x_406 = x_453;
-x_407 = x_454;
-x_408 = x_455;
-x_409 = x_456;
-x_410 = x_457;
-x_411 = x_458;
-x_412 = x_459;
-x_413 = x_460;
-x_414 = x_461;
-x_415 = x_462;
-x_416 = x_463;
-x_417 = x_464;
-x_418 = x_465;
-x_419 = x_467;
-x_420 = x_466;
-x_421 = x_469;
-x_422 = lean_box(0);
-goto block_451;
-}
-else
-{
-lean_object* x_470; 
-lean_dec_ref(x_467);
-lean_dec_ref(x_466);
-lean_dec_ref(x_465);
-lean_dec_ref(x_464);
-lean_dec(x_463);
-lean_dec(x_462);
-lean_dec(x_461);
-lean_dec(x_460);
-lean_dec(x_459);
-lean_dec(x_458);
-lean_dec(x_457);
-lean_dec_ref(x_455);
-lean_dec_ref(x_454);
-lean_dec(x_453);
-lean_dec(x_452);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_470 = lean_ctor_get(x_468, 0);
-lean_inc(x_470);
-lean_dec_ref(x_468);
-x_354 = x_470;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-block_508:
-{
-if (lean_obj_tag(x_490) == 0)
-{
-lean_object* x_491; uint8_t x_492; 
-x_491 = lean_ctor_get(x_490, 0);
-lean_inc(x_491);
-lean_dec_ref(x_490);
-x_492 = lean_unbox(x_491);
-if (x_492 == 0)
-{
-lean_object* x_493; uint8_t x_494; 
-x_493 = lean_mk_empty_array_with_capacity(x_475);
-x_494 = lean_nat_dec_lt(x_475, x_474);
-if (x_494 == 0)
-{
-uint8_t x_495; 
-lean_dec(x_474);
-lean_dec_ref(x_472);
-x_495 = lean_unbox(x_491);
-lean_dec(x_491);
-x_405 = x_473;
-x_406 = x_476;
-x_407 = x_477;
-x_408 = x_478;
-x_409 = x_495;
-x_410 = x_479;
-x_411 = x_480;
-x_412 = x_481;
-x_413 = x_482;
-x_414 = x_483;
-x_415 = x_484;
-x_416 = x_485;
-x_417 = x_486;
-x_418 = x_487;
-x_419 = x_489;
-x_420 = x_488;
-x_421 = x_493;
-x_422 = lean_box(0);
-goto block_451;
-}
-else
-{
-uint8_t x_496; 
-x_496 = lean_nat_dec_le(x_474, x_474);
-if (x_496 == 0)
-{
-if (x_494 == 0)
-{
-uint8_t x_497; 
-lean_dec(x_474);
-lean_dec_ref(x_472);
-x_497 = lean_unbox(x_491);
-lean_dec(x_491);
-x_405 = x_473;
-x_406 = x_476;
-x_407 = x_477;
-x_408 = x_478;
-x_409 = x_497;
-x_410 = x_479;
-x_411 = x_480;
-x_412 = x_481;
-x_413 = x_482;
-x_414 = x_483;
-x_415 = x_484;
-x_416 = x_485;
-x_417 = x_486;
-x_418 = x_487;
-x_419 = x_489;
-x_420 = x_488;
-x_421 = x_493;
-x_422 = lean_box(0);
-goto block_451;
-}
-else
-{
-size_t x_498; size_t x_499; lean_object* x_500; uint8_t x_501; 
-x_498 = 0;
-x_499 = lean_usize_of_nat(x_474);
-lean_dec(x_474);
-x_500 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(x_472, x_498, x_499, x_493, x_478, x_482, x_476, x_485, x_488, x_481, x_486, x_479, x_477, x_483, x_489, x_480);
-lean_dec_ref(x_472);
-x_501 = lean_unbox(x_491);
-lean_dec(x_491);
-x_452 = x_473;
-x_453 = x_476;
-x_454 = x_477;
-x_455 = x_478;
-x_456 = x_501;
-x_457 = x_479;
-x_458 = x_480;
-x_459 = x_481;
-x_460 = x_482;
-x_461 = x_483;
-x_462 = x_484;
-x_463 = x_485;
-x_464 = x_486;
-x_465 = x_487;
-x_466 = x_488;
-x_467 = x_489;
-x_468 = x_500;
-goto block_471;
-}
-}
-else
-{
-size_t x_502; size_t x_503; lean_object* x_504; uint8_t x_505; 
-x_502 = 0;
-x_503 = lean_usize_of_nat(x_474);
-lean_dec(x_474);
-x_504 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(x_472, x_502, x_503, x_493, x_478, x_482, x_476, x_485, x_488, x_481, x_486, x_479, x_477, x_483, x_489, x_480);
-lean_dec_ref(x_472);
-x_505 = lean_unbox(x_491);
-lean_dec(x_491);
-x_452 = x_473;
-x_453 = x_476;
-x_454 = x_477;
-x_455 = x_478;
-x_456 = x_505;
-x_457 = x_479;
-x_458 = x_480;
-x_459 = x_481;
-x_460 = x_482;
-x_461 = x_483;
-x_462 = x_484;
-x_463 = x_485;
-x_464 = x_486;
-x_465 = x_487;
-x_466 = x_488;
-x_467 = x_489;
-x_468 = x_504;
-goto block_471;
-}
 }
 }
 else
 {
-lean_object* x_506; 
-lean_dec(x_491);
+lean_object* x_462; 
+lean_dec(x_444);
+lean_dec(x_442);
+lean_dec_ref(x_434);
+lean_dec(x_433);
+lean_dec(x_432);
+lean_dec(x_430);
+lean_dec(x_429);
+lean_dec_ref(x_428);
+lean_dec_ref(x_427);
+lean_dec_ref(x_426);
+lean_dec(x_425);
+lean_dec(x_424);
+lean_dec_ref(x_423);
+lean_dec(x_422);
+lean_dec(x_421);
+lean_dec(x_420);
+lean_dec_ref(x_419);
+lean_dec_ref(x_418);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_462 = lean_ctor_get(x_445, 0);
+lean_inc(x_462);
+lean_dec_ref(x_445);
+x_365 = x_462;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+else
+{
+lean_dec(x_443);
+lean_dec(x_442);
+x_388 = x_416;
+x_389 = x_418;
+x_390 = x_430;
+x_391 = x_420;
+x_392 = x_434;
+x_393 = x_426;
+x_394 = x_424;
+x_395 = x_432;
+x_396 = x_422;
+x_397 = x_427;
+x_398 = x_433;
+x_399 = x_419;
+x_400 = x_421;
+x_401 = x_423;
+x_402 = x_429;
+x_403 = x_428;
+x_404 = x_425;
+x_405 = lean_box(0);
+goto block_415;
+}
+}
+}
+else
+{
+lean_object* x_463; 
+lean_dec_ref(x_434);
+lean_dec(x_433);
+lean_dec(x_432);
+lean_dec(x_430);
+lean_dec(x_429);
+lean_dec_ref(x_428);
+lean_dec_ref(x_427);
+lean_dec_ref(x_426);
+lean_dec(x_425);
+lean_dec(x_424);
+lean_dec_ref(x_423);
+lean_dec(x_422);
+lean_dec(x_421);
+lean_dec(x_420);
+lean_dec_ref(x_419);
+lean_dec_ref(x_418);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_463 = lean_ctor_get(x_439, 0);
+lean_inc(x_463);
+lean_dec_ref(x_439);
+x_365 = x_463;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+block_486:
+{
+if (lean_obj_tag(x_483) == 0)
+{
+lean_object* x_484; 
+x_484 = lean_ctor_get(x_483, 0);
+lean_inc(x_484);
+lean_dec_ref(x_483);
+x_416 = x_465;
+x_417 = x_466;
+x_418 = x_467;
+x_419 = x_468;
+x_420 = x_469;
+x_421 = x_470;
+x_422 = x_471;
+x_423 = x_472;
+x_424 = x_473;
+x_425 = x_474;
+x_426 = x_475;
+x_427 = x_476;
+x_428 = x_479;
+x_429 = x_478;
+x_430 = x_477;
+x_431 = x_481;
+x_432 = x_480;
+x_433 = x_482;
+x_434 = x_484;
+x_435 = lean_box(0);
+goto block_464;
+}
+else
+{
+lean_object* x_485; 
+lean_dec(x_482);
+lean_dec(x_480);
+lean_dec_ref(x_479);
+lean_dec(x_478);
+lean_dec(x_477);
+lean_dec_ref(x_476);
+lean_dec_ref(x_475);
 lean_dec(x_474);
-lean_dec_ref(x_472);
-lean_dec(x_376);
-x_506 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_348, x_487, x_473, x_484, x_478, x_482, x_476, x_485, x_488, x_481, x_486, x_479, x_477, x_483, x_489, x_480);
 lean_dec(x_473);
-x_371 = x_506;
-goto block_374;
+lean_dec_ref(x_472);
+lean_dec(x_471);
+lean_dec(x_470);
+lean_dec(x_469);
+lean_dec_ref(x_468);
+lean_dec_ref(x_467);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_485 = lean_ctor_get(x_483, 0);
+lean_inc(x_485);
+lean_dec_ref(x_483);
+x_365 = x_485;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+block_523:
+{
+if (lean_obj_tag(x_507) == 0)
+{
+lean_object* x_508; uint8_t x_509; 
+x_508 = lean_ctor_get(x_507, 0);
+lean_inc(x_508);
+lean_dec_ref(x_507);
+x_509 = lean_unbox(x_508);
+if (x_509 == 0)
+{
+lean_object* x_510; uint8_t x_511; 
+x_510 = lean_mk_empty_array_with_capacity(x_490);
+x_511 = lean_nat_dec_lt(x_490, x_492);
+if (x_511 == 0)
+{
+uint8_t x_512; 
+lean_dec(x_492);
+lean_dec_ref(x_491);
+x_512 = lean_unbox(x_508);
+lean_dec(x_508);
+x_416 = x_512;
+x_417 = x_487;
+x_418 = x_488;
+x_419 = x_489;
+x_420 = x_493;
+x_421 = x_494;
+x_422 = x_495;
+x_423 = x_496;
+x_424 = x_497;
+x_425 = x_498;
+x_426 = x_499;
+x_427 = x_500;
+x_428 = x_502;
+x_429 = x_503;
+x_430 = x_501;
+x_431 = x_505;
+x_432 = x_504;
+x_433 = x_506;
+x_434 = x_510;
+x_435 = lean_box(0);
+goto block_464;
+}
+else
+{
+uint8_t x_513; 
+x_513 = lean_nat_dec_le(x_492, x_492);
+if (x_513 == 0)
+{
+if (x_511 == 0)
+{
+uint8_t x_514; 
+lean_dec(x_492);
+lean_dec_ref(x_491);
+x_514 = lean_unbox(x_508);
+lean_dec(x_508);
+x_416 = x_514;
+x_417 = x_487;
+x_418 = x_488;
+x_419 = x_489;
+x_420 = x_493;
+x_421 = x_494;
+x_422 = x_495;
+x_423 = x_496;
+x_424 = x_497;
+x_425 = x_498;
+x_426 = x_499;
+x_427 = x_500;
+x_428 = x_502;
+x_429 = x_503;
+x_430 = x_501;
+x_431 = x_505;
+x_432 = x_504;
+x_433 = x_506;
+x_434 = x_510;
+x_435 = lean_box(0);
+goto block_464;
+}
+else
+{
+size_t x_515; lean_object* x_516; uint8_t x_517; 
+x_515 = lean_usize_of_nat(x_492);
+lean_dec(x_492);
+x_516 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_491, x_487, x_515, x_510, x_499, x_497, x_504, x_495, x_500, x_506, x_489, x_494, x_496, x_503, x_502, x_498);
+lean_dec_ref(x_491);
+x_517 = lean_unbox(x_508);
+lean_dec(x_508);
+x_465 = x_517;
+x_466 = x_487;
+x_467 = x_488;
+x_468 = x_489;
+x_469 = x_493;
+x_470 = x_494;
+x_471 = x_495;
+x_472 = x_496;
+x_473 = x_497;
+x_474 = x_498;
+x_475 = x_499;
+x_476 = x_500;
+x_477 = x_501;
+x_478 = x_503;
+x_479 = x_502;
+x_480 = x_504;
+x_481 = x_505;
+x_482 = x_506;
+x_483 = x_516;
+goto block_486;
 }
 }
 else
 {
-lean_object* x_507; 
+size_t x_518; lean_object* x_519; uint8_t x_520; 
+x_518 = lean_usize_of_nat(x_492);
+lean_dec(x_492);
+x_519 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_491, x_487, x_518, x_510, x_499, x_497, x_504, x_495, x_500, x_506, x_489, x_494, x_496, x_503, x_502, x_498);
+lean_dec_ref(x_491);
+x_520 = lean_unbox(x_508);
+lean_dec(x_508);
+x_465 = x_520;
+x_466 = x_487;
+x_467 = x_488;
+x_468 = x_489;
+x_469 = x_493;
+x_470 = x_494;
+x_471 = x_495;
+x_472 = x_496;
+x_473 = x_497;
+x_474 = x_498;
+x_475 = x_499;
+x_476 = x_500;
+x_477 = x_501;
+x_478 = x_503;
+x_479 = x_502;
+x_480 = x_504;
+x_481 = x_505;
+x_482 = x_506;
+x_483 = x_519;
+goto block_486;
+}
+}
+}
+else
+{
+lean_object* x_521; 
+lean_dec(x_508);
+lean_dec(x_492);
+lean_dec_ref(x_491);
+lean_dec(x_387);
+x_521 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance(x_359, x_488, x_493, x_501, x_499, x_497, x_504, x_495, x_500, x_506, x_489, x_494, x_496, x_503, x_502, x_498);
+lean_dec(x_493);
+x_382 = x_521;
+goto block_385;
+}
+}
+else
+{
+lean_object* x_522; 
+lean_dec(x_506);
+lean_dec(x_504);
+lean_dec(x_503);
+lean_dec_ref(x_502);
+lean_dec(x_501);
+lean_dec_ref(x_500);
+lean_dec_ref(x_499);
+lean_dec(x_498);
+lean_dec(x_497);
+lean_dec_ref(x_496);
+lean_dec(x_495);
+lean_dec(x_494);
+lean_dec(x_493);
+lean_dec(x_492);
+lean_dec_ref(x_491);
 lean_dec_ref(x_489);
 lean_dec_ref(x_488);
-lean_dec_ref(x_487);
-lean_dec_ref(x_486);
-lean_dec(x_485);
-lean_dec(x_484);
-lean_dec(x_483);
-lean_dec(x_482);
-lean_dec(x_481);
-lean_dec(x_480);
-lean_dec(x_479);
-lean_dec_ref(x_478);
-lean_dec_ref(x_477);
-lean_dec(x_476);
-lean_dec(x_474);
-lean_dec(x_473);
-lean_dec_ref(x_472);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_507 = lean_ctor_get(x_490, 0);
-lean_inc(x_507);
-lean_dec_ref(x_490);
-x_354 = x_507;
-x_355 = lean_box(0);
-goto block_360;
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_522 = lean_ctor_get(x_507, 0);
+lean_inc(x_522);
+lean_dec_ref(x_507);
+x_365 = x_522;
+x_366 = lean_box(0);
+goto block_371;
 }
 }
-block_561:
+block_583:
 {
-lean_object* x_526; 
-lean_inc(x_516);
-lean_inc_ref(x_524);
-lean_inc(x_520);
-lean_inc_ref(x_513);
-lean_inc(x_515);
-lean_inc_ref(x_522);
-lean_inc(x_517);
-lean_inc_ref(x_523);
-lean_inc(x_521);
-lean_inc(x_511);
-lean_inc(x_519);
-lean_inc_ref(x_514);
-x_526 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_applyAssignment(x_509, x_1, x_514, x_519, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-if (lean_obj_tag(x_526) == 0)
-{
-lean_object* x_527; lean_object* x_528; 
-x_527 = lean_ctor_get(x_526, 0);
-lean_inc(x_527);
-lean_dec_ref(x_526);
-x_528 = lean_ctor_get(x_527, 0);
-if (lean_obj_tag(x_528) == 1)
-{
-lean_object* x_529; lean_object* x_530; 
-x_529 = lean_ctor_get(x_527, 1);
-lean_inc(x_529);
-lean_dec(x_527);
-lean_inc(x_516);
-lean_inc_ref(x_524);
-lean_inc(x_520);
-lean_inc_ref(x_513);
-lean_inc_ref(x_514);
-x_530 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts(x_509, x_510, x_514, x_519, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-if (lean_obj_tag(x_530) == 0)
-{
-lean_object* x_531; 
-x_531 = lean_ctor_get(x_530, 0);
+lean_object* x_541; 
 lean_inc(x_531);
-lean_dec_ref(x_530);
-if (lean_obj_tag(x_531) == 1)
-{
-lean_object* x_532; lean_object* x_533; 
-lean_dec_ref(x_531);
-x_532 = lean_ctor_get(x_529, 1);
-lean_inc(x_532);
-lean_dec(x_529);
-lean_inc(x_516);
-lean_inc_ref(x_524);
-lean_inc(x_520);
-lean_inc_ref(x_513);
-lean_inc(x_515);
-lean_inc_ref(x_522);
-lean_inc(x_517);
-lean_inc_ref(x_523);
-lean_inc(x_521);
-lean_inc(x_511);
-lean_inc_ref(x_518);
-lean_inc_ref(x_348);
-x_533 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_checkConstraints(x_348, x_532, x_518, x_509, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-if (lean_obj_tag(x_533) == 0)
-{
-lean_object* x_534; uint8_t x_535; 
-x_534 = lean_ctor_get(x_533, 0);
-lean_inc(x_534);
-lean_dec_ref(x_533);
-x_535 = lean_unbox(x_534);
-if (x_535 == 0)
-{
-lean_object* x_536; 
-lean_dec(x_534);
-lean_dec(x_532);
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_536 = lean_box(0);
-x_361 = x_536;
-x_362 = lean_box(0);
-goto block_367;
-}
-else
-{
-lean_object* x_537; 
-lean_inc_ref(x_524);
-lean_inc_ref(x_518);
-lean_inc_ref(x_348);
-x_537 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards(x_348, x_518, x_509, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-if (lean_obj_tag(x_537) == 0)
-{
-lean_object* x_538; lean_object* x_539; lean_object* x_540; lean_object* x_541; uint8_t x_542; 
-x_538 = lean_ctor_get(x_537, 0);
+lean_inc_ref(x_537);
+lean_inc(x_536);
+lean_inc_ref(x_529);
+lean_inc(x_528);
+lean_inc_ref(x_525);
+lean_inc(x_539);
+lean_inc_ref(x_534);
+lean_inc(x_527);
 lean_inc(x_538);
-lean_dec_ref(x_537);
-x_539 = l_Lean_mkAppN(x_518, x_509);
-x_540 = lean_unsigned_to_nat(0u);
-x_541 = lean_array_get_size(x_509);
-x_542 = lean_nat_dec_lt(x_540, x_541);
-if (x_542 == 0)
+lean_inc(x_530);
+lean_inc_ref(x_532);
+x_541 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_applyAssignment(x_526, x_1, x_532, x_530, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+if (lean_obj_tag(x_541) == 0)
 {
-uint8_t x_543; lean_object* x_544; 
-x_543 = lean_unbox(x_534);
-lean_dec(x_534);
-x_544 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_543, x_525, x_525, x_514, x_519, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-x_472 = x_509;
-x_473 = x_532;
-x_474 = x_541;
-x_475 = x_540;
-x_476 = x_511;
-x_477 = x_513;
-x_478 = x_514;
-x_479 = x_515;
-x_480 = x_516;
-x_481 = x_517;
-x_482 = x_519;
-x_483 = x_520;
-x_484 = x_538;
-x_485 = x_521;
-x_486 = x_522;
-x_487 = x_539;
-x_488 = x_523;
-x_489 = x_524;
-x_490 = x_544;
-goto block_508;
-}
-else
+lean_object* x_542; lean_object* x_543; 
+x_542 = lean_ctor_get(x_541, 0);
+lean_inc(x_542);
+lean_dec_ref(x_541);
+x_543 = lean_ctor_get(x_542, 0);
+if (lean_obj_tag(x_543) == 1)
 {
-if (x_542 == 0)
+lean_object* x_544; lean_object* x_545; lean_object* x_546; lean_object* x_547; lean_object* x_548; size_t x_549; size_t x_550; lean_object* x_551; 
+x_544 = lean_ctor_get(x_542, 1);
+lean_inc(x_544);
+lean_dec(x_542);
+x_545 = lean_ctor_get(x_544, 1);
+lean_inc(x_545);
+x_546 = lean_ctor_get(x_544, 3);
+lean_inc_ref(x_546);
+lean_dec(x_544);
+x_547 = lean_box(0);
+x_548 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
+x_549 = lean_array_size(x_546);
+x_550 = 0;
+lean_inc(x_531);
+lean_inc_ref(x_537);
+lean_inc(x_536);
+lean_inc_ref(x_529);
+lean_inc_ref(x_359);
+x_551 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_526, x_359, x_546, x_549, x_550, x_548, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+lean_dec_ref(x_546);
+if (lean_obj_tag(x_551) == 0)
 {
-uint8_t x_545; lean_object* x_546; 
-x_545 = lean_unbox(x_534);
-lean_dec(x_534);
-x_546 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_545, x_525, x_525, x_514, x_519, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-x_472 = x_509;
-x_473 = x_532;
-x_474 = x_541;
-x_475 = x_540;
-x_476 = x_511;
-x_477 = x_513;
-x_478 = x_514;
-x_479 = x_515;
-x_480 = x_516;
-x_481 = x_517;
-x_482 = x_519;
-x_483 = x_520;
-x_484 = x_538;
-x_485 = x_521;
-x_486 = x_522;
-x_487 = x_539;
-x_488 = x_523;
-x_489 = x_524;
-x_490 = x_546;
-goto block_508;
-}
-else
+lean_object* x_552; lean_object* x_553; 
+x_552 = lean_ctor_get(x_551, 0);
+lean_inc(x_552);
+lean_dec_ref(x_551);
+x_553 = lean_ctor_get(x_552, 0);
+lean_inc(x_553);
+lean_dec(x_552);
+if (lean_obj_tag(x_553) == 0)
 {
-size_t x_547; size_t x_548; uint8_t x_549; lean_object* x_550; 
-x_547 = 0;
-x_548 = lean_usize_of_nat(x_541);
-x_549 = lean_unbox(x_534);
-x_550 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__4(x_549, x_525, x_509, x_547, x_548, x_514, x_519, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-if (lean_obj_tag(x_550) == 0)
-{
-lean_object* x_551; uint8_t x_552; uint8_t x_553; lean_object* x_554; 
-x_551 = lean_ctor_get(x_550, 0);
-lean_inc(x_551);
-lean_dec_ref(x_550);
-x_552 = lean_unbox(x_534);
-lean_dec(x_534);
-x_553 = lean_unbox(x_551);
-lean_dec(x_551);
-x_554 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_552, x_525, x_553, x_514, x_519, x_511, x_521, x_523, x_517, x_522, x_515, x_513, x_520, x_524, x_516);
-x_472 = x_509;
-x_473 = x_532;
-x_474 = x_541;
-x_475 = x_540;
-x_476 = x_511;
-x_477 = x_513;
-x_478 = x_514;
-x_479 = x_515;
-x_480 = x_516;
-x_481 = x_517;
-x_482 = x_519;
-x_483 = x_520;
-x_484 = x_538;
-x_485 = x_521;
-x_486 = x_522;
-x_487 = x_539;
-x_488 = x_523;
-x_489 = x_524;
-x_490 = x_554;
-goto block_508;
-}
-else
-{
-lean_dec(x_534);
-x_472 = x_509;
-x_473 = x_532;
-x_474 = x_541;
-x_475 = x_540;
-x_476 = x_511;
-x_477 = x_513;
-x_478 = x_514;
-x_479 = x_515;
-x_480 = x_516;
-x_481 = x_517;
-x_482 = x_519;
-x_483 = x_520;
-x_484 = x_538;
-x_485 = x_521;
-x_486 = x_522;
-x_487 = x_539;
-x_488 = x_523;
-x_489 = x_524;
-x_490 = x_550;
-goto block_508;
-}
-}
-}
-}
-else
+lean_object* x_554; 
+lean_inc(x_531);
+lean_inc_ref(x_537);
+lean_inc(x_536);
+lean_inc_ref(x_529);
+lean_inc_ref(x_532);
+x_554 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts(x_526, x_524, x_532, x_530, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+if (lean_obj_tag(x_554) == 0)
 {
 lean_object* x_555; 
-lean_dec(x_534);
-lean_dec(x_532);
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_555 = lean_ctor_get(x_537, 0);
+x_555 = lean_ctor_get(x_554, 0);
 lean_inc(x_555);
-lean_dec_ref(x_537);
-x_354 = x_555;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-}
-else
+lean_dec_ref(x_554);
+if (lean_obj_tag(x_555) == 1)
 {
 lean_object* x_556; 
-lean_dec(x_532);
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_556 = lean_ctor_get(x_533, 0);
-lean_inc(x_556);
+lean_dec_ref(x_555);
+lean_inc(x_531);
+lean_inc_ref(x_537);
+lean_inc(x_536);
+lean_inc_ref(x_529);
+lean_inc(x_528);
+lean_inc_ref(x_525);
+lean_inc(x_539);
+lean_inc_ref(x_534);
+lean_inc(x_527);
+lean_inc(x_538);
+lean_inc_ref(x_533);
+lean_inc_ref(x_359);
+x_556 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_checkConstraints(x_359, x_545, x_533, x_526, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+if (lean_obj_tag(x_556) == 0)
+{
+lean_object* x_557; uint8_t x_558; 
+x_557 = lean_ctor_get(x_556, 0);
+lean_inc(x_557);
+lean_dec_ref(x_556);
+x_558 = lean_unbox(x_557);
+if (x_558 == 0)
+{
+lean_dec(x_557);
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
 lean_dec_ref(x_533);
-x_354 = x_556;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-else
-{
-lean_object* x_557; 
+lean_dec_ref(x_532);
 lean_dec(x_531);
-lean_dec(x_529);
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_557 = lean_box(0);
-x_361 = x_557;
-x_362 = lean_box(0);
-goto block_367;
-}
-}
-else
-{
-lean_object* x_558; 
-lean_dec(x_529);
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_558 = lean_ctor_get(x_530, 0);
-lean_inc(x_558);
-lean_dec_ref(x_530);
-x_354 = x_558;
-x_355 = lean_box(0);
-goto block_360;
-}
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_372 = x_547;
+x_373 = lean_box(0);
+goto block_378;
 }
 else
 {
 lean_object* x_559; 
-lean_dec(x_527);
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_510);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_559 = lean_box(0);
-x_361 = x_559;
-x_362 = lean_box(0);
-goto block_367;
+lean_inc_ref(x_537);
+lean_inc_ref(x_533);
+lean_inc_ref(x_359);
+x_559 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards(x_359, x_533, x_526, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+if (lean_obj_tag(x_559) == 0)
+{
+lean_object* x_560; lean_object* x_561; lean_object* x_562; lean_object* x_563; uint8_t x_564; 
+x_560 = lean_ctor_get(x_559, 0);
+lean_inc(x_560);
+lean_dec_ref(x_559);
+x_561 = l_Lean_mkAppN(x_533, x_526);
+x_562 = lean_unsigned_to_nat(0u);
+x_563 = lean_array_get_size(x_526);
+x_564 = lean_nat_dec_lt(x_562, x_563);
+if (x_564 == 0)
+{
+uint8_t x_565; lean_object* x_566; 
+x_565 = lean_unbox(x_557);
+lean_dec(x_557);
+x_566 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_565, x_540, x_540, x_532, x_530, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+x_487 = x_550;
+x_488 = x_561;
+x_489 = x_525;
+x_490 = x_562;
+x_491 = x_526;
+x_492 = x_563;
+x_493 = x_545;
+x_494 = x_528;
+x_495 = x_527;
+x_496 = x_529;
+x_497 = x_530;
+x_498 = x_531;
+x_499 = x_532;
+x_500 = x_534;
+x_501 = x_560;
+x_502 = x_537;
+x_503 = x_536;
+x_504 = x_538;
+x_505 = x_547;
+x_506 = x_539;
+x_507 = x_566;
+goto block_523;
+}
+else
+{
+if (x_564 == 0)
+{
+uint8_t x_567; lean_object* x_568; 
+x_567 = lean_unbox(x_557);
+lean_dec(x_557);
+x_568 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_567, x_540, x_540, x_532, x_530, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+x_487 = x_550;
+x_488 = x_561;
+x_489 = x_525;
+x_490 = x_562;
+x_491 = x_526;
+x_492 = x_563;
+x_493 = x_545;
+x_494 = x_528;
+x_495 = x_527;
+x_496 = x_529;
+x_497 = x_530;
+x_498 = x_531;
+x_499 = x_532;
+x_500 = x_534;
+x_501 = x_560;
+x_502 = x_537;
+x_503 = x_536;
+x_504 = x_538;
+x_505 = x_547;
+x_506 = x_539;
+x_507 = x_568;
+goto block_523;
+}
+else
+{
+size_t x_569; uint8_t x_570; lean_object* x_571; 
+x_569 = lean_usize_of_nat(x_563);
+x_570 = lean_unbox(x_557);
+x_571 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__5(x_570, x_540, x_526, x_550, x_569, x_532, x_530, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+if (lean_obj_tag(x_571) == 0)
+{
+lean_object* x_572; uint8_t x_573; uint8_t x_574; lean_object* x_575; 
+x_572 = lean_ctor_get(x_571, 0);
+lean_inc(x_572);
+lean_dec_ref(x_571);
+x_573 = lean_unbox(x_557);
+lean_dec(x_557);
+x_574 = lean_unbox(x_572);
+lean_dec(x_572);
+x_575 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__1(x_573, x_540, x_574, x_532, x_530, x_538, x_527, x_534, x_539, x_525, x_528, x_529, x_536, x_537, x_531);
+x_487 = x_550;
+x_488 = x_561;
+x_489 = x_525;
+x_490 = x_562;
+x_491 = x_526;
+x_492 = x_563;
+x_493 = x_545;
+x_494 = x_528;
+x_495 = x_527;
+x_496 = x_529;
+x_497 = x_530;
+x_498 = x_531;
+x_499 = x_532;
+x_500 = x_534;
+x_501 = x_560;
+x_502 = x_537;
+x_503 = x_536;
+x_504 = x_538;
+x_505 = x_547;
+x_506 = x_539;
+x_507 = x_575;
+goto block_523;
+}
+else
+{
+lean_dec(x_557);
+x_487 = x_550;
+x_488 = x_561;
+x_489 = x_525;
+x_490 = x_562;
+x_491 = x_526;
+x_492 = x_563;
+x_493 = x_545;
+x_494 = x_528;
+x_495 = x_527;
+x_496 = x_529;
+x_497 = x_530;
+x_498 = x_531;
+x_499 = x_532;
+x_500 = x_534;
+x_501 = x_560;
+x_502 = x_537;
+x_503 = x_536;
+x_504 = x_538;
+x_505 = x_547;
+x_506 = x_539;
+x_507 = x_571;
+goto block_523;
+}
+}
 }
 }
 else
 {
-lean_object* x_560; 
-lean_dec_ref(x_524);
-lean_dec_ref(x_523);
-lean_dec_ref(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_519);
-lean_dec_ref(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec_ref(x_514);
-lean_dec_ref(x_513);
-lean_dec(x_511);
-lean_dec_ref(x_510);
-lean_dec_ref(x_509);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-x_560 = lean_ctor_get(x_526, 0);
-lean_inc(x_560);
+lean_object* x_576; 
+lean_dec(x_557);
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
 lean_dec_ref(x_526);
-x_354 = x_560;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-block_607:
-{
-lean_object* x_575; 
-lean_inc_ref(x_572);
-lean_inc_ref(x_348);
-x_575 = l_Lean_Meta_Grind_EMatchTheorem_getProofWithFreshMVarLevels(x_348, x_570, x_571, x_572, x_573);
-if (lean_obj_tag(x_575) == 0)
-{
-lean_object* x_576; lean_object* x_577; uint8_t x_578; 
-x_576 = lean_ctor_get(x_575, 0);
+lean_dec_ref(x_525);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_576 = lean_ctor_get(x_559, 0);
 lean_inc(x_576);
-lean_dec_ref(x_575);
-x_577 = lean_array_get_size(x_353);
-x_578 = lean_nat_dec_eq(x_577, x_351);
-if (x_578 == 0)
+lean_dec_ref(x_559);
+x_365 = x_576;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+}
+else
 {
-lean_object* x_579; lean_object* x_580; 
-lean_dec(x_576);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-lean_dec_ref(x_1);
-x_579 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__6;
-x_580 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__1(x_579, x_562, x_563, x_564, x_565, x_566, x_567, x_568, x_569, x_570, x_571, x_572, x_573);
-x_371 = x_580;
-goto block_374;
+lean_object* x_577; 
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_577 = lean_ctor_get(x_556, 0);
+lean_inc(x_577);
+lean_dec_ref(x_556);
+x_365 = x_577;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+else
+{
+lean_dec(x_555);
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_372 = x_547;
+x_373 = lean_box(0);
+goto block_378;
+}
+}
+else
+{
+lean_object* x_578; 
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_578 = lean_ctor_get(x_554, 0);
+lean_inc(x_578);
+lean_dec_ref(x_554);
+x_365 = x_578;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+else
+{
+lean_object* x_579; 
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec_ref(x_524);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_579 = lean_ctor_get(x_553, 0);
+lean_inc(x_579);
+lean_dec_ref(x_553);
+x_372 = x_579;
+x_373 = lean_box(0);
+goto block_378;
+}
+}
+else
+{
+lean_object* x_580; 
+lean_dec(x_545);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec_ref(x_524);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_580 = lean_ctor_get(x_551, 0);
+lean_inc(x_580);
+lean_dec_ref(x_551);
+x_365 = x_580;
+x_366 = lean_box(0);
+goto block_371;
+}
 }
 else
 {
 lean_object* x_581; 
-lean_inc(x_573);
-lean_inc_ref(x_572);
-lean_inc(x_571);
-lean_inc_ref(x_570);
-lean_inc(x_576);
-x_581 = lean_infer_type(x_576, x_570, x_571, x_572, x_573);
-if (lean_obj_tag(x_581) == 0)
+lean_dec(x_542);
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec_ref(x_524);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_581 = lean_box(0);
+x_372 = x_581;
+x_373 = lean_box(0);
+goto block_378;
+}
+}
+else
 {
-lean_object* x_582; uint8_t x_583; lean_object* x_584; 
-x_582 = lean_ctor_get(x_581, 0);
+lean_object* x_582; 
+lean_dec(x_539);
+lean_dec(x_538);
+lean_dec_ref(x_537);
+lean_dec(x_536);
+lean_dec_ref(x_534);
+lean_dec_ref(x_533);
+lean_dec_ref(x_532);
+lean_dec(x_531);
+lean_dec(x_530);
+lean_dec_ref(x_529);
+lean_dec(x_528);
+lean_dec(x_527);
+lean_dec_ref(x_526);
+lean_dec_ref(x_525);
+lean_dec_ref(x_524);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+x_582 = lean_ctor_get(x_541, 0);
 lean_inc(x_582);
-lean_dec_ref(x_581);
-x_583 = 0;
-lean_inc(x_573);
-lean_inc_ref(x_572);
-lean_inc(x_571);
-lean_inc_ref(x_570);
-lean_inc(x_351);
-x_584 = l_Lean_Meta_forallMetaBoundedTelescope(x_582, x_351, x_583, x_570, x_571, x_572, x_573);
-if (lean_obj_tag(x_584) == 0)
-{
-lean_object* x_585; lean_object* x_586; lean_object* x_587; lean_object* x_588; lean_object* x_589; lean_object* x_590; uint8_t x_591; 
-x_585 = lean_ctor_get(x_584, 0);
-lean_inc(x_585);
-lean_dec_ref(x_584);
-x_586 = lean_ctor_get(x_585, 1);
-lean_inc(x_586);
-x_587 = lean_ctor_get(x_585, 0);
-lean_inc(x_587);
-lean_dec(x_585);
-x_588 = lean_ctor_get(x_586, 0);
-lean_inc(x_588);
-if (lean_is_exclusive(x_586)) {
- lean_ctor_release(x_586, 0);
- lean_ctor_release(x_586, 1);
- x_589 = x_586;
-} else {
- lean_dec_ref(x_586);
- x_589 = lean_box(0);
+lean_dec_ref(x_541);
+x_365 = x_582;
+x_366 = lean_box(0);
+goto block_371;
 }
-x_590 = lean_array_get_size(x_587);
-x_591 = lean_nat_dec_eq(x_590, x_351);
-if (x_591 == 0)
+}
+block_629:
 {
-if (x_578 == 0)
+lean_object* x_597; 
+lean_inc_ref(x_594);
+lean_inc_ref(x_359);
+x_597 = l_Lean_Meta_Grind_EMatchTheorem_getProofWithFreshMVarLevels(x_359, x_592, x_593, x_594, x_595);
+if (lean_obj_tag(x_597) == 0)
 {
-lean_dec(x_589);
-x_509 = x_587;
-x_510 = x_588;
-x_511 = x_564;
-x_512 = lean_box(0);
-x_513 = x_570;
-x_514 = x_562;
-x_515 = x_569;
-x_516 = x_573;
-x_517 = x_567;
-x_518 = x_576;
-x_519 = x_563;
-x_520 = x_571;
-x_521 = x_565;
-x_522 = x_568;
-x_523 = x_566;
-x_524 = x_572;
-x_525 = x_578;
-goto block_561;
+lean_object* x_598; lean_object* x_599; uint8_t x_600; 
+x_598 = lean_ctor_get(x_597, 0);
+lean_inc(x_598);
+lean_dec_ref(x_597);
+x_599 = lean_array_get_size(x_364);
+x_600 = lean_nat_dec_eq(x_599, x_362);
+if (x_600 == 0)
+{
+lean_object* x_601; lean_object* x_602; 
+lean_dec(x_598);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+lean_dec_ref(x_1);
+x_601 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__6;
+x_602 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__1(x_601, x_584, x_585, x_586, x_587, x_588, x_589, x_590, x_591, x_592, x_593, x_594, x_595);
+x_382 = x_602;
+goto block_385;
 }
 else
 {
-lean_object* x_592; 
-lean_dec(x_588);
-lean_dec(x_587);
-lean_dec(x_576);
-lean_dec(x_564);
-lean_dec(x_563);
-lean_dec_ref(x_562);
-lean_dec(x_376);
-lean_inc_ref(x_352);
-lean_dec_ref(x_348);
-lean_dec_ref(x_1);
-x_592 = l_Lean_Meta_Grind_getConfig___redArg(x_566);
-if (lean_obj_tag(x_592) == 0)
-{
-lean_object* x_593; uint8_t x_594; 
-x_593 = lean_ctor_get(x_592, 0);
+lean_object* x_603; 
+lean_inc(x_595);
+lean_inc_ref(x_594);
 lean_inc(x_593);
-lean_dec_ref(x_592);
-x_594 = lean_ctor_get_uint8(x_593, sizeof(void*)*11 + 14);
-lean_dec(x_593);
-if (x_594 == 0)
+lean_inc_ref(x_592);
+lean_inc(x_598);
+x_603 = lean_infer_type(x_598, x_592, x_593, x_594, x_595);
+if (lean_obj_tag(x_603) == 0)
 {
-lean_dec(x_589);
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-lean_dec_ref(x_352);
-x_368 = lean_box(0);
-goto block_370;
-}
-else
-{
-lean_object* x_595; lean_object* x_596; uint8_t x_597; 
-x_595 = lean_ctor_get(x_572, 2);
-x_596 = l_Lean_Meta_Grind_grind_debug;
-x_597 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_595, x_596);
-if (x_597 == 0)
-{
-lean_dec(x_589);
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-lean_dec_ref(x_352);
-x_368 = lean_box(0);
-goto block_370;
-}
-else
-{
-lean_object* x_598; lean_object* x_599; lean_object* x_600; lean_object* x_601; 
-x_598 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__8;
-x_599 = l_Lean_Meta_Grind_Origin_pp(x_352);
-if (lean_is_scalar(x_589)) {
- x_600 = lean_alloc_ctor(7, 2, 0);
-} else {
- x_600 = x_589;
- lean_ctor_set_tag(x_600, 7);
-}
-lean_ctor_set(x_600, 0, x_598);
-lean_ctor_set(x_600, 1, x_599);
-x_601 = l_Lean_Meta_Grind_reportIssue(x_600, x_565, x_566, x_567, x_568, x_569, x_570, x_571, x_572, x_573);
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-if (lean_obj_tag(x_601) == 0)
-{
-lean_dec_ref(x_601);
-x_368 = lean_box(0);
-goto block_370;
-}
-else
-{
-x_371 = x_601;
-goto block_374;
-}
-}
-}
-}
-else
-{
-lean_object* x_602; 
-lean_dec(x_589);
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-lean_dec_ref(x_352);
-x_602 = lean_ctor_get(x_592, 0);
-lean_inc(x_602);
-lean_dec_ref(x_592);
-x_354 = x_602;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-}
-else
-{
-uint8_t x_603; 
-lean_dec(x_589);
-x_603 = 0;
-x_509 = x_587;
-x_510 = x_588;
-x_511 = x_564;
-x_512 = lean_box(0);
-x_513 = x_570;
-x_514 = x_562;
-x_515 = x_569;
-x_516 = x_573;
-x_517 = x_567;
-x_518 = x_576;
-x_519 = x_563;
-x_520 = x_571;
-x_521 = x_565;
-x_522 = x_568;
-x_523 = x_566;
-x_524 = x_572;
-x_525 = x_603;
-goto block_561;
-}
-}
-else
-{
-lean_object* x_604; 
-lean_dec(x_576);
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-lean_dec(x_564);
-lean_dec(x_563);
-lean_dec_ref(x_562);
-lean_dec(x_376);
-lean_dec_ref(x_348);
-lean_dec_ref(x_1);
-x_604 = lean_ctor_get(x_584, 0);
+lean_object* x_604; uint8_t x_605; lean_object* x_606; 
+x_604 = lean_ctor_get(x_603, 0);
 lean_inc(x_604);
+lean_dec_ref(x_603);
+x_605 = 0;
+lean_inc(x_595);
+lean_inc_ref(x_594);
+lean_inc(x_593);
+lean_inc_ref(x_592);
+lean_inc(x_362);
+x_606 = l_Lean_Meta_forallMetaBoundedTelescope(x_604, x_362, x_605, x_592, x_593, x_594, x_595);
+if (lean_obj_tag(x_606) == 0)
+{
+lean_object* x_607; lean_object* x_608; lean_object* x_609; lean_object* x_610; lean_object* x_611; lean_object* x_612; uint8_t x_613; 
+x_607 = lean_ctor_get(x_606, 0);
+lean_inc(x_607);
+lean_dec_ref(x_606);
+x_608 = lean_ctor_get(x_607, 1);
+lean_inc(x_608);
+x_609 = lean_ctor_get(x_607, 0);
+lean_inc(x_609);
+lean_dec(x_607);
+x_610 = lean_ctor_get(x_608, 0);
+lean_inc(x_610);
+if (lean_is_exclusive(x_608)) {
+ lean_ctor_release(x_608, 0);
+ lean_ctor_release(x_608, 1);
+ x_611 = x_608;
+} else {
+ lean_dec_ref(x_608);
+ x_611 = lean_box(0);
+}
+x_612 = lean_array_get_size(x_609);
+x_613 = lean_nat_dec_eq(x_612, x_362);
+if (x_613 == 0)
+{
+if (x_600 == 0)
+{
+lean_dec(x_611);
+x_524 = x_610;
+x_525 = x_590;
+x_526 = x_609;
+x_527 = x_587;
+x_528 = x_591;
+x_529 = x_592;
+x_530 = x_585;
+x_531 = x_595;
+x_532 = x_584;
+x_533 = x_598;
+x_534 = x_588;
+x_535 = lean_box(0);
+x_536 = x_593;
+x_537 = x_594;
+x_538 = x_586;
+x_539 = x_589;
+x_540 = x_600;
+goto block_583;
+}
+else
+{
+lean_object* x_614; 
+lean_dec(x_610);
+lean_dec(x_609);
+lean_dec(x_598);
+lean_dec(x_586);
+lean_dec(x_585);
 lean_dec_ref(x_584);
-x_354 = x_604;
-x_355 = lean_box(0);
-goto block_360;
-}
-}
-else
-{
-lean_object* x_605; 
-lean_dec(x_576);
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-lean_dec(x_564);
-lean_dec(x_563);
-lean_dec_ref(x_562);
-lean_dec(x_376);
-lean_dec_ref(x_348);
+lean_dec(x_387);
+lean_inc_ref(x_363);
+lean_dec_ref(x_359);
 lean_dec_ref(x_1);
-x_605 = lean_ctor_get(x_581, 0);
-lean_inc(x_605);
-lean_dec_ref(x_581);
-x_354 = x_605;
-x_355 = lean_box(0);
-goto block_360;
+x_614 = l_Lean_Meta_Grind_getConfig___redArg(x_588);
+if (lean_obj_tag(x_614) == 0)
+{
+lean_object* x_615; uint8_t x_616; 
+x_615 = lean_ctor_get(x_614, 0);
+lean_inc(x_615);
+lean_dec_ref(x_614);
+x_616 = lean_ctor_get_uint8(x_615, sizeof(void*)*11 + 14);
+lean_dec(x_615);
+if (x_616 == 0)
+{
+lean_dec(x_611);
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+lean_dec_ref(x_363);
+x_379 = lean_box(0);
+goto block_381;
+}
+else
+{
+lean_object* x_617; lean_object* x_618; uint8_t x_619; 
+x_617 = lean_ctor_get(x_594, 2);
+x_618 = l_Lean_Meta_Grind_grind_debug;
+x_619 = l_Lean_Option_get___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_addNewInstance_spec__2(x_617, x_618);
+if (x_619 == 0)
+{
+lean_dec(x_611);
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+lean_dec_ref(x_363);
+x_379 = lean_box(0);
+goto block_381;
+}
+else
+{
+lean_object* x_620; lean_object* x_621; lean_object* x_622; lean_object* x_623; 
+x_620 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__8;
+x_621 = l_Lean_Meta_Grind_Origin_pp(x_363);
+if (lean_is_scalar(x_611)) {
+ x_622 = lean_alloc_ctor(7, 2, 0);
+} else {
+ x_622 = x_611;
+ lean_ctor_set_tag(x_622, 7);
+}
+lean_ctor_set(x_622, 0, x_620);
+lean_ctor_set(x_622, 1, x_621);
+x_623 = l_Lean_Meta_Grind_reportIssue(x_622, x_587, x_588, x_589, x_590, x_591, x_592, x_593, x_594, x_595);
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+if (lean_obj_tag(x_623) == 0)
+{
+lean_dec_ref(x_623);
+x_379 = lean_box(0);
+goto block_381;
+}
+else
+{
+x_382 = x_623;
+goto block_385;
+}
 }
 }
 }
 else
 {
-lean_object* x_606; 
-lean_dec(x_573);
-lean_dec_ref(x_572);
-lean_dec(x_571);
-lean_dec_ref(x_570);
-lean_dec(x_569);
-lean_dec_ref(x_568);
-lean_dec(x_567);
-lean_dec_ref(x_566);
-lean_dec(x_565);
-lean_dec(x_564);
-lean_dec(x_563);
-lean_dec_ref(x_562);
-lean_dec(x_376);
-lean_dec_ref(x_348);
+lean_object* x_624; 
+lean_dec(x_611);
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+lean_dec_ref(x_363);
+x_624 = lean_ctor_get(x_614, 0);
+lean_inc(x_624);
+lean_dec_ref(x_614);
+x_365 = x_624;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+}
+else
+{
+uint8_t x_625; 
+lean_dec(x_611);
+x_625 = 0;
+x_524 = x_610;
+x_525 = x_590;
+x_526 = x_609;
+x_527 = x_587;
+x_528 = x_591;
+x_529 = x_592;
+x_530 = x_585;
+x_531 = x_595;
+x_532 = x_584;
+x_533 = x_598;
+x_534 = x_588;
+x_535 = lean_box(0);
+x_536 = x_593;
+x_537 = x_594;
+x_538 = x_586;
+x_539 = x_589;
+x_540 = x_625;
+goto block_583;
+}
+}
+else
+{
+lean_object* x_626; 
+lean_dec(x_598);
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+lean_dec(x_586);
+lean_dec(x_585);
+lean_dec_ref(x_584);
+lean_dec(x_387);
+lean_dec_ref(x_359);
 lean_dec_ref(x_1);
-x_606 = lean_ctor_get(x_575, 0);
-lean_inc(x_606);
-lean_dec_ref(x_575);
-x_354 = x_606;
-x_355 = lean_box(0);
-goto block_360;
+x_626 = lean_ctor_get(x_606, 0);
+lean_inc(x_626);
+lean_dec_ref(x_606);
+x_365 = x_626;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+else
+{
+lean_object* x_627; 
+lean_dec(x_598);
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+lean_dec(x_586);
+lean_dec(x_585);
+lean_dec_ref(x_584);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+lean_dec_ref(x_1);
+x_627 = lean_ctor_get(x_603, 0);
+lean_inc(x_627);
+lean_dec_ref(x_603);
+x_365 = x_627;
+x_366 = lean_box(0);
+goto block_371;
 }
 }
 }
 else
 {
-lean_object* x_625; 
-lean_dec_ref(x_348);
+lean_object* x_628; 
+lean_dec(x_595);
+lean_dec_ref(x_594);
+lean_dec(x_593);
+lean_dec_ref(x_592);
+lean_dec(x_591);
+lean_dec_ref(x_590);
+lean_dec(x_589);
+lean_dec_ref(x_588);
+lean_dec(x_587);
+lean_dec(x_586);
+lean_dec(x_585);
+lean_dec_ref(x_584);
+lean_dec(x_387);
+lean_dec_ref(x_359);
+lean_dec_ref(x_1);
+x_628 = lean_ctor_get(x_597, 0);
+lean_inc(x_628);
+lean_dec_ref(x_597);
+x_365 = x_628;
+x_366 = lean_box(0);
+goto block_371;
+}
+}
+}
+else
+{
+lean_object* x_647; 
+lean_dec_ref(x_359);
 lean_dec_ref(x_12);
 lean_dec(x_11);
 lean_dec_ref(x_10);
@@ -35826,87 +36630,87 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_625 = lean_ctor_get(x_375, 0);
-lean_inc(x_625);
-lean_dec_ref(x_375);
-x_354 = x_625;
-x_355 = lean_box(0);
-goto block_360;
+x_647 = lean_ctor_get(x_386, 0);
+lean_inc(x_647);
+lean_dec_ref(x_386);
+x_365 = x_647;
+x_366 = lean_box(0);
+goto block_371;
 }
-block_360:
+block_371:
 {
-lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; 
-x_356 = lean_box(0);
-x_357 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__0(x_13, x_349, x_356);
+lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; 
+x_367 = lean_box(0);
+x_368 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__0(x_13, x_360, x_367);
 lean_dec(x_13);
-if (lean_is_exclusive(x_357)) {
- lean_ctor_release(x_357, 0);
- x_358 = x_357;
+if (lean_is_exclusive(x_368)) {
+ lean_ctor_release(x_368, 0);
+ x_369 = x_368;
 } else {
- lean_dec_ref(x_357);
- x_358 = lean_box(0);
+ lean_dec_ref(x_368);
+ x_369 = lean_box(0);
 }
-if (lean_is_scalar(x_358)) {
- x_359 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_369)) {
+ x_370 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_359 = x_358;
- lean_ctor_set_tag(x_359, 1);
+ x_370 = x_369;
+ lean_ctor_set_tag(x_370, 1);
 }
-lean_ctor_set(x_359, 0, x_354);
-return x_359;
+lean_ctor_set(x_370, 0, x_365);
+return x_370;
 }
-block_367:
+block_378:
 {
-lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; 
-x_363 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_363, 0, x_361);
-x_364 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__0(x_13, x_349, x_363);
-lean_dec_ref(x_363);
+lean_object* x_374; lean_object* x_375; lean_object* x_376; lean_object* x_377; 
+x_374 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_374, 0, x_372);
+x_375 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__0(x_13, x_360, x_374);
+lean_dec_ref(x_374);
 lean_dec(x_13);
-if (lean_is_exclusive(x_364)) {
- lean_ctor_release(x_364, 0);
- x_365 = x_364;
+if (lean_is_exclusive(x_375)) {
+ lean_ctor_release(x_375, 0);
+ x_376 = x_375;
 } else {
- lean_dec_ref(x_364);
- x_365 = lean_box(0);
+ lean_dec_ref(x_375);
+ x_376 = lean_box(0);
 }
-if (lean_is_scalar(x_365)) {
- x_366 = lean_alloc_ctor(0, 1, 0);
+if (lean_is_scalar(x_376)) {
+ x_377 = lean_alloc_ctor(0, 1, 0);
 } else {
- x_366 = x_365;
+ x_377 = x_376;
 }
-lean_ctor_set(x_366, 0, x_361);
-return x_366;
+lean_ctor_set(x_377, 0, x_372);
+return x_377;
 }
-block_370:
+block_381:
 {
-lean_object* x_369; 
-x_369 = lean_box(0);
-x_361 = x_369;
-x_362 = lean_box(0);
-goto block_367;
+lean_object* x_380; 
+x_380 = lean_box(0);
+x_372 = x_380;
+x_373 = lean_box(0);
+goto block_378;
 }
-block_374:
+block_385:
 {
-if (lean_obj_tag(x_371) == 0)
+if (lean_obj_tag(x_382) == 0)
 {
-lean_object* x_372; 
-x_372 = lean_ctor_get(x_371, 0);
-lean_inc(x_372);
-lean_dec_ref(x_371);
-x_361 = x_372;
-x_362 = lean_box(0);
-goto block_367;
+lean_object* x_383; 
+x_383 = lean_ctor_get(x_382, 0);
+lean_inc(x_383);
+lean_dec_ref(x_382);
+x_372 = x_383;
+x_373 = lean_box(0);
+goto block_378;
 }
 else
 {
-lean_object* x_373; 
-x_373 = lean_ctor_get(x_371, 0);
-lean_inc(x_373);
-lean_dec_ref(x_371);
-x_354 = x_373;
-x_355 = lean_box(0);
-goto block_360;
+lean_object* x_384; 
+x_384 = lean_ctor_get(x_382, 0);
+lean_inc(x_384);
+lean_dec_ref(x_382);
+x_365 = x_384;
+x_366 = lean_box(0);
+goto block_371;
 }
 }
 }
@@ -35987,7 +36791,7 @@ x_44 = lean_alloc_ctor(0, 1, 8);
 lean_ctor_set(x_44, 0, x_15);
 lean_ctor_set_uint64(x_44, sizeof(void*)*1, x_43);
 lean_ctor_set(x_10, 0, x_44);
-x_45 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_39, x_40, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_45 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(x_39, x_40, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 if (lean_obj_tag(x_45) == 0)
 {
 uint8_t x_46; 
@@ -36039,7 +36843,7 @@ lean_ctor_set_uint8(x_57, sizeof(void*)*7, x_17);
 lean_ctor_set_uint8(x_57, sizeof(void*)*7 + 1, x_24);
 lean_ctor_set_uint8(x_57, sizeof(void*)*7 + 2, x_25);
 lean_ctor_set_uint8(x_57, sizeof(void*)*7 + 3, x_26);
-x_58 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_51, x_52, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_57, x_11, x_12, x_13);
+x_58 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(x_51, x_52, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_57, x_11, x_12, x_13);
 if (lean_obj_tag(x_58) == 0)
 {
 lean_object* x_59; lean_object* x_60; lean_object* x_61; 
@@ -36166,7 +36970,7 @@ lean_ctor_set_uint8(x_102, sizeof(void*)*7, x_80);
 lean_ctor_set_uint8(x_102, sizeof(void*)*7 + 1, x_87);
 lean_ctor_set_uint8(x_102, sizeof(void*)*7 + 2, x_88);
 lean_ctor_set_uint8(x_102, sizeof(void*)*7 + 3, x_89);
-x_103 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_96, x_97, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_102, x_11, x_12, x_13);
+x_103 = l_Lean_Meta_withNewMCtxDepth___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__9___redArg(x_96, x_97, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_102, x_11, x_12, x_13);
 if (lean_obj_tag(x_103) == 0)
 {
 lean_object* x_104; lean_object* x_105; lean_object* x_106; 
@@ -36231,12 +37035,12 @@ lean_dec(x_1);
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18) {
 _start:
 {
-lean_object* x_18; 
-x_18 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_1, x_2, x_3, x_4, x_13, x_14, x_15, x_16);
-return x_18;
+lean_object* x_20; 
+x_20 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg(x_1, x_2, x_3, x_4, x_5, x_6, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+return x_20;
 }
 }
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___boxed(lean_object** _args) {
@@ -36257,6 +37061,55 @@ lean_object* x_14 = _args[13];
 lean_object* x_15 = _args[14];
 lean_object* x_16 = _args[15];
 lean_object* x_17 = _args[16];
+lean_object* x_18 = _args[17];
+lean_object* x_19 = _args[18];
+_start:
+{
+size_t x_20; size_t x_21; lean_object* x_22; 
+x_20 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_21 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_22 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2(x_1, x_2, x_3, x_20, x_21, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec_ref(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec_ref(x_3);
+lean_dec_ref(x_1);
+return x_22;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+lean_object* x_18; 
+x_18 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___redArg(x_1, x_2, x_3, x_4, x_13, x_14, x_15, x_16);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
 _start:
 {
 size_t x_18; size_t x_19; lean_object* x_20; 
@@ -36264,7 +37117,7 @@ x_18 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_19 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_20 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2(x_1, x_18, x_19, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+x_20 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__3(x_1, x_18, x_19, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
 lean_dec(x_12);
 lean_dec_ref(x_11);
 lean_dec(x_10);
@@ -36277,19 +37130,19 @@ lean_dec_ref(x_1);
 return x_20;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
 lean_object* x_16; 
-x_16 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg(x_1, x_2, x_11, x_12, x_13, x_14);
+x_16 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg(x_1, x_2, x_11, x_12, x_13, x_14);
 return x_16;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+LEAN_EXPORT lean_object* l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
 lean_object* x_16; 
-x_16 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+x_16 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
 lean_dec(x_14);
 lean_dec_ref(x_13);
 lean_dec(x_12);
@@ -36343,7 +37196,7 @@ x_24 = lean_st_ref_take(x_3);
 x_25 = !lean_is_exclusive(x_24);
 if (x_25 == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
 x_26 = lean_ctor_get(x_24, 0);
 x_27 = l_List_tail_x21___redArg(x_26);
 lean_ctor_set(x_24, 0, x_27);
@@ -36357,9 +37210,12 @@ x_32 = lean_ctor_get(x_30, 1);
 lean_inc(x_32);
 x_33 = lean_ctor_get(x_30, 2);
 lean_inc_ref(x_33);
-x_34 = lean_nat_dec_lt(x_32, x_1);
-if (x_34 == 0)
+x_34 = lean_ctor_get(x_30, 3);
+lean_inc_ref(x_34);
+x_35 = lean_nat_dec_lt(x_32, x_1);
+if (x_35 == 0)
 {
+lean_dec_ref(x_34);
 lean_dec_ref(x_33);
 lean_dec(x_32);
 lean_dec(x_31);
@@ -36370,7 +37226,8 @@ else
 {
 if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_36; 
+lean_object* x_37; 
+lean_dec_ref(x_34);
 lean_dec_ref(x_33);
 lean_dec(x_32);
 lean_inc(x_13);
@@ -36385,15 +37242,15 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-x_36 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem(x_30, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_36) == 0)
+x_37 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem(x_30, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_37) == 0)
 {
-lean_dec_ref(x_36);
+lean_dec_ref(x_37);
 goto _start;
 }
 else
 {
-uint8_t x_38; 
+uint8_t x_39; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -36406,252 +37263,55 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_38 = !lean_is_exclusive(x_36);
-if (x_38 == 0)
+x_39 = !lean_is_exclusive(x_37);
+if (x_39 == 0)
 {
-return x_36;
+return x_37;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; 
-x_39 = lean_ctor_get(x_36, 0);
-lean_inc(x_39);
-lean_dec(x_36);
-x_40 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_40, 0, x_39);
-return x_40;
+lean_object* x_40; lean_object* x_41; 
+x_40 = lean_ctor_get(x_37, 0);
+lean_inc(x_40);
+lean_dec(x_37);
+x_41 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_41, 0, x_40);
+return x_41;
 }
 }
 }
 else
 {
-uint8_t x_41; 
-x_41 = !lean_is_exclusive(x_30);
-if (x_41 == 0)
+uint8_t x_42; 
+x_42 = !lean_is_exclusive(x_30);
+if (x_42 == 0)
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_42 = lean_ctor_get(x_30, 2);
-lean_dec(x_42);
-x_43 = lean_ctor_get(x_30, 1);
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_43 = lean_ctor_get(x_30, 3);
 lean_dec(x_43);
-x_44 = lean_ctor_get(x_30, 0);
+x_44 = lean_ctor_get(x_30, 2);
 lean_dec(x_44);
-x_45 = lean_ctor_get(x_31, 0);
-lean_inc(x_45);
-switch (lean_obj_tag(x_45)) {
-case 0:
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_46 = lean_ctor_get(x_31, 1);
-lean_inc(x_46);
-lean_dec_ref(x_31);
-x_47 = lean_ctor_get(x_45, 0);
+x_45 = lean_ctor_get(x_30, 1);
+lean_dec(x_45);
+x_46 = lean_ctor_get(x_30, 0);
+lean_dec(x_46);
+x_47 = lean_ctor_get(x_31, 0);
 lean_inc(x_47);
-x_48 = lean_ctor_get(x_45, 1);
-lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_45, 2);
-lean_inc_ref(x_49);
-lean_dec_ref(x_45);
-lean_ctor_set(x_30, 0, x_46);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_50 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_30, x_47, x_48, x_49, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_47);
-if (lean_obj_tag(x_50) == 0)
-{
-lean_dec_ref(x_50);
-goto _start;
-}
-else
-{
-uint8_t x_52; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_52 = !lean_is_exclusive(x_50);
-if (x_52 == 0)
-{
-return x_50;
-}
-else
-{
-lean_object* x_53; lean_object* x_54; 
-x_53 = lean_ctor_get(x_50, 0);
-lean_inc(x_53);
-lean_dec(x_50);
-x_54 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_54, 0, x_53);
-return x_54;
-}
-}
-}
-case 1:
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_55 = lean_ctor_get(x_31, 1);
-lean_inc(x_55);
-lean_dec_ref(x_31);
-x_56 = lean_ctor_get(x_45, 0);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_45, 1);
-lean_inc_ref(x_57);
-x_58 = lean_ctor_get(x_45, 2);
-lean_inc(x_58);
-x_59 = lean_ctor_get(x_45, 3);
-lean_inc_ref(x_59);
-lean_dec_ref(x_45);
-lean_ctor_set(x_30, 0, x_55);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_60 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_30, x_56, x_57, x_58, x_59, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_58);
-lean_dec(x_56);
-if (lean_obj_tag(x_60) == 0)
-{
-lean_dec_ref(x_60);
-goto _start;
-}
-else
-{
-uint8_t x_62; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_62 = !lean_is_exclusive(x_60);
-if (x_62 == 0)
-{
-return x_60;
-}
-else
-{
-lean_object* x_63; lean_object* x_64; 
-x_63 = lean_ctor_get(x_60, 0);
-lean_inc(x_63);
-lean_dec(x_60);
-x_64 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_64, 0, x_63);
-return x_64;
-}
-}
-}
-default: 
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_65 = lean_ctor_get(x_31, 1);
-lean_inc(x_65);
-lean_dec_ref(x_31);
-x_66 = lean_ctor_get(x_45, 0);
-lean_inc_ref(x_66);
-lean_dec_ref(x_45);
-lean_ctor_set(x_30, 0, x_65);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_67 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_30, x_66, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_67) == 0)
-{
-lean_dec_ref(x_67);
-goto _start;
-}
-else
-{
-uint8_t x_69; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_69 = !lean_is_exclusive(x_67);
-if (x_69 == 0)
-{
-return x_67;
-}
-else
-{
-lean_object* x_70; lean_object* x_71; 
-x_70 = lean_ctor_get(x_67, 0);
-lean_inc(x_70);
-lean_dec(x_67);
-x_71 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_71, 0, x_70);
-return x_71;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_72; 
-lean_dec(x_30);
-x_72 = lean_ctor_get(x_31, 0);
-lean_inc(x_72);
-switch (lean_obj_tag(x_72)) {
+switch (lean_obj_tag(x_47)) {
 case 0:
 {
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_73 = lean_ctor_get(x_31, 1);
-lean_inc(x_73);
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_48 = lean_ctor_get(x_31, 1);
+lean_inc(x_48);
 lean_dec_ref(x_31);
-x_74 = lean_ctor_get(x_72, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_72, 1);
-lean_inc_ref(x_75);
-x_76 = lean_ctor_get(x_72, 2);
-lean_inc_ref(x_76);
-lean_dec_ref(x_72);
-x_77 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_77, 0, x_73);
-lean_ctor_set(x_77, 1, x_32);
-lean_ctor_set(x_77, 2, x_33);
+x_49 = lean_ctor_get(x_47, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_47, 1);
+lean_inc_ref(x_50);
+x_51 = lean_ctor_get(x_47, 2);
+lean_inc_ref(x_51);
+lean_dec_ref(x_47);
+lean_ctor_set(x_30, 0, x_48);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -36662,16 +37322,16 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_78 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_77, x_74, x_75, x_76, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_74);
-if (lean_obj_tag(x_78) == 0)
+x_52 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_30, x_49, x_50, x_51, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_49);
+if (lean_obj_tag(x_52) == 0)
 {
-lean_dec_ref(x_78);
+lean_dec_ref(x_52);
 goto _start;
 }
 else
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+uint8_t x_54; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -36684,43 +37344,39 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_80 = lean_ctor_get(x_78, 0);
-lean_inc(x_80);
-if (lean_is_exclusive(x_78)) {
- lean_ctor_release(x_78, 0);
- x_81 = x_78;
-} else {
- lean_dec_ref(x_78);
- x_81 = lean_box(0);
+x_54 = !lean_is_exclusive(x_52);
+if (x_54 == 0)
+{
+return x_52;
 }
-if (lean_is_scalar(x_81)) {
- x_82 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_82 = x_81;
+else
+{
+lean_object* x_55; lean_object* x_56; 
+x_55 = lean_ctor_get(x_52, 0);
+lean_inc(x_55);
+lean_dec(x_52);
+x_56 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_56, 0, x_55);
+return x_56;
 }
-lean_ctor_set(x_82, 0, x_80);
-return x_82;
 }
 }
 case 1:
 {
-lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_83 = lean_ctor_get(x_31, 1);
-lean_inc(x_83);
+lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_57 = lean_ctor_get(x_31, 1);
+lean_inc(x_57);
 lean_dec_ref(x_31);
-x_84 = lean_ctor_get(x_72, 0);
-lean_inc(x_84);
-x_85 = lean_ctor_get(x_72, 1);
-lean_inc_ref(x_85);
-x_86 = lean_ctor_get(x_72, 2);
-lean_inc(x_86);
-x_87 = lean_ctor_get(x_72, 3);
-lean_inc_ref(x_87);
-lean_dec_ref(x_72);
-x_88 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_88, 0, x_83);
-lean_ctor_set(x_88, 1, x_32);
-lean_ctor_set(x_88, 2, x_33);
+x_58 = lean_ctor_get(x_47, 0);
+lean_inc(x_58);
+x_59 = lean_ctor_get(x_47, 1);
+lean_inc_ref(x_59);
+x_60 = lean_ctor_get(x_47, 2);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_47, 3);
+lean_inc_ref(x_61);
+lean_dec_ref(x_47);
+lean_ctor_set(x_30, 0, x_57);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -36731,17 +37387,17 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_89 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_88, x_84, x_85, x_86, x_87, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_86);
-lean_dec(x_84);
-if (lean_obj_tag(x_89) == 0)
+x_62 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_30, x_58, x_59, x_60, x_61, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_60);
+lean_dec(x_58);
+if (lean_obj_tag(x_62) == 0)
 {
-lean_dec_ref(x_89);
+lean_dec_ref(x_62);
 goto _start;
 }
 else
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+uint8_t x_64; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -36754,37 +37410,33 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_91 = lean_ctor_get(x_89, 0);
-lean_inc(x_91);
-if (lean_is_exclusive(x_89)) {
- lean_ctor_release(x_89, 0);
- x_92 = x_89;
-} else {
- lean_dec_ref(x_89);
- x_92 = lean_box(0);
+x_64 = !lean_is_exclusive(x_62);
+if (x_64 == 0)
+{
+return x_62;
 }
-if (lean_is_scalar(x_92)) {
- x_93 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_93 = x_92;
+else
+{
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_ctor_get(x_62, 0);
+lean_inc(x_65);
+lean_dec(x_62);
+x_66 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_66, 0, x_65);
+return x_66;
 }
-lean_ctor_set(x_93, 0, x_91);
-return x_93;
 }
 }
 default: 
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_94 = lean_ctor_get(x_31, 1);
-lean_inc(x_94);
+lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_67 = lean_ctor_get(x_31, 1);
+lean_inc(x_67);
 lean_dec_ref(x_31);
-x_95 = lean_ctor_get(x_72, 0);
-lean_inc_ref(x_95);
-lean_dec_ref(x_72);
-x_96 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_32);
-lean_ctor_set(x_96, 2, x_33);
+x_68 = lean_ctor_get(x_47, 0);
+lean_inc_ref(x_68);
+lean_dec_ref(x_47);
+lean_ctor_set(x_30, 0, x_67);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -36795,15 +37447,15 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_97 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_96, x_95, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_97) == 0)
+x_69 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_30, x_68, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_69) == 0)
 {
-lean_dec_ref(x_97);
+lean_dec_ref(x_69);
 goto _start;
 }
 else
 {
-lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+uint8_t x_71; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -36816,24 +37468,20 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_99 = lean_ctor_get(x_97, 0);
-lean_inc(x_99);
-if (lean_is_exclusive(x_97)) {
- lean_ctor_release(x_97, 0);
- x_100 = x_97;
-} else {
- lean_dec_ref(x_97);
- x_100 = lean_box(0);
-}
-if (lean_is_scalar(x_100)) {
- x_101 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_101 = x_100;
-}
-lean_ctor_set(x_101, 0, x_99);
-return x_101;
-}
+x_71 = !lean_is_exclusive(x_69);
+if (x_71 == 0)
+{
+return x_69;
 }
+else
+{
+lean_object* x_72; lean_object* x_73; 
+x_72 = lean_ctor_get(x_69, 0);
+lean_inc(x_72);
+lean_dec(x_69);
+x_73 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_73, 0, x_72);
+return x_73;
 }
 }
 }
@@ -36841,42 +37489,29 @@ return x_101;
 }
 else
 {
-lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; uint8_t x_112; 
-x_102 = lean_ctor_get(x_24, 0);
-x_103 = lean_ctor_get(x_24, 1);
-lean_inc(x_103);
-lean_inc(x_102);
-lean_dec(x_24);
-x_104 = l_List_tail_x21___redArg(x_102);
-x_105 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_105, 0, x_104);
-lean_ctor_set(x_105, 1, x_103);
-x_106 = lean_st_ref_set(x_3, x_105);
-x_107 = l_Lean_Meta_Grind_EMatch_instInhabitedChoice_default;
-x_108 = l_List_head_x21___redArg(x_107, x_102);
-lean_dec(x_102);
-x_109 = lean_ctor_get(x_108, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_108, 1);
-lean_inc(x_110);
-x_111 = lean_ctor_get(x_108, 2);
-lean_inc_ref(x_111);
-x_112 = lean_nat_dec_lt(x_110, x_1);
-if (x_112 == 0)
+lean_object* x_74; 
+lean_dec(x_30);
+x_74 = lean_ctor_get(x_31, 0);
+lean_inc(x_74);
+switch (lean_obj_tag(x_74)) {
+case 0:
 {
-lean_dec_ref(x_111);
-lean_dec(x_110);
-lean_dec(x_109);
-lean_dec(x_108);
-goto _start;
-}
-else
-{
-if (lean_obj_tag(x_109) == 0)
-{
-lean_object* x_114; 
-lean_dec_ref(x_111);
-lean_dec(x_110);
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_75 = lean_ctor_get(x_31, 1);
+lean_inc(x_75);
+lean_dec_ref(x_31);
+x_76 = lean_ctor_get(x_74, 0);
+lean_inc(x_76);
+x_77 = lean_ctor_get(x_74, 1);
+lean_inc_ref(x_77);
+x_78 = lean_ctor_get(x_74, 2);
+lean_inc_ref(x_78);
+lean_dec_ref(x_74);
+x_79 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_79, 0, x_75);
+lean_ctor_set(x_79, 1, x_32);
+lean_ctor_set(x_79, 2, x_33);
+lean_ctor_set(x_79, 3, x_34);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -36887,356 +37522,227 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-lean_inc(x_3);
-lean_inc_ref(x_2);
-x_114 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem(x_108, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_114) == 0)
+x_80 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_79, x_76, x_77, x_78, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_76);
+if (lean_obj_tag(x_80) == 0)
+{
+lean_dec_ref(x_80);
+goto _start;
+}
+else
+{
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_82 = lean_ctor_get(x_80, 0);
+lean_inc(x_82);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ x_83 = x_80;
+} else {
+ lean_dec_ref(x_80);
+ x_83 = lean_box(0);
+}
+if (lean_is_scalar(x_83)) {
+ x_84 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_84 = x_83;
+}
+lean_ctor_set(x_84, 0, x_82);
+return x_84;
+}
+}
+case 1:
+{
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_85 = lean_ctor_get(x_31, 1);
+lean_inc(x_85);
+lean_dec_ref(x_31);
+x_86 = lean_ctor_get(x_74, 0);
+lean_inc(x_86);
+x_87 = lean_ctor_get(x_74, 1);
+lean_inc_ref(x_87);
+x_88 = lean_ctor_get(x_74, 2);
+lean_inc(x_88);
+x_89 = lean_ctor_get(x_74, 3);
+lean_inc_ref(x_89);
+lean_dec_ref(x_74);
+x_90 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_90, 0, x_85);
+lean_ctor_set(x_90, 1, x_32);
+lean_ctor_set(x_90, 2, x_33);
+lean_ctor_set(x_90, 3, x_34);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_91 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_90, x_86, x_87, x_88, x_89, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_88);
+lean_dec(x_86);
+if (lean_obj_tag(x_91) == 0)
+{
+lean_dec_ref(x_91);
+goto _start;
+}
+else
+{
+lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_93 = lean_ctor_get(x_91, 0);
+lean_inc(x_93);
+if (lean_is_exclusive(x_91)) {
+ lean_ctor_release(x_91, 0);
+ x_94 = x_91;
+} else {
+ lean_dec_ref(x_91);
+ x_94 = lean_box(0);
+}
+if (lean_is_scalar(x_94)) {
+ x_95 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_95 = x_94;
+}
+lean_ctor_set(x_95, 0, x_93);
+return x_95;
+}
+}
+default: 
+{
+lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_96 = lean_ctor_get(x_31, 1);
+lean_inc(x_96);
+lean_dec_ref(x_31);
+x_97 = lean_ctor_get(x_74, 0);
+lean_inc_ref(x_97);
+lean_dec_ref(x_74);
+x_98 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_98, 0, x_96);
+lean_ctor_set(x_98, 1, x_32);
+lean_ctor_set(x_98, 2, x_33);
+lean_ctor_set(x_98, 3, x_34);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_99 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_98, x_97, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_99) == 0)
+{
+lean_dec_ref(x_99);
+goto _start;
+}
+else
+{
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_101 = lean_ctor_get(x_99, 0);
+lean_inc(x_101);
+if (lean_is_exclusive(x_99)) {
+ lean_ctor_release(x_99, 0);
+ x_102 = x_99;
+} else {
+ lean_dec_ref(x_99);
+ x_102 = lean_box(0);
+}
+if (lean_is_scalar(x_102)) {
+ x_103 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_103 = x_102;
+}
+lean_ctor_set(x_103, 0, x_101);
+return x_103;
+}
+}
+}
+}
+}
+}
+}
+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; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; uint8_t x_115; 
+x_104 = lean_ctor_get(x_24, 0);
+x_105 = lean_ctor_get(x_24, 1);
+lean_inc(x_105);
+lean_inc(x_104);
+lean_dec(x_24);
+x_106 = l_List_tail_x21___redArg(x_104);
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_106);
+lean_ctor_set(x_107, 1, x_105);
+x_108 = lean_st_ref_set(x_3, x_107);
+x_109 = l_Lean_Meta_Grind_EMatch_instInhabitedChoice_default;
+x_110 = l_List_head_x21___redArg(x_109, x_104);
+lean_dec(x_104);
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_110, 1);
+lean_inc(x_112);
+x_113 = lean_ctor_get(x_110, 2);
+lean_inc_ref(x_113);
+x_114 = lean_ctor_get(x_110, 3);
+lean_inc_ref(x_114);
+x_115 = lean_nat_dec_lt(x_112, x_1);
+if (x_115 == 0)
 {
 lean_dec_ref(x_114);
+lean_dec_ref(x_113);
+lean_dec(x_112);
+lean_dec(x_111);
+lean_dec(x_110);
 goto _start;
 }
 else
 {
-lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_116 = lean_ctor_get(x_114, 0);
-lean_inc(x_116);
-if (lean_is_exclusive(x_114)) {
- lean_ctor_release(x_114, 0);
- x_117 = x_114;
-} else {
- lean_dec_ref(x_114);
- x_117 = lean_box(0);
-}
-if (lean_is_scalar(x_117)) {
- x_118 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_118 = x_117;
-}
-lean_ctor_set(x_118, 0, x_116);
-return x_118;
-}
-}
-else
+if (lean_obj_tag(x_111) == 0)
 {
-lean_object* x_119; lean_object* x_120; 
-if (lean_is_exclusive(x_108)) {
- lean_ctor_release(x_108, 0);
- lean_ctor_release(x_108, 1);
- lean_ctor_release(x_108, 2);
- x_119 = x_108;
-} else {
- lean_dec_ref(x_108);
- x_119 = lean_box(0);
-}
-x_120 = lean_ctor_get(x_109, 0);
-lean_inc(x_120);
-switch (lean_obj_tag(x_120)) {
-case 0:
-{
-lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
-x_121 = lean_ctor_get(x_109, 1);
-lean_inc(x_121);
-lean_dec_ref(x_109);
-x_122 = lean_ctor_get(x_120, 0);
-lean_inc(x_122);
-x_123 = lean_ctor_get(x_120, 1);
-lean_inc_ref(x_123);
-x_124 = lean_ctor_get(x_120, 2);
-lean_inc_ref(x_124);
-lean_dec_ref(x_120);
-if (lean_is_scalar(x_119)) {
- x_125 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_125 = x_119;
-}
-lean_ctor_set(x_125, 0, x_121);
-lean_ctor_set(x_125, 1, x_110);
-lean_ctor_set(x_125, 2, x_111);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_126 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_125, x_122, x_123, x_124, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_122);
-if (lean_obj_tag(x_126) == 0)
-{
-lean_dec_ref(x_126);
-goto _start;
-}
-else
-{
-lean_object* x_128; lean_object* x_129; lean_object* x_130; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_128 = lean_ctor_get(x_126, 0);
-lean_inc(x_128);
-if (lean_is_exclusive(x_126)) {
- lean_ctor_release(x_126, 0);
- x_129 = x_126;
-} else {
- lean_dec_ref(x_126);
- x_129 = lean_box(0);
-}
-if (lean_is_scalar(x_129)) {
- x_130 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_130 = x_129;
-}
-lean_ctor_set(x_130, 0, x_128);
-return x_130;
-}
-}
-case 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; 
-x_131 = lean_ctor_get(x_109, 1);
-lean_inc(x_131);
-lean_dec_ref(x_109);
-x_132 = lean_ctor_get(x_120, 0);
-lean_inc(x_132);
-x_133 = lean_ctor_get(x_120, 1);
-lean_inc_ref(x_133);
-x_134 = lean_ctor_get(x_120, 2);
-lean_inc(x_134);
-x_135 = lean_ctor_get(x_120, 3);
-lean_inc_ref(x_135);
-lean_dec_ref(x_120);
-if (lean_is_scalar(x_119)) {
- x_136 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_136 = x_119;
-}
-lean_ctor_set(x_136, 0, x_131);
-lean_ctor_set(x_136, 1, x_110);
-lean_ctor_set(x_136, 2, x_111);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_137 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_136, x_132, x_133, x_134, x_135, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_134);
-lean_dec(x_132);
-if (lean_obj_tag(x_137) == 0)
-{
-lean_dec_ref(x_137);
-goto _start;
-}
-else
-{
-lean_object* x_139; lean_object* x_140; lean_object* x_141; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_139 = lean_ctor_get(x_137, 0);
-lean_inc(x_139);
-if (lean_is_exclusive(x_137)) {
- lean_ctor_release(x_137, 0);
- x_140 = x_137;
-} else {
- lean_dec_ref(x_137);
- x_140 = lean_box(0);
-}
-if (lean_is_scalar(x_140)) {
- x_141 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_141 = x_140;
-}
-lean_ctor_set(x_141, 0, x_139);
-return x_141;
-}
-}
-default: 
-{
-lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; 
-x_142 = lean_ctor_get(x_109, 1);
-lean_inc(x_142);
-lean_dec_ref(x_109);
-x_143 = lean_ctor_get(x_120, 0);
-lean_inc_ref(x_143);
-lean_dec_ref(x_120);
-if (lean_is_scalar(x_119)) {
- x_144 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_144 = x_119;
-}
-lean_ctor_set(x_144, 0, x_142);
-lean_ctor_set(x_144, 1, x_110);
-lean_ctor_set(x_144, 2, x_111);
-lean_inc(x_13);
-lean_inc_ref(x_12);
-lean_inc(x_11);
-lean_inc_ref(x_10);
-lean_inc(x_9);
-lean_inc_ref(x_8);
-lean_inc(x_7);
-lean_inc_ref(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_145 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_144, x_143, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_145) == 0)
-{
-lean_dec_ref(x_145);
-goto _start;
-}
-else
-{
-lean_object* x_147; lean_object* x_148; lean_object* x_149; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_147 = lean_ctor_get(x_145, 0);
-lean_inc(x_147);
-if (lean_is_exclusive(x_145)) {
- lean_ctor_release(x_145, 0);
- x_148 = x_145;
-} else {
- lean_dec_ref(x_145);
- x_148 = lean_box(0);
-}
-if (lean_is_scalar(x_148)) {
- x_149 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_149 = x_148;
-}
-lean_ctor_set(x_149, 0, x_147);
-return x_149;
-}
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_150; 
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec_ref(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_8);
-lean_dec(x_7);
-lean_dec_ref(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_150 = ((lean_object*)(l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0));
-lean_ctor_set(x_20, 0, x_150);
-return x_20;
-}
-}
-else
-{
-lean_object* x_151; uint8_t x_152; 
-x_151 = lean_ctor_get(x_20, 0);
-lean_inc(x_151);
-lean_dec(x_20);
-x_152 = lean_unbox(x_151);
-lean_dec(x_151);
-if (x_152 == 0)
-{
-lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; uint8_t x_165; 
-x_153 = lean_st_ref_take(x_3);
-x_154 = lean_ctor_get(x_153, 0);
-lean_inc(x_154);
-x_155 = lean_ctor_get(x_153, 1);
-lean_inc_ref(x_155);
-if (lean_is_exclusive(x_153)) {
- lean_ctor_release(x_153, 0);
- lean_ctor_release(x_153, 1);
- x_156 = x_153;
-} else {
- lean_dec_ref(x_153);
- x_156 = lean_box(0);
-}
-x_157 = l_List_tail_x21___redArg(x_154);
-if (lean_is_scalar(x_156)) {
- x_158 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_158 = x_156;
-}
-lean_ctor_set(x_158, 0, x_157);
-lean_ctor_set(x_158, 1, x_155);
-x_159 = lean_st_ref_set(x_3, x_158);
-x_160 = l_Lean_Meta_Grind_EMatch_instInhabitedChoice_default;
-x_161 = l_List_head_x21___redArg(x_160, x_154);
-lean_dec(x_154);
-x_162 = lean_ctor_get(x_161, 0);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_161, 1);
-lean_inc(x_163);
-x_164 = lean_ctor_get(x_161, 2);
-lean_inc_ref(x_164);
-x_165 = lean_nat_dec_lt(x_163, x_1);
-if (x_165 == 0)
-{
-lean_dec_ref(x_164);
-lean_dec(x_163);
-lean_dec(x_162);
-lean_dec(x_161);
-goto _start;
-}
-else
-{
-if (lean_obj_tag(x_162) == 0)
-{
-lean_object* x_167; 
-lean_dec_ref(x_164);
-lean_dec(x_163);
+lean_object* x_117; 
+lean_dec_ref(x_114);
+lean_dec_ref(x_113);
+lean_dec(x_112);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -37249,15 +37755,15 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc_ref(x_2);
-x_167 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem(x_161, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_167) == 0)
+x_117 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem(x_110, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_117) == 0)
 {
-lean_dec_ref(x_167);
+lean_dec_ref(x_117);
 goto _start;
 }
 else
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; 
+lean_object* x_119; lean_object* x_120; lean_object* x_121; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37270,60 +37776,62 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_169 = lean_ctor_get(x_167, 0);
-lean_inc(x_169);
-if (lean_is_exclusive(x_167)) {
- lean_ctor_release(x_167, 0);
- x_170 = x_167;
+x_119 = lean_ctor_get(x_117, 0);
+lean_inc(x_119);
+if (lean_is_exclusive(x_117)) {
+ lean_ctor_release(x_117, 0);
+ x_120 = x_117;
 } else {
- lean_dec_ref(x_167);
- x_170 = lean_box(0);
+ lean_dec_ref(x_117);
+ x_120 = lean_box(0);
 }
-if (lean_is_scalar(x_170)) {
- x_171 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_120)) {
+ x_121 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_171 = x_170;
+ x_121 = x_120;
 }
-lean_ctor_set(x_171, 0, x_169);
-return x_171;
+lean_ctor_set(x_121, 0, x_119);
+return x_121;
 }
 }
 else
 {
-lean_object* x_172; lean_object* x_173; 
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- lean_ctor_release(x_161, 1);
- lean_ctor_release(x_161, 2);
- x_172 = x_161;
+lean_object* x_122; lean_object* x_123; 
+if (lean_is_exclusive(x_110)) {
+ lean_ctor_release(x_110, 0);
+ lean_ctor_release(x_110, 1);
+ lean_ctor_release(x_110, 2);
+ lean_ctor_release(x_110, 3);
+ x_122 = x_110;
 } else {
- lean_dec_ref(x_161);
- x_172 = lean_box(0);
+ lean_dec_ref(x_110);
+ x_122 = lean_box(0);
 }
-x_173 = lean_ctor_get(x_162, 0);
-lean_inc(x_173);
-switch (lean_obj_tag(x_173)) {
+x_123 = lean_ctor_get(x_111, 0);
+lean_inc(x_123);
+switch (lean_obj_tag(x_123)) {
 case 0:
 {
-lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; 
-x_174 = lean_ctor_get(x_162, 1);
-lean_inc(x_174);
-lean_dec_ref(x_162);
-x_175 = lean_ctor_get(x_173, 0);
-lean_inc(x_175);
-x_176 = lean_ctor_get(x_173, 1);
-lean_inc_ref(x_176);
-x_177 = lean_ctor_get(x_173, 2);
-lean_inc_ref(x_177);
-lean_dec_ref(x_173);
-if (lean_is_scalar(x_172)) {
- x_178 = lean_alloc_ctor(0, 3, 0);
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+x_124 = lean_ctor_get(x_111, 1);
+lean_inc(x_124);
+lean_dec_ref(x_111);
+x_125 = lean_ctor_get(x_123, 0);
+lean_inc(x_125);
+x_126 = lean_ctor_get(x_123, 1);
+lean_inc_ref(x_126);
+x_127 = lean_ctor_get(x_123, 2);
+lean_inc_ref(x_127);
+lean_dec_ref(x_123);
+if (lean_is_scalar(x_122)) {
+ x_128 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_178 = x_172;
+ x_128 = x_122;
 }
-lean_ctor_set(x_178, 0, x_174);
-lean_ctor_set(x_178, 1, x_163);
-lean_ctor_set(x_178, 2, x_164);
+lean_ctor_set(x_128, 0, x_124);
+lean_ctor_set(x_128, 1, x_112);
+lean_ctor_set(x_128, 2, x_113);
+lean_ctor_set(x_128, 3, x_114);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -37334,16 +37842,16 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_179 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_178, x_175, x_176, x_177, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_175);
-if (lean_obj_tag(x_179) == 0)
+x_129 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_128, x_125, x_126, x_127, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_125);
+if (lean_obj_tag(x_129) == 0)
 {
-lean_dec_ref(x_179);
+lean_dec_ref(x_129);
 goto _start;
 }
 else
 {
-lean_object* x_181; lean_object* x_182; lean_object* x_183; 
+lean_object* x_131; lean_object* x_132; lean_object* x_133; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37356,47 +37864,48 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_181 = lean_ctor_get(x_179, 0);
-lean_inc(x_181);
-if (lean_is_exclusive(x_179)) {
- lean_ctor_release(x_179, 0);
- x_182 = x_179;
+x_131 = lean_ctor_get(x_129, 0);
+lean_inc(x_131);
+if (lean_is_exclusive(x_129)) {
+ lean_ctor_release(x_129, 0);
+ x_132 = x_129;
 } else {
- lean_dec_ref(x_179);
- x_182 = lean_box(0);
+ lean_dec_ref(x_129);
+ x_132 = lean_box(0);
 }
-if (lean_is_scalar(x_182)) {
- x_183 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_132)) {
+ x_133 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_183 = x_182;
+ x_133 = x_132;
 }
-lean_ctor_set(x_183, 0, x_181);
-return x_183;
+lean_ctor_set(x_133, 0, x_131);
+return x_133;
 }
 }
 case 1:
 {
-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_184 = lean_ctor_get(x_162, 1);
-lean_inc(x_184);
-lean_dec_ref(x_162);
-x_185 = lean_ctor_get(x_173, 0);
-lean_inc(x_185);
-x_186 = lean_ctor_get(x_173, 1);
-lean_inc_ref(x_186);
-x_187 = lean_ctor_get(x_173, 2);
-lean_inc(x_187);
-x_188 = lean_ctor_get(x_173, 3);
-lean_inc_ref(x_188);
-lean_dec_ref(x_173);
-if (lean_is_scalar(x_172)) {
- x_189 = lean_alloc_ctor(0, 3, 0);
+lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+x_134 = lean_ctor_get(x_111, 1);
+lean_inc(x_134);
+lean_dec_ref(x_111);
+x_135 = lean_ctor_get(x_123, 0);
+lean_inc(x_135);
+x_136 = lean_ctor_get(x_123, 1);
+lean_inc_ref(x_136);
+x_137 = lean_ctor_get(x_123, 2);
+lean_inc(x_137);
+x_138 = lean_ctor_get(x_123, 3);
+lean_inc_ref(x_138);
+lean_dec_ref(x_123);
+if (lean_is_scalar(x_122)) {
+ x_139 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_189 = x_172;
+ x_139 = x_122;
 }
-lean_ctor_set(x_189, 0, x_184);
-lean_ctor_set(x_189, 1, x_163);
-lean_ctor_set(x_189, 2, x_164);
+lean_ctor_set(x_139, 0, x_134);
+lean_ctor_set(x_139, 1, x_112);
+lean_ctor_set(x_139, 2, x_113);
+lean_ctor_set(x_139, 3, x_114);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -37407,17 +37916,17 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_190 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_189, x_185, x_186, x_187, x_188, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_187);
-lean_dec(x_185);
-if (lean_obj_tag(x_190) == 0)
+x_140 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_139, x_135, x_136, x_137, x_138, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_137);
+lean_dec(x_135);
+if (lean_obj_tag(x_140) == 0)
 {
-lean_dec_ref(x_190);
+lean_dec_ref(x_140);
 goto _start;
 }
 else
 {
-lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+lean_object* x_142; lean_object* x_143; lean_object* x_144; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37430,41 +37939,42 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_192 = lean_ctor_get(x_190, 0);
-lean_inc(x_192);
-if (lean_is_exclusive(x_190)) {
- lean_ctor_release(x_190, 0);
- x_193 = x_190;
+x_142 = lean_ctor_get(x_140, 0);
+lean_inc(x_142);
+if (lean_is_exclusive(x_140)) {
+ lean_ctor_release(x_140, 0);
+ x_143 = x_140;
 } else {
- lean_dec_ref(x_190);
- x_193 = lean_box(0);
+ lean_dec_ref(x_140);
+ x_143 = lean_box(0);
 }
-if (lean_is_scalar(x_193)) {
- x_194 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_143)) {
+ x_144 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_194 = x_193;
+ x_144 = x_143;
 }
-lean_ctor_set(x_194, 0, x_192);
-return x_194;
+lean_ctor_set(x_144, 0, x_142);
+return x_144;
 }
 }
 default: 
 {
-lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
-x_195 = lean_ctor_get(x_162, 1);
-lean_inc(x_195);
-lean_dec_ref(x_162);
-x_196 = lean_ctor_get(x_173, 0);
-lean_inc_ref(x_196);
-lean_dec_ref(x_173);
-if (lean_is_scalar(x_172)) {
- x_197 = lean_alloc_ctor(0, 3, 0);
+lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
+x_145 = lean_ctor_get(x_111, 1);
+lean_inc(x_145);
+lean_dec_ref(x_111);
+x_146 = lean_ctor_get(x_123, 0);
+lean_inc_ref(x_146);
+lean_dec_ref(x_123);
+if (lean_is_scalar(x_122)) {
+ x_147 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_197 = x_172;
+ x_147 = x_122;
 }
-lean_ctor_set(x_197, 0, x_195);
-lean_ctor_set(x_197, 1, x_163);
-lean_ctor_set(x_197, 2, x_164);
+lean_ctor_set(x_147, 0, x_145);
+lean_ctor_set(x_147, 1, x_112);
+lean_ctor_set(x_147, 2, x_113);
+lean_ctor_set(x_147, 3, x_114);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -37475,15 +37985,15 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_198 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_197, x_196, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_198) == 0)
+x_148 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_147, x_146, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_148) == 0)
 {
-lean_dec_ref(x_198);
+lean_dec_ref(x_148);
 goto _start;
 }
 else
 {
-lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+lean_object* x_150; lean_object* x_151; lean_object* x_152; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37496,22 +38006,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_200 = lean_ctor_get(x_198, 0);
-lean_inc(x_200);
-if (lean_is_exclusive(x_198)) {
- lean_ctor_release(x_198, 0);
- x_201 = x_198;
+x_150 = lean_ctor_get(x_148, 0);
+lean_inc(x_150);
+if (lean_is_exclusive(x_148)) {
+ lean_ctor_release(x_148, 0);
+ x_151 = x_148;
 } else {
- lean_dec_ref(x_198);
- x_201 = lean_box(0);
+ lean_dec_ref(x_148);
+ x_151 = lean_box(0);
 }
-if (lean_is_scalar(x_201)) {
- x_202 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_151)) {
+ x_152 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_202 = x_201;
+ x_152 = x_151;
+}
+lean_ctor_set(x_152, 0, x_150);
+return x_152;
 }
-lean_ctor_set(x_202, 0, x_200);
-return x_202;
 }
 }
 }
@@ -37520,7 +38031,7 @@ return x_202;
 }
 else
 {
-lean_object* x_203; lean_object* x_204; 
+lean_object* x_153; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37533,16 +38044,361 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_203 = ((lean_object*)(l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0));
-x_204 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_204, 0, x_203);
-return x_204;
+x_153 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+lean_ctor_set(x_20, 0, x_153);
+return x_20;
+}
+}
+else
+{
+lean_object* x_154; uint8_t x_155; 
+x_154 = lean_ctor_get(x_20, 0);
+lean_inc(x_154);
+lean_dec(x_20);
+x_155 = lean_unbox(x_154);
+lean_dec(x_154);
+if (x_155 == 0)
+{
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; uint8_t x_169; 
+x_156 = lean_st_ref_take(x_3);
+x_157 = lean_ctor_get(x_156, 0);
+lean_inc(x_157);
+x_158 = lean_ctor_get(x_156, 1);
+lean_inc_ref(x_158);
+if (lean_is_exclusive(x_156)) {
+ lean_ctor_release(x_156, 0);
+ lean_ctor_release(x_156, 1);
+ x_159 = x_156;
+} else {
+ lean_dec_ref(x_156);
+ x_159 = lean_box(0);
+}
+x_160 = l_List_tail_x21___redArg(x_157);
+if (lean_is_scalar(x_159)) {
+ x_161 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_161 = x_159;
+}
+lean_ctor_set(x_161, 0, x_160);
+lean_ctor_set(x_161, 1, x_158);
+x_162 = lean_st_ref_set(x_3, x_161);
+x_163 = l_Lean_Meta_Grind_EMatch_instInhabitedChoice_default;
+x_164 = l_List_head_x21___redArg(x_163, x_157);
+lean_dec(x_157);
+x_165 = lean_ctor_get(x_164, 0);
+lean_inc(x_165);
+x_166 = lean_ctor_get(x_164, 1);
+lean_inc(x_166);
+x_167 = lean_ctor_get(x_164, 2);
+lean_inc_ref(x_167);
+x_168 = lean_ctor_get(x_164, 3);
+lean_inc_ref(x_168);
+x_169 = lean_nat_dec_lt(x_166, x_1);
+if (x_169 == 0)
+{
+lean_dec_ref(x_168);
+lean_dec_ref(x_167);
+lean_dec(x_166);
+lean_dec(x_165);
+lean_dec(x_164);
+goto _start;
+}
+else
+{
+if (lean_obj_tag(x_165) == 0)
+{
+lean_object* x_171; 
+lean_dec_ref(x_168);
+lean_dec_ref(x_167);
+lean_dec(x_166);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc_ref(x_2);
+x_171 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem(x_164, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_171) == 0)
+{
+lean_dec_ref(x_171);
+goto _start;
+}
+else
+{
+lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_173 = lean_ctor_get(x_171, 0);
+lean_inc(x_173);
+if (lean_is_exclusive(x_171)) {
+ lean_ctor_release(x_171, 0);
+ x_174 = x_171;
+} else {
+ lean_dec_ref(x_171);
+ x_174 = lean_box(0);
+}
+if (lean_is_scalar(x_174)) {
+ x_175 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_175 = x_174;
+}
+lean_ctor_set(x_175, 0, x_173);
+return x_175;
+}
+}
+else
+{
+lean_object* x_176; lean_object* x_177; 
+if (lean_is_exclusive(x_164)) {
+ lean_ctor_release(x_164, 0);
+ lean_ctor_release(x_164, 1);
+ lean_ctor_release(x_164, 2);
+ lean_ctor_release(x_164, 3);
+ x_176 = x_164;
+} else {
+ lean_dec_ref(x_164);
+ x_176 = lean_box(0);
+}
+x_177 = lean_ctor_get(x_165, 0);
+lean_inc(x_177);
+switch (lean_obj_tag(x_177)) {
+case 0:
+{
+lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; 
+x_178 = lean_ctor_get(x_165, 1);
+lean_inc(x_178);
+lean_dec_ref(x_165);
+x_179 = lean_ctor_get(x_177, 0);
+lean_inc(x_179);
+x_180 = lean_ctor_get(x_177, 1);
+lean_inc_ref(x_180);
+x_181 = lean_ctor_get(x_177, 2);
+lean_inc_ref(x_181);
+lean_dec_ref(x_177);
+if (lean_is_scalar(x_176)) {
+ x_182 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_182 = x_176;
+}
+lean_ctor_set(x_182, 0, x_178);
+lean_ctor_set(x_182, 1, x_166);
+lean_ctor_set(x_182, 2, x_167);
+lean_ctor_set(x_182, 3, x_168);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_183 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processMatch(x_182, x_179, x_180, x_181, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_179);
+if (lean_obj_tag(x_183) == 0)
+{
+lean_dec_ref(x_183);
+goto _start;
+}
+else
+{
+lean_object* x_185; lean_object* x_186; lean_object* x_187; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_185 = lean_ctor_get(x_183, 0);
+lean_inc(x_185);
+if (lean_is_exclusive(x_183)) {
+ lean_ctor_release(x_183, 0);
+ x_186 = x_183;
+} else {
+ lean_dec_ref(x_183);
+ x_186 = lean_box(0);
+}
+if (lean_is_scalar(x_186)) {
+ x_187 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_187 = x_186;
+}
+lean_ctor_set(x_187, 0, x_185);
+return x_187;
+}
+}
+case 1:
+{
+lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+x_188 = lean_ctor_get(x_165, 1);
+lean_inc(x_188);
+lean_dec_ref(x_165);
+x_189 = lean_ctor_get(x_177, 0);
+lean_inc(x_189);
+x_190 = lean_ctor_get(x_177, 1);
+lean_inc_ref(x_190);
+x_191 = lean_ctor_get(x_177, 2);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_177, 3);
+lean_inc_ref(x_192);
+lean_dec_ref(x_177);
+if (lean_is_scalar(x_176)) {
+ x_193 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_193 = x_176;
+}
+lean_ctor_set(x_193, 0, x_188);
+lean_ctor_set(x_193, 1, x_166);
+lean_ctor_set(x_193, 2, x_167);
+lean_ctor_set(x_193, 3, x_168);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_194 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processOffset(x_193, x_189, x_190, x_191, x_192, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_191);
+lean_dec(x_189);
+if (lean_obj_tag(x_194) == 0)
+{
+lean_dec_ref(x_194);
+goto _start;
+}
+else
+{
+lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_196 = lean_ctor_get(x_194, 0);
+lean_inc(x_196);
+if (lean_is_exclusive(x_194)) {
+ lean_ctor_release(x_194, 0);
+ x_197 = x_194;
+} else {
+ lean_dec_ref(x_194);
+ x_197 = lean_box(0);
+}
+if (lean_is_scalar(x_197)) {
+ x_198 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_198 = x_197;
+}
+lean_ctor_set(x_198, 0, x_196);
+return x_198;
+}
+}
+default: 
+{
+lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+x_199 = lean_ctor_get(x_165, 1);
+lean_inc(x_199);
+lean_dec_ref(x_165);
+x_200 = lean_ctor_get(x_177, 0);
+lean_inc_ref(x_200);
+lean_dec_ref(x_177);
+if (lean_is_scalar(x_176)) {
+ x_201 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_201 = x_176;
+}
+lean_ctor_set(x_201, 0, x_199);
+lean_ctor_set(x_201, 1, x_166);
+lean_ctor_set(x_201, 2, x_167);
+lean_ctor_set(x_201, 3, x_168);
+lean_inc(x_13);
+lean_inc_ref(x_12);
+lean_inc(x_11);
+lean_inc_ref(x_10);
+lean_inc(x_9);
+lean_inc_ref(x_8);
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_202 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processContinue(x_201, x_200, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_202) == 0)
+{
+lean_dec_ref(x_202);
+goto _start;
+}
+else
+{
+lean_object* x_204; lean_object* x_205; lean_object* x_206; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_204 = lean_ctor_get(x_202, 0);
+lean_inc(x_204);
+if (lean_is_exclusive(x_202)) {
+ lean_ctor_release(x_202, 0);
+ x_205 = x_202;
+} else {
+ lean_dec_ref(x_202);
+ x_205 = lean_box(0);
+}
+if (lean_is_scalar(x_205)) {
+ x_206 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_206 = x_205;
+}
+lean_ctor_set(x_206, 0, x_204);
+return x_206;
+}
+}
+}
 }
 }
 }
 else
 {
-uint8_t x_205; 
+lean_object* x_207; lean_object* x_208; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37555,26 +38411,48 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_205 = !lean_is_exclusive(x_20);
-if (x_205 == 0)
+x_207 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+x_208 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_208, 0, x_207);
+return x_208;
+}
+}
+}
+else
+{
+uint8_t x_209; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_209 = !lean_is_exclusive(x_20);
+if (x_209 == 0)
 {
 return x_20;
 }
 else
 {
-lean_object* x_206; lean_object* x_207; 
-x_206 = lean_ctor_get(x_20, 0);
-lean_inc(x_206);
+lean_object* x_210; lean_object* x_211; 
+x_210 = lean_ctor_get(x_20, 0);
+lean_inc(x_210);
 lean_dec(x_20);
-x_207 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_207, 0, x_206);
-return x_207;
+x_211 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_211, 0, x_210);
+return x_211;
 }
 }
 }
 else
 {
-uint8_t x_208; 
+uint8_t x_212; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37587,26 +38465,26 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_208 = !lean_is_exclusive(x_19);
-if (x_208 == 0)
+x_212 = !lean_is_exclusive(x_19);
+if (x_212 == 0)
 {
 return x_19;
 }
 else
 {
-lean_object* x_209; lean_object* x_210; 
-x_209 = lean_ctor_get(x_19, 0);
-lean_inc(x_209);
+lean_object* x_213; lean_object* x_214; 
+x_213 = lean_ctor_get(x_19, 0);
+lean_inc(x_213);
 lean_dec(x_19);
-x_210 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_210, 0, x_209);
-return x_210;
+x_214 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_214, 0, x_213);
+return x_214;
 }
 }
 }
 else
 {
-lean_object* x_211; lean_object* x_212; 
+lean_object* x_215; lean_object* x_216; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -37619,10 +38497,10 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_211 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
-x_212 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_212, 0, x_211);
-return x_212;
+x_215 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
+x_216 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_216, 0, x_215);
+return x_216;
 }
 }
 }
@@ -37784,6 +38662,15 @@ lean_dec(x_1);
 return x_16;
 }
 }
+static lean_object* _init_l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17, lean_object* x_18, lean_object* x_19) {
 _start:
 {
@@ -37856,10 +38743,10 @@ lean_inc(x_34);
 x_35 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
 if (x_32 == 0)
 {
-uint8_t x_72; 
-x_72 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_31);
+uint8_t x_73; 
+x_73 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_31);
 lean_dec(x_31);
-if (x_72 == 0)
+if (x_73 == 0)
 {
 lean_dec(x_34);
 lean_dec(x_33);
@@ -37871,31 +38758,33 @@ goto _start;
 }
 else
 {
-goto block_71;
+goto block_72;
 }
 }
 else
 {
 lean_dec(x_31);
-goto block_71;
+goto block_72;
 }
-block_68:
+block_69:
 {
-uint8_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+uint8_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 x_36 = lean_ctor_get_uint8(x_8, sizeof(void*)*2);
 x_37 = lean_ctor_get(x_8, 0);
+x_38 = l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0;
 lean_inc_ref(x_2);
 lean_inc(x_1);
-x_38 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_38, 0, x_1);
-lean_ctor_set(x_38, 1, x_33);
-lean_ctor_set(x_38, 2, x_2);
+x_39 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_39, 0, x_1);
+lean_ctor_set(x_39, 1, x_33);
+lean_ctor_set(x_39, 2, x_2);
+lean_ctor_set(x_39, 3, x_38);
 lean_inc(x_22);
 lean_inc_ref(x_37);
-x_39 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_39, 0, x_37);
-lean_ctor_set(x_39, 1, x_22);
-lean_ctor_set_uint8(x_39, sizeof(void*)*2, x_36);
+x_40 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_40, 0, x_37);
+lean_ctor_set(x_40, 1, x_22);
+lean_ctor_set_uint8(x_40, sizeof(void*)*2, x_36);
 lean_inc(x_19);
 lean_inc_ref(x_18);
 lean_inc(x_17);
@@ -37907,36 +38796,36 @@ lean_inc_ref(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc_ref(x_3);
-x_40 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArgsPrefix_x3f(x_38, x_3, x_22, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_40) == 0)
+x_41 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArgsPrefix_x3f(x_39, x_3, x_22, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+if (lean_obj_tag(x_41) == 0)
 {
-lean_object* x_41; 
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-lean_dec_ref(x_40);
-if (lean_obj_tag(x_41) == 1)
-{
-lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+lean_object* x_42; 
 x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
 lean_dec_ref(x_41);
-x_43 = lean_st_ref_take(x_9);
-x_44 = !lean_is_exclusive(x_43);
-if (x_44 == 0)
+if (lean_obj_tag(x_42) == 1)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_45 = lean_ctor_get(x_43, 0);
-lean_dec(x_45);
-x_46 = lean_box(0);
+lean_object* x_43; lean_object* x_44; uint8_t x_45; 
+x_43 = lean_ctor_get(x_42, 0);
+lean_inc(x_43);
+lean_dec_ref(x_42);
+x_44 = lean_st_ref_take(x_9);
+x_45 = !lean_is_exclusive(x_44);
+if (x_45 == 0)
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_46 = lean_ctor_get(x_44, 0);
+lean_dec(x_46);
+x_47 = lean_box(0);
 if (lean_is_scalar(x_24)) {
- x_47 = lean_alloc_ctor(1, 2, 0);
+ x_48 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_47 = x_24;
+ x_48 = x_24;
 }
-lean_ctor_set(x_47, 0, x_42);
-lean_ctor_set(x_47, 1, x_46);
-lean_ctor_set(x_43, 0, x_47);
-x_48 = lean_st_ref_set(x_9, x_43);
+lean_ctor_set(x_48, 0, x_43);
+lean_ctor_set(x_48, 1, x_47);
+lean_ctor_set(x_44, 0, x_48);
+x_49 = lean_st_ref_set(x_9, x_44);
 lean_inc(x_19);
 lean_inc_ref(x_18);
 lean_inc(x_17);
@@ -37948,17 +38837,17 @@ lean_inc_ref(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_49 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices(x_39, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_49) == 0)
+x_50 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices(x_40, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+if (lean_obj_tag(x_50) == 0)
 {
-lean_dec_ref(x_49);
+lean_dec_ref(x_50);
 x_6 = x_23;
 x_7 = x_35;
 goto _start;
 }
 else
 {
-uint8_t x_51; 
+uint8_t x_52; 
 lean_dec(x_23);
 lean_dec(x_19);
 lean_dec_ref(x_18);
@@ -37974,41 +38863,41 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_51 = !lean_is_exclusive(x_49);
-if (x_51 == 0)
+x_52 = !lean_is_exclusive(x_50);
+if (x_52 == 0)
 {
-return x_49;
+return x_50;
 }
 else
 {
-lean_object* x_52; lean_object* x_53; 
-x_52 = lean_ctor_get(x_49, 0);
-lean_inc(x_52);
-lean_dec(x_49);
-x_53 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_53, 0, x_52);
-return x_53;
+lean_object* x_53; lean_object* x_54; 
+x_53 = lean_ctor_get(x_50, 0);
+lean_inc(x_53);
+lean_dec(x_50);
+x_54 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_54, 0, x_53);
+return x_54;
 }
 }
 }
 else
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_54 = lean_ctor_get(x_43, 1);
-lean_inc(x_54);
-lean_dec(x_43);
-x_55 = lean_box(0);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_55 = lean_ctor_get(x_44, 1);
+lean_inc(x_55);
+lean_dec(x_44);
+x_56 = lean_box(0);
 if (lean_is_scalar(x_24)) {
- x_56 = lean_alloc_ctor(1, 2, 0);
+ x_57 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_56 = x_24;
+ x_57 = x_24;
 }
-lean_ctor_set(x_56, 0, x_42);
-lean_ctor_set(x_56, 1, x_55);
-x_57 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_54);
-x_58 = lean_st_ref_set(x_9, x_57);
+lean_ctor_set(x_57, 0, x_43);
+lean_ctor_set(x_57, 1, x_56);
+x_58 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_58, 0, x_57);
+lean_ctor_set(x_58, 1, x_55);
+x_59 = lean_st_ref_set(x_9, x_58);
 lean_inc(x_19);
 lean_inc_ref(x_18);
 lean_inc(x_17);
@@ -38020,17 +38909,17 @@ lean_inc_ref(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_59 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices(x_39, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_59) == 0)
+x_60 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices(x_40, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+if (lean_obj_tag(x_60) == 0)
 {
-lean_dec_ref(x_59);
+lean_dec_ref(x_60);
 x_6 = x_23;
 x_7 = x_35;
 goto _start;
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
 lean_dec(x_23);
 lean_dec(x_19);
 lean_dec_ref(x_18);
@@ -38046,85 +38935,85 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_61 = lean_ctor_get(x_59, 0);
-lean_inc(x_61);
-if (lean_is_exclusive(x_59)) {
- lean_ctor_release(x_59, 0);
- x_62 = x_59;
+x_62 = lean_ctor_get(x_60, 0);
+lean_inc(x_62);
+if (lean_is_exclusive(x_60)) {
+ lean_ctor_release(x_60, 0);
+ x_63 = x_60;
 } else {
- lean_dec_ref(x_59);
- x_62 = lean_box(0);
+ lean_dec_ref(x_60);
+ x_63 = lean_box(0);
 }
-if (lean_is_scalar(x_62)) {
- x_63 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_63)) {
+ x_64 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_63 = x_62;
+ x_64 = x_63;
 }
-lean_ctor_set(x_63, 0, x_61);
-return x_63;
+lean_ctor_set(x_64, 0, x_62);
+return x_64;
 }
 }
 }
 else
 {
+lean_dec(x_42);
+lean_dec_ref(x_40);
+lean_dec(x_24);
+x_6 = x_23;
+x_7 = x_35;
+goto _start;
+}
+}
+else
+{
+uint8_t x_66; 
+lean_dec_ref(x_40);
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_19);
+lean_dec_ref(x_18);
+lean_dec(x_17);
+lean_dec_ref(x_16);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+x_66 = !lean_is_exclusive(x_41);
+if (x_66 == 0)
+{
+return x_41;
+}
+else
+{
+lean_object* x_67; lean_object* x_68; 
+x_67 = lean_ctor_get(x_41, 0);
+lean_inc(x_67);
 lean_dec(x_41);
-lean_dec_ref(x_39);
-lean_dec(x_24);
-x_6 = x_23;
-x_7 = x_35;
-goto _start;
-}
-}
-else
-{
-uint8_t x_65; 
-lean_dec_ref(x_39);
-lean_dec(x_24);
-lean_dec(x_23);
-lean_dec(x_19);
-lean_dec_ref(x_18);
-lean_dec(x_17);
-lean_dec_ref(x_16);
-lean_dec(x_15);
-lean_dec_ref(x_14);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_3);
-lean_dec_ref(x_2);
-lean_dec(x_1);
-x_65 = !lean_is_exclusive(x_40);
-if (x_65 == 0)
-{
-return x_40;
-}
-else
-{
-lean_object* x_66; lean_object* x_67; 
-x_66 = lean_ctor_get(x_40, 0);
-lean_inc(x_66);
-lean_dec(x_40);
-x_67 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-return x_67;
+x_68 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_68, 0, x_67);
+return x_68;
 }
 }
 }
-block_71:
+block_72:
 {
 if (x_4 == 0)
 {
 lean_dec(x_34);
-goto block_68;
+goto block_69;
 }
 else
 {
-uint8_t x_69; 
-x_69 = lean_nat_dec_eq(x_34, x_5);
+uint8_t x_70; 
+x_70 = lean_nat_dec_eq(x_34, x_5);
 lean_dec(x_34);
-if (x_69 == 0)
+if (x_70 == 0)
 {
 lean_dec(x_33);
 lean_dec(x_24);
@@ -38135,14 +39024,14 @@ goto _start;
 }
 else
 {
-goto block_68;
+goto block_69;
 }
 }
 }
 }
 else
 {
-uint8_t x_74; 
+uint8_t x_75; 
 lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_22);
@@ -38160,26 +39049,26 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_74 = !lean_is_exclusive(x_30);
-if (x_74 == 0)
+x_75 = !lean_is_exclusive(x_30);
+if (x_75 == 0)
 {
 return x_30;
 }
 else
 {
-lean_object* x_75; lean_object* x_76; 
-x_75 = lean_ctor_get(x_30, 0);
-lean_inc(x_75);
+lean_object* x_76; lean_object* x_77; 
+x_76 = lean_ctor_get(x_30, 0);
+lean_inc(x_76);
 lean_dec(x_30);
-x_76 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_76, 0, x_75);
-return x_76;
+x_77 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_77, 0, x_76);
+return x_77;
 }
 }
 }
 else
 {
-lean_object* x_77; 
+lean_object* x_78; 
 lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_22);
@@ -38197,79 +39086,81 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_77 = ((lean_object*)(l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0));
-lean_ctor_set(x_25, 0, x_77);
+x_78 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+lean_ctor_set(x_25, 0, x_78);
 return x_25;
 }
 }
 else
 {
-lean_object* x_78; uint8_t x_79; 
-x_78 = lean_ctor_get(x_25, 0);
-lean_inc(x_78);
+lean_object* x_79; uint8_t x_80; 
+x_79 = lean_ctor_get(x_25, 0);
+lean_inc(x_79);
 lean_dec(x_25);
-x_79 = lean_unbox(x_78);
-lean_dec(x_78);
-if (x_79 == 0)
+x_80 = lean_unbox(x_79);
+lean_dec(x_79);
+if (x_80 == 0)
 {
-lean_object* x_80; lean_object* x_81; 
-x_80 = lean_st_ref_get(x_10);
+lean_object* x_81; lean_object* x_82; 
+x_81 = lean_st_ref_get(x_10);
 lean_inc(x_22);
-x_81 = l_Lean_Meta_Grind_Goal_getENode(x_80, x_22, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_81) == 0)
+x_82 = l_Lean_Meta_Grind_Goal_getENode(x_81, x_22, x_16, x_17, x_18, x_19);
+if (lean_obj_tag(x_82) == 0)
 {
-lean_object* x_82; uint8_t x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_82 = lean_ctor_get(x_81, 0);
-lean_inc(x_82);
-lean_dec_ref(x_81);
-x_83 = lean_ctor_get_uint8(x_82, sizeof(void*)*11 + 4);
-x_84 = lean_ctor_get(x_82, 8);
-lean_inc(x_84);
-x_85 = lean_ctor_get(x_82, 9);
+lean_object* x_83; uint8_t x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+lean_dec_ref(x_82);
+x_84 = lean_ctor_get_uint8(x_83, sizeof(void*)*11 + 4);
+x_85 = lean_ctor_get(x_83, 8);
 lean_inc(x_85);
-x_86 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
-if (x_83 == 0)
+x_86 = lean_ctor_get(x_83, 9);
+lean_inc(x_86);
+x_87 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assignUnassignedLevelMVars_search___closed__1));
+if (x_84 == 0)
 {
-uint8_t x_114; 
-x_114 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_82);
-lean_dec(x_82);
-if (x_114 == 0)
+uint8_t x_116; 
+x_116 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_83);
+lean_dec(x_83);
+if (x_116 == 0)
 {
+lean_dec(x_86);
 lean_dec(x_85);
-lean_dec(x_84);
 lean_dec(x_24);
 lean_dec(x_22);
 x_6 = x_23;
-x_7 = x_86;
+x_7 = x_87;
 goto _start;
 }
 else
 {
-goto block_113;
+goto block_115;
 }
 }
 else
 {
-lean_dec(x_82);
-goto block_113;
+lean_dec(x_83);
+goto block_115;
 }
-block_110:
+block_112:
 {
-uint8_t x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_87 = lean_ctor_get_uint8(x_8, sizeof(void*)*2);
-x_88 = lean_ctor_get(x_8, 0);
+uint8_t x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_88 = lean_ctor_get_uint8(x_8, sizeof(void*)*2);
+x_89 = lean_ctor_get(x_8, 0);
+x_90 = l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0;
 lean_inc_ref(x_2);
 lean_inc(x_1);
-x_89 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_89, 0, x_1);
-lean_ctor_set(x_89, 1, x_84);
-lean_ctor_set(x_89, 2, x_2);
+x_91 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_91, 0, x_1);
+lean_ctor_set(x_91, 1, x_85);
+lean_ctor_set(x_91, 2, x_2);
+lean_ctor_set(x_91, 3, x_90);
 lean_inc(x_22);
-lean_inc_ref(x_88);
-x_90 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_90, 0, x_88);
-lean_ctor_set(x_90, 1, x_22);
-lean_ctor_set_uint8(x_90, sizeof(void*)*2, x_87);
+lean_inc_ref(x_89);
+x_92 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_92, 0, x_89);
+lean_ctor_set(x_92, 1, x_22);
+lean_ctor_set_uint8(x_92, sizeof(void*)*2, x_88);
 lean_inc(x_19);
 lean_inc_ref(x_18);
 lean_inc(x_17);
@@ -38281,46 +39172,46 @@ lean_inc_ref(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc_ref(x_3);
-x_91 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArgsPrefix_x3f(x_89, x_3, x_22, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_91) == 0)
+x_93 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArgsPrefix_x3f(x_91, x_3, x_22, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+if (lean_obj_tag(x_93) == 0)
 {
-lean_object* x_92; 
-x_92 = lean_ctor_get(x_91, 0);
-lean_inc(x_92);
-lean_dec_ref(x_91);
-if (lean_obj_tag(x_92) == 1)
+lean_object* x_94; 
+x_94 = lean_ctor_get(x_93, 0);
+lean_inc(x_94);
+lean_dec_ref(x_93);
+if (lean_obj_tag(x_94) == 1)
 {
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_93 = lean_ctor_get(x_92, 0);
-lean_inc(x_93);
-lean_dec_ref(x_92);
-x_94 = lean_st_ref_take(x_9);
-x_95 = lean_ctor_get(x_94, 1);
-lean_inc_ref(x_95);
-if (lean_is_exclusive(x_94)) {
- lean_ctor_release(x_94, 0);
- lean_ctor_release(x_94, 1);
- x_96 = x_94;
+lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_95 = lean_ctor_get(x_94, 0);
+lean_inc(x_95);
+lean_dec_ref(x_94);
+x_96 = lean_st_ref_take(x_9);
+x_97 = lean_ctor_get(x_96, 1);
+lean_inc_ref(x_97);
+if (lean_is_exclusive(x_96)) {
+ lean_ctor_release(x_96, 0);
+ lean_ctor_release(x_96, 1);
+ x_98 = x_96;
 } else {
- lean_dec_ref(x_94);
- x_96 = lean_box(0);
+ lean_dec_ref(x_96);
+ x_98 = lean_box(0);
 }
-x_97 = lean_box(0);
+x_99 = lean_box(0);
 if (lean_is_scalar(x_24)) {
- x_98 = lean_alloc_ctor(1, 2, 0);
+ x_100 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_98 = x_24;
+ x_100 = x_24;
 }
-lean_ctor_set(x_98, 0, x_93);
-lean_ctor_set(x_98, 1, x_97);
-if (lean_is_scalar(x_96)) {
- x_99 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_100, 0, x_95);
+lean_ctor_set(x_100, 1, x_99);
+if (lean_is_scalar(x_98)) {
+ x_101 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_99 = x_96;
+ x_101 = x_98;
 }
-lean_ctor_set(x_99, 0, x_98);
-lean_ctor_set(x_99, 1, x_95);
-x_100 = lean_st_ref_set(x_9, x_99);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_97);
+x_102 = lean_st_ref_set(x_9, x_101);
 lean_inc(x_19);
 lean_inc_ref(x_18);
 lean_inc(x_17);
@@ -38332,17 +39223,17 @@ lean_inc_ref(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_101 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices(x_90, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
-if (lean_obj_tag(x_101) == 0)
+x_103 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices(x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19);
+if (lean_obj_tag(x_103) == 0)
 {
-lean_dec_ref(x_101);
+lean_dec_ref(x_103);
 x_6 = x_23;
-x_7 = x_86;
+x_7 = x_87;
 goto _start;
 }
 else
 {
-lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
 lean_dec(x_23);
 lean_dec(x_19);
 lean_dec_ref(x_18);
@@ -38358,38 +39249,38 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_103 = lean_ctor_get(x_101, 0);
-lean_inc(x_103);
-if (lean_is_exclusive(x_101)) {
- lean_ctor_release(x_101, 0);
- x_104 = x_101;
+x_105 = lean_ctor_get(x_103, 0);
+lean_inc(x_105);
+if (lean_is_exclusive(x_103)) {
+ lean_ctor_release(x_103, 0);
+ x_106 = x_103;
 } else {
- lean_dec_ref(x_101);
- x_104 = lean_box(0);
+ lean_dec_ref(x_103);
+ x_106 = lean_box(0);
 }
-if (lean_is_scalar(x_104)) {
- x_105 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_106)) {
+ x_107 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_105 = x_104;
+ x_107 = x_106;
 }
-lean_ctor_set(x_105, 0, x_103);
-return x_105;
+lean_ctor_set(x_107, 0, x_105);
+return x_107;
 }
 }
 else
 {
-lean_dec(x_92);
-lean_dec_ref(x_90);
+lean_dec(x_94);
+lean_dec_ref(x_92);
 lean_dec(x_24);
 x_6 = x_23;
-x_7 = x_86;
+x_7 = x_87;
 goto _start;
 }
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-lean_dec_ref(x_90);
+lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+lean_dec_ref(x_92);
 lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_19);
@@ -38406,55 +39297,55 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_107 = lean_ctor_get(x_91, 0);
-lean_inc(x_107);
-if (lean_is_exclusive(x_91)) {
- lean_ctor_release(x_91, 0);
- x_108 = x_91;
+x_109 = lean_ctor_get(x_93, 0);
+lean_inc(x_109);
+if (lean_is_exclusive(x_93)) {
+ lean_ctor_release(x_93, 0);
+ x_110 = x_93;
 } else {
- lean_dec_ref(x_91);
- x_108 = lean_box(0);
+ lean_dec_ref(x_93);
+ x_110 = lean_box(0);
 }
-if (lean_is_scalar(x_108)) {
- x_109 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_110)) {
+ x_111 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_109 = x_108;
+ x_111 = x_110;
 }
-lean_ctor_set(x_109, 0, x_107);
-return x_109;
+lean_ctor_set(x_111, 0, x_109);
+return x_111;
 }
 }
-block_113:
+block_115:
 {
 if (x_4 == 0)
 {
-lean_dec(x_85);
-goto block_110;
+lean_dec(x_86);
+goto block_112;
 }
 else
 {
-uint8_t x_111; 
-x_111 = lean_nat_dec_eq(x_85, x_5);
-lean_dec(x_85);
-if (x_111 == 0)
+uint8_t x_113; 
+x_113 = lean_nat_dec_eq(x_86, x_5);
+lean_dec(x_86);
+if (x_113 == 0)
 {
-lean_dec(x_84);
+lean_dec(x_85);
 lean_dec(x_24);
 lean_dec(x_22);
 x_6 = x_23;
-x_7 = x_86;
+x_7 = x_87;
 goto _start;
 }
 else
 {
-goto block_110;
+goto block_112;
 }
 }
 }
 }
 else
 {
-lean_object* x_116; lean_object* x_117; lean_object* x_118; 
+lean_object* x_118; lean_object* x_119; lean_object* x_120; 
 lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_22);
@@ -38472,54 +39363,27 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_116 = lean_ctor_get(x_81, 0);
-lean_inc(x_116);
-if (lean_is_exclusive(x_81)) {
- lean_ctor_release(x_81, 0);
- x_117 = x_81;
+x_118 = lean_ctor_get(x_82, 0);
+lean_inc(x_118);
+if (lean_is_exclusive(x_82)) {
+ lean_ctor_release(x_82, 0);
+ x_119 = x_82;
 } else {
- lean_dec_ref(x_81);
- x_117 = lean_box(0);
+ lean_dec_ref(x_82);
+ x_119 = lean_box(0);
 }
-if (lean_is_scalar(x_117)) {
- x_118 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_119)) {
+ x_120 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_118 = x_117;
+ x_120 = x_119;
 }
-lean_ctor_set(x_118, 0, x_116);
-return x_118;
-}
-}
-else
-{
-lean_object* x_119; lean_object* x_120; 
-lean_dec(x_24);
-lean_dec(x_23);
-lean_dec(x_22);
-lean_dec(x_19);
-lean_dec_ref(x_18);
-lean_dec(x_17);
-lean_dec_ref(x_16);
-lean_dec(x_15);
-lean_dec_ref(x_14);
-lean_dec(x_13);
-lean_dec_ref(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec_ref(x_3);
-lean_dec_ref(x_2);
-lean_dec(x_1);
-x_119 = ((lean_object*)(l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_processChoices_spec__0___redArg___closed__0));
-x_120 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_120, 0, x_119);
+lean_ctor_set(x_120, 0, x_118);
 return x_120;
 }
 }
-}
 else
 {
-uint8_t x_121; 
+lean_object* x_121; lean_object* x_122; 
 lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_22);
@@ -38537,20 +39401,47 @@ lean_dec(x_9);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
 lean_dec(x_1);
-x_121 = !lean_is_exclusive(x_25);
-if (x_121 == 0)
+x_121 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__0));
+x_122 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_122, 0, x_121);
+return x_122;
+}
+}
+}
+else
+{
+uint8_t x_123; 
+lean_dec(x_24);
+lean_dec(x_23);
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec_ref(x_18);
+lean_dec(x_17);
+lean_dec_ref(x_16);
+lean_dec(x_15);
+lean_dec_ref(x_14);
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+x_123 = !lean_is_exclusive(x_25);
+if (x_123 == 0)
 {
 return x_25;
 }
 else
 {
-lean_object* x_122; lean_object* x_123; 
-x_122 = lean_ctor_get(x_25, 0);
-lean_inc(x_122);
+lean_object* x_124; lean_object* x_125; 
+x_124 = lean_ctor_get(x_25, 0);
+lean_inc(x_124);
 lean_dec(x_25);
-x_123 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_123, 0, x_122);
-return x_123;
+x_125 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_125, 0, x_124);
+return x_125;
 }
 }
 }
@@ -39427,10 +40318,10 @@ lean_inc(x_36);
 x_37 = lean_box(0);
 if (x_34 == 0)
 {
-uint8_t x_78; 
-x_78 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_30);
+uint8_t x_79; 
+x_79 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_30);
 lean_dec(x_30);
-if (x_78 == 0)
+if (x_79 == 0)
 {
 lean_dec(x_36);
 lean_dec(x_35);
@@ -39441,13 +40332,13 @@ goto block_46;
 }
 else
 {
-goto block_77;
+goto block_78;
 }
 }
 else
 {
 lean_dec(x_30);
-goto block_77;
+goto block_78;
 }
 block_46:
 {
@@ -39505,7 +40396,7 @@ lean_ctor_set(x_45, 0, x_44);
 return x_45;
 }
 }
-block_75:
+block_76:
 {
 lean_object* x_47; uint8_t x_48; 
 x_47 = l_Lean_Expr_cleanupAnnotations(x_32);
@@ -39572,13 +40463,15 @@ goto block_46;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
 x_59 = lean_box(0);
+x_60 = l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0;
 lean_inc_ref(x_2);
-x_60 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_35);
-lean_ctor_set(x_60, 2, x_2);
+x_61 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_61, 0, x_59);
+lean_ctor_set(x_61, 1, x_35);
+lean_ctor_set(x_61, 2, x_2);
+lean_ctor_set(x_61, 3, x_60);
 lean_inc(x_20);
 lean_inc_ref(x_19);
 lean_inc(x_18);
@@ -39590,19 +40483,19 @@ lean_inc_ref(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc_ref(x_3);
-x_61 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_60, x_3, x_55, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_61) == 0)
+x_62 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_61, x_3, x_55, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_62) == 0)
 {
-lean_object* x_62; 
-x_62 = lean_ctor_get(x_61, 0);
-lean_inc(x_62);
-lean_dec_ref(x_61);
-if (lean_obj_tag(x_62) == 1)
-{
-lean_object* x_63; lean_object* x_64; 
+lean_object* x_63; 
 x_63 = lean_ctor_get(x_62, 0);
 lean_inc(x_63);
 lean_dec_ref(x_62);
+if (lean_obj_tag(x_63) == 1)
+{
+lean_object* x_64; lean_object* x_65; 
+x_64 = lean_ctor_get(x_63, 0);
+lean_inc(x_64);
+lean_dec_ref(x_63);
 lean_inc(x_20);
 lean_inc_ref(x_19);
 lean_inc(x_18);
@@ -39619,12 +40512,12 @@ lean_inc_ref(x_49);
 lean_inc_ref(x_52);
 lean_inc_ref(x_5);
 lean_inc_ref(x_4);
-lean_inc(x_63);
-x_64 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_63, x_4, x_5, x_52, x_49, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_64) == 0)
+lean_inc(x_64);
+x_65 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_64, x_4, x_5, x_52, x_49, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_65) == 0)
 {
-lean_object* x_65; 
-lean_dec_ref(x_64);
+lean_object* x_66; 
+lean_dec_ref(x_65);
 lean_inc(x_20);
 lean_inc_ref(x_19);
 lean_inc(x_18);
@@ -39639,17 +40532,17 @@ lean_inc(x_10);
 lean_inc_ref(x_9);
 lean_inc_ref(x_5);
 lean_inc_ref(x_4);
-x_65 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_63, x_4, x_5, x_49, x_52, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_65) == 0)
+x_66 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_64, x_4, x_5, x_49, x_52, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_66) == 0)
 {
-lean_dec_ref(x_65);
+lean_dec_ref(x_66);
 x_38 = x_26;
 x_39 = lean_box(0);
 goto block_46;
 }
 else
 {
-uint8_t x_66; 
+uint8_t x_67; 
 lean_dec_ref(x_33);
 lean_dec(x_31);
 lean_dec(x_27);
@@ -39670,71 +40563,71 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_66 = !lean_is_exclusive(x_65);
-if (x_66 == 0)
+x_67 = !lean_is_exclusive(x_66);
+if (x_67 == 0)
+{
+return x_66;
+}
+else
+{
+lean_object* x_68; lean_object* x_69; 
+x_68 = lean_ctor_get(x_66, 0);
+lean_inc(x_68);
+lean_dec(x_66);
+x_69 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_69, 0, x_68);
+return x_69;
+}
+}
+}
+else
+{
+uint8_t x_70; 
+lean_dec(x_64);
+lean_dec_ref(x_52);
+lean_dec_ref(x_49);
+lean_dec_ref(x_33);
+lean_dec(x_31);
+lean_dec(x_27);
+lean_dec(x_26);
+lean_dec(x_20);
+lean_dec_ref(x_19);
+lean_dec(x_18);
+lean_dec_ref(x_17);
+lean_dec(x_16);
+lean_dec_ref(x_15);
+lean_dec(x_14);
+lean_dec_ref(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec_ref(x_5);
+lean_dec_ref(x_4);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+x_70 = !lean_is_exclusive(x_65);
+if (x_70 == 0)
 {
 return x_65;
 }
 else
 {
-lean_object* x_67; lean_object* x_68; 
-x_67 = lean_ctor_get(x_65, 0);
-lean_inc(x_67);
+lean_object* x_71; lean_object* x_72; 
+x_71 = lean_ctor_get(x_65, 0);
+lean_inc(x_71);
 lean_dec(x_65);
-x_68 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_68, 0, x_67);
-return x_68;
+x_72 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_72, 0, x_71);
+return x_72;
 }
 }
 }
 else
 {
-uint8_t x_69; 
 lean_dec(x_63);
 lean_dec_ref(x_52);
 lean_dec_ref(x_49);
-lean_dec_ref(x_33);
-lean_dec(x_31);
-lean_dec(x_27);
-lean_dec(x_26);
-lean_dec(x_20);
-lean_dec_ref(x_19);
-lean_dec(x_18);
-lean_dec_ref(x_17);
-lean_dec(x_16);
-lean_dec_ref(x_15);
-lean_dec(x_14);
-lean_dec_ref(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec_ref(x_5);
-lean_dec_ref(x_4);
-lean_dec_ref(x_3);
-lean_dec_ref(x_2);
-x_69 = !lean_is_exclusive(x_64);
-if (x_69 == 0)
-{
-return x_64;
-}
-else
-{
-lean_object* x_70; lean_object* x_71; 
-x_70 = lean_ctor_get(x_64, 0);
-lean_inc(x_70);
-lean_dec(x_64);
-x_71 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_71, 0, x_70);
-return x_71;
-}
-}
-}
-else
-{
-lean_dec(x_62);
-lean_dec_ref(x_52);
-lean_dec_ref(x_49);
 x_38 = x_26;
 x_39 = lean_box(0);
 goto block_46;
@@ -39742,7 +40635,7 @@ goto block_46;
 }
 else
 {
-uint8_t x_72; 
+uint8_t x_73; 
 lean_dec_ref(x_52);
 lean_dec_ref(x_49);
 lean_dec_ref(x_33);
@@ -39765,20 +40658,20 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_72 = !lean_is_exclusive(x_61);
-if (x_72 == 0)
+x_73 = !lean_is_exclusive(x_62);
+if (x_73 == 0)
 {
-return x_61;
+return x_62;
 }
 else
 {
-lean_object* x_73; lean_object* x_74; 
-x_73 = lean_ctor_get(x_61, 0);
-lean_inc(x_73);
-lean_dec(x_61);
-x_74 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_74, 0, x_73);
-return x_74;
+lean_object* x_74; lean_object* x_75; 
+x_74 = lean_ctor_get(x_62, 0);
+lean_inc(x_74);
+lean_dec(x_62);
+x_75 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_75, 0, x_74);
+return x_75;
 }
 }
 }
@@ -39786,19 +40679,19 @@ return x_74;
 }
 }
 }
-block_77:
+block_78:
 {
 if (x_6 == 0)
 {
 lean_dec(x_36);
-goto block_75;
+goto block_76;
 }
 else
 {
-uint8_t x_76; 
-x_76 = lean_nat_dec_eq(x_36, x_7);
+uint8_t x_77; 
+x_77 = lean_nat_dec_eq(x_36, x_7);
 lean_dec(x_36);
-if (x_76 == 0)
+if (x_77 == 0)
 {
 lean_dec(x_35);
 lean_dec_ref(x_32);
@@ -39808,14 +40701,14 @@ goto block_46;
 }
 else
 {
-goto block_75;
+goto block_76;
 }
 }
 }
 }
 else
 {
-uint8_t x_79; 
+uint8_t x_80; 
 lean_dec(x_27);
 lean_dec(x_26);
 lean_dec(x_20);
@@ -39834,26 +40727,26 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_79 = !lean_is_exclusive(x_29);
-if (x_79 == 0)
+x_80 = !lean_is_exclusive(x_29);
+if (x_80 == 0)
 {
 return x_29;
 }
 else
 {
-lean_object* x_80; lean_object* x_81; 
-x_80 = lean_ctor_get(x_29, 0);
-lean_inc(x_80);
+lean_object* x_81; lean_object* x_82; 
+x_81 = lean_ctor_get(x_29, 0);
+lean_inc(x_81);
 lean_dec(x_29);
-x_81 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_81, 0, x_80);
-return x_81;
+x_82 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_82, 0, x_81);
+return x_82;
 }
 }
 }
 else
 {
-uint8_t x_82; 
+uint8_t x_83; 
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -39870,125 +40763,125 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_82 = !lean_is_exclusive(x_8);
-if (x_82 == 0)
+x_83 = !lean_is_exclusive(x_8);
+if (x_83 == 0)
 {
-lean_object* x_83; lean_object* x_84; 
-x_83 = lean_ctor_get(x_8, 0);
-lean_dec(x_83);
-x_84 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
-lean_ctor_set(x_8, 0, x_84);
+lean_object* x_84; lean_object* x_85; 
+x_84 = lean_ctor_get(x_8, 0);
+lean_dec(x_84);
+x_85 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
+lean_ctor_set(x_8, 0, x_85);
 lean_ctor_set(x_22, 0, x_8);
 return x_22;
 }
 else
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_8, 1);
-lean_inc(x_85);
+lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_86 = lean_ctor_get(x_8, 1);
+lean_inc(x_86);
 lean_dec(x_8);
-x_86 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
-x_87 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_87, 0, x_86);
-lean_ctor_set(x_87, 1, x_85);
-lean_ctor_set(x_22, 0, x_87);
+x_87 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
+x_88 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_88, 0, x_87);
+lean_ctor_set(x_88, 1, x_86);
+lean_ctor_set(x_22, 0, x_88);
 return x_22;
 }
 }
 }
 else
 {
-lean_object* x_88; uint8_t x_89; 
-x_88 = lean_ctor_get(x_22, 0);
-lean_inc(x_88);
+lean_object* x_89; uint8_t x_90; 
+x_89 = lean_ctor_get(x_22, 0);
+lean_inc(x_89);
 lean_dec(x_22);
-x_89 = lean_unbox(x_88);
-lean_dec(x_88);
-if (x_89 == 0)
+x_90 = lean_unbox(x_89);
+lean_dec(x_89);
+if (x_90 == 0)
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_90 = lean_ctor_get(x_8, 1);
-lean_inc(x_90);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_91 = lean_ctor_get(x_8, 1);
+lean_inc(x_91);
 if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 0);
  lean_ctor_release(x_8, 1);
- x_91 = x_8;
+ x_92 = x_8;
 } else {
  lean_dec_ref(x_8);
- x_91 = lean_box(0);
+ x_92 = lean_box(0);
 }
-x_92 = lean_st_ref_get(x_11);
-lean_inc(x_90);
-x_93 = l_Lean_Meta_Grind_Goal_getENode(x_92, x_90, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_93) == 0)
+x_93 = lean_st_ref_get(x_11);
+lean_inc(x_91);
+x_94 = l_Lean_Meta_Grind_Goal_getENode(x_93, x_91, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_94) == 0)
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; uint8_t x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
-x_94 = lean_ctor_get(x_93, 0);
-lean_inc(x_94);
-if (lean_is_exclusive(x_93)) {
- lean_ctor_release(x_93, 0);
- x_95 = x_93;
+lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; uint8_t x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_95 = lean_ctor_get(x_94, 0);
+lean_inc(x_95);
+if (lean_is_exclusive(x_94)) {
+ lean_ctor_release(x_94, 0);
+ x_96 = x_94;
 } else {
- lean_dec_ref(x_93);
- x_95 = lean_box(0);
+ lean_dec_ref(x_94);
+ x_96 = lean_box(0);
 }
-x_96 = lean_ctor_get(x_94, 0);
-lean_inc_ref(x_96);
-x_97 = lean_ctor_get(x_94, 1);
+x_97 = lean_ctor_get(x_95, 0);
 lean_inc_ref(x_97);
-x_98 = lean_ctor_get_uint8(x_94, sizeof(void*)*11 + 4);
-x_99 = lean_ctor_get(x_94, 8);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_94, 9);
+x_98 = lean_ctor_get(x_95, 1);
+lean_inc_ref(x_98);
+x_99 = lean_ctor_get_uint8(x_95, sizeof(void*)*11 + 4);
+x_100 = lean_ctor_get(x_95, 8);
 lean_inc(x_100);
-x_101 = lean_box(0);
-if (x_98 == 0)
+x_101 = lean_ctor_get(x_95, 9);
+lean_inc(x_101);
+x_102 = lean_box(0);
+if (x_99 == 0)
 {
-uint8_t x_142; 
-x_142 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_94);
-lean_dec(x_94);
-if (x_142 == 0)
-{
-lean_dec(x_100);
-lean_dec(x_99);
-lean_dec_ref(x_96);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
-}
-else
-{
-goto block_141;
-}
-}
-else
-{
-lean_dec(x_94);
-goto block_141;
-}
-block_110:
-{
-uint8_t x_104; 
-x_104 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_97, x_1);
-if (x_104 == 0)
-{
-lean_object* x_105; 
-lean_dec_ref(x_102);
+uint8_t x_144; 
+x_144 = l_Lean_Meta_Grind_ENode_isCongrRoot(x_95);
 lean_dec(x_95);
-if (lean_is_scalar(x_91)) {
- x_105 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_105 = x_91;
+if (x_144 == 0)
+{
+lean_dec(x_101);
+lean_dec(x_100);
+lean_dec_ref(x_97);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
-lean_ctor_set(x_105, 0, x_101);
-lean_ctor_set(x_105, 1, x_97);
-x_8 = x_105;
+else
+{
+goto block_143;
+}
+}
+else
+{
+lean_dec(x_95);
+goto block_143;
+}
+block_111:
+{
+uint8_t x_105; 
+x_105 = l___private_Lean_Meta_Sym_ExprPtr_0__Lean_Meta_Sym_isSameExpr_unsafe__1(x_98, x_1);
+if (x_105 == 0)
+{
+lean_object* x_106; 
+lean_dec_ref(x_103);
+lean_dec(x_96);
+if (lean_is_scalar(x_92)) {
+ x_106 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_106 = x_92;
+}
+lean_ctor_set(x_106, 0, x_102);
+lean_ctor_set(x_106, 1, x_98);
+x_8 = x_106;
 goto _start;
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-lean_dec_ref(x_97);
+lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+lean_dec_ref(x_98);
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40005,97 +40898,99 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_107 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
-if (lean_is_scalar(x_91)) {
- x_108 = lean_alloc_ctor(0, 2, 0);
+x_108 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
+if (lean_is_scalar(x_92)) {
+ x_109 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_108 = x_91;
-}
-lean_ctor_set(x_108, 0, x_107);
-lean_ctor_set(x_108, 1, x_102);
-if (lean_is_scalar(x_95)) {
- x_109 = lean_alloc_ctor(0, 1, 0);
-} else {
- x_109 = x_95;
+ x_109 = x_92;
 }
 lean_ctor_set(x_109, 0, x_108);
-return x_109;
+lean_ctor_set(x_109, 1, x_103);
+if (lean_is_scalar(x_96)) {
+ x_110 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_110 = x_96;
+}
+lean_ctor_set(x_110, 0, x_109);
+return x_110;
 }
 }
-block_139:
+block_141:
 {
-lean_object* x_111; uint8_t x_112; 
-x_111 = l_Lean_Expr_cleanupAnnotations(x_96);
-x_112 = l_Lean_Expr_isApp(x_111);
-if (x_112 == 0)
+lean_object* x_112; uint8_t x_113; 
+x_112 = l_Lean_Expr_cleanupAnnotations(x_97);
+x_113 = l_Lean_Expr_isApp(x_112);
+if (x_113 == 0)
 {
-lean_dec_ref(x_111);
-lean_dec(x_99);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
+lean_dec_ref(x_112);
+lean_dec(x_100);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 else
 {
-lean_object* x_113; lean_object* x_114; uint8_t x_115; 
-x_113 = lean_ctor_get(x_111, 1);
-lean_inc_ref(x_113);
-x_114 = l_Lean_Expr_appFnCleanup___redArg(x_111);
-x_115 = l_Lean_Expr_isApp(x_114);
-if (x_115 == 0)
+lean_object* x_114; lean_object* x_115; uint8_t x_116; 
+x_114 = lean_ctor_get(x_112, 1);
+lean_inc_ref(x_114);
+x_115 = l_Lean_Expr_appFnCleanup___redArg(x_112);
+x_116 = l_Lean_Expr_isApp(x_115);
+if (x_116 == 0)
 {
+lean_dec_ref(x_115);
 lean_dec_ref(x_114);
-lean_dec_ref(x_113);
-lean_dec(x_99);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
+lean_dec(x_100);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 else
 {
-lean_object* x_116; lean_object* x_117; uint8_t x_118; 
-x_116 = lean_ctor_get(x_114, 1);
-lean_inc_ref(x_116);
-x_117 = l_Lean_Expr_appFnCleanup___redArg(x_114);
-x_118 = l_Lean_Expr_isApp(x_117);
-if (x_118 == 0)
+lean_object* x_117; lean_object* x_118; uint8_t x_119; 
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc_ref(x_117);
+x_118 = l_Lean_Expr_appFnCleanup___redArg(x_115);
+x_119 = l_Lean_Expr_isApp(x_118);
+if (x_119 == 0)
 {
+lean_dec_ref(x_118);
 lean_dec_ref(x_117);
-lean_dec_ref(x_116);
-lean_dec_ref(x_113);
-lean_dec(x_99);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
+lean_dec_ref(x_114);
+lean_dec(x_100);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 else
 {
-lean_object* x_119; lean_object* x_120; lean_object* x_121; uint8_t x_122; 
-x_119 = lean_ctor_get(x_117, 1);
-lean_inc_ref(x_119);
-x_120 = l_Lean_Expr_appFnCleanup___redArg(x_117);
-x_121 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_annotateMatchEqnType___lam__0___closed__1));
-x_122 = l_Lean_Expr_isConstOf(x_120, x_121);
+lean_object* x_120; lean_object* x_121; lean_object* x_122; uint8_t x_123; 
+x_120 = lean_ctor_get(x_118, 1);
+lean_inc_ref(x_120);
+x_121 = l_Lean_Expr_appFnCleanup___redArg(x_118);
+x_122 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_annotateMatchEqnType___lam__0___closed__1));
+x_123 = l_Lean_Expr_isConstOf(x_121, x_122);
+lean_dec_ref(x_121);
+if (x_123 == 0)
+{
 lean_dec_ref(x_120);
-if (x_122 == 0)
-{
-lean_dec_ref(x_119);
-lean_dec_ref(x_116);
-lean_dec_ref(x_113);
-lean_dec(x_99);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
+lean_dec_ref(x_117);
+lean_dec_ref(x_114);
+lean_dec(x_100);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 else
 {
-lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-x_123 = lean_box(0);
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+x_124 = lean_box(0);
+x_125 = l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0;
 lean_inc_ref(x_2);
-x_124 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_99);
-lean_ctor_set(x_124, 2, x_2);
+x_126 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_126, 0, x_124);
+lean_ctor_set(x_126, 1, x_100);
+lean_ctor_set(x_126, 2, x_2);
+lean_ctor_set(x_126, 3, x_125);
 lean_inc(x_20);
 lean_inc_ref(x_19);
 lean_inc(x_18);
@@ -40107,40 +41002,18 @@ lean_inc_ref(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc_ref(x_3);
-x_125 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_124, x_3, x_119, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_125) == 0)
+x_127 = l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchArg_x3f(x_126, x_3, x_120, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_127) == 0)
 {
-lean_object* x_126; 
-x_126 = lean_ctor_get(x_125, 0);
-lean_inc(x_126);
-lean_dec_ref(x_125);
-if (lean_obj_tag(x_126) == 1)
+lean_object* x_128; 
+x_128 = lean_ctor_get(x_127, 0);
+lean_inc(x_128);
+lean_dec_ref(x_127);
+if (lean_obj_tag(x_128) == 1)
 {
-lean_object* x_127; lean_object* x_128; 
-x_127 = lean_ctor_get(x_126, 0);
-lean_inc(x_127);
-lean_dec_ref(x_126);
-lean_inc(x_20);
-lean_inc_ref(x_19);
-lean_inc(x_18);
-lean_inc_ref(x_17);
-lean_inc(x_16);
-lean_inc_ref(x_15);
-lean_inc(x_14);
-lean_inc_ref(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc_ref(x_9);
-lean_inc_ref(x_113);
-lean_inc_ref(x_116);
-lean_inc_ref(x_5);
-lean_inc_ref(x_4);
-lean_inc(x_127);
-x_128 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_127, x_4, x_5, x_116, x_113, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_128) == 0)
-{
-lean_object* x_129; 
+lean_object* x_129; lean_object* x_130; 
+x_129 = lean_ctor_get(x_128, 0);
+lean_inc(x_129);
 lean_dec_ref(x_128);
 lean_inc(x_20);
 lean_inc_ref(x_19);
@@ -40154,23 +41027,45 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc_ref(x_9);
+lean_inc_ref(x_114);
+lean_inc_ref(x_117);
 lean_inc_ref(x_5);
 lean_inc_ref(x_4);
-x_129 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_127, x_4, x_5, x_113, x_116, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
-if (lean_obj_tag(x_129) == 0)
+lean_inc(x_129);
+x_130 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_129, x_4, x_5, x_117, x_114, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_130) == 0)
 {
-lean_dec_ref(x_129);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
+lean_object* x_131; 
+lean_dec_ref(x_130);
+lean_inc(x_20);
+lean_inc_ref(x_19);
+lean_inc(x_18);
+lean_inc_ref(x_17);
+lean_inc(x_16);
+lean_inc_ref(x_15);
+lean_inc(x_14);
+lean_inc_ref(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc_ref(x_9);
+lean_inc_ref(x_5);
+lean_inc_ref(x_4);
+x_131 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_matchEqBwdPat_spec__0___lam__0(x_129, x_4, x_5, x_114, x_117, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18, x_19, x_20);
+if (lean_obj_tag(x_131) == 0)
+{
+lean_dec_ref(x_131);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 else
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; 
-lean_dec_ref(x_97);
-lean_dec(x_95);
+lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec(x_92);
 lean_dec(x_91);
-lean_dec(x_90);
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40187,34 +41082,34 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_130 = lean_ctor_get(x_129, 0);
-lean_inc(x_130);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- x_131 = x_129;
+x_132 = lean_ctor_get(x_131, 0);
+lean_inc(x_132);
+if (lean_is_exclusive(x_131)) {
+ lean_ctor_release(x_131, 0);
+ x_133 = x_131;
 } else {
- lean_dec_ref(x_129);
- x_131 = lean_box(0);
+ lean_dec_ref(x_131);
+ x_133 = lean_box(0);
 }
-if (lean_is_scalar(x_131)) {
- x_132 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_133)) {
+ x_134 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_132 = x_131;
+ x_134 = x_133;
 }
-lean_ctor_set(x_132, 0, x_130);
-return x_132;
+lean_ctor_set(x_134, 0, x_132);
+return x_134;
 }
 }
 else
 {
-lean_object* x_133; lean_object* x_134; lean_object* x_135; 
-lean_dec(x_127);
-lean_dec_ref(x_116);
-lean_dec_ref(x_113);
-lean_dec_ref(x_97);
-lean_dec(x_95);
+lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+lean_dec(x_129);
+lean_dec_ref(x_117);
+lean_dec_ref(x_114);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec(x_92);
 lean_dec(x_91);
-lean_dec(x_90);
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40231,43 +41126,43 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_133 = lean_ctor_get(x_128, 0);
-lean_inc(x_133);
-if (lean_is_exclusive(x_128)) {
- lean_ctor_release(x_128, 0);
- x_134 = x_128;
+x_135 = lean_ctor_get(x_130, 0);
+lean_inc(x_135);
+if (lean_is_exclusive(x_130)) {
+ lean_ctor_release(x_130, 0);
+ x_136 = x_130;
 } else {
- lean_dec_ref(x_128);
- x_134 = lean_box(0);
+ lean_dec_ref(x_130);
+ x_136 = lean_box(0);
 }
-if (lean_is_scalar(x_134)) {
- x_135 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_136)) {
+ x_137 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_135 = x_134;
+ x_137 = x_136;
 }
-lean_ctor_set(x_135, 0, x_133);
-return x_135;
+lean_ctor_set(x_137, 0, x_135);
+return x_137;
 }
 }
 else
 {
-lean_dec(x_126);
-lean_dec_ref(x_116);
-lean_dec_ref(x_113);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
+lean_dec(x_128);
+lean_dec_ref(x_117);
+lean_dec_ref(x_114);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 }
 else
 {
-lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-lean_dec_ref(x_116);
-lean_dec_ref(x_113);
-lean_dec_ref(x_97);
-lean_dec(x_95);
+lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+lean_dec_ref(x_117);
+lean_dec_ref(x_114);
+lean_dec_ref(x_98);
+lean_dec(x_96);
+lean_dec(x_92);
 lean_dec(x_91);
-lean_dec(x_90);
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40284,60 +41179,60 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_136 = lean_ctor_get(x_125, 0);
-lean_inc(x_136);
-if (lean_is_exclusive(x_125)) {
- lean_ctor_release(x_125, 0);
- x_137 = x_125;
+x_138 = lean_ctor_get(x_127, 0);
+lean_inc(x_138);
+if (lean_is_exclusive(x_127)) {
+ lean_ctor_release(x_127, 0);
+ x_139 = x_127;
 } else {
- lean_dec_ref(x_125);
- x_137 = lean_box(0);
+ lean_dec_ref(x_127);
+ x_139 = lean_box(0);
 }
-if (lean_is_scalar(x_137)) {
- x_138 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_139)) {
+ x_140 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_138 = x_137;
+ x_140 = x_139;
 }
-lean_ctor_set(x_138, 0, x_136);
-return x_138;
+lean_ctor_set(x_140, 0, x_138);
+return x_140;
 }
 }
 }
 }
 }
 }
-block_141:
+block_143:
 {
 if (x_6 == 0)
 {
+lean_dec(x_101);
+goto block_141;
+}
+else
+{
+uint8_t x_142; 
+x_142 = lean_nat_dec_eq(x_101, x_7);
+lean_dec(x_101);
+if (x_142 == 0)
+{
 lean_dec(x_100);
-goto block_139;
+lean_dec_ref(x_97);
+x_103 = x_91;
+x_104 = lean_box(0);
+goto block_111;
 }
 else
 {
-uint8_t x_140; 
-x_140 = lean_nat_dec_eq(x_100, x_7);
-lean_dec(x_100);
-if (x_140 == 0)
-{
-lean_dec(x_99);
-lean_dec_ref(x_96);
-x_102 = x_90;
-x_103 = lean_box(0);
-goto block_110;
-}
-else
-{
-goto block_139;
+goto block_141;
 }
 }
 }
 }
 else
 {
-lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+lean_dec(x_92);
 lean_dec(x_91);
-lean_dec(x_90);
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40354,27 +41249,27 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_143 = lean_ctor_get(x_93, 0);
-lean_inc(x_143);
-if (lean_is_exclusive(x_93)) {
- lean_ctor_release(x_93, 0);
- x_144 = x_93;
+x_145 = lean_ctor_get(x_94, 0);
+lean_inc(x_145);
+if (lean_is_exclusive(x_94)) {
+ lean_ctor_release(x_94, 0);
+ x_146 = x_94;
 } else {
- lean_dec_ref(x_93);
- x_144 = lean_box(0);
+ lean_dec_ref(x_94);
+ x_146 = lean_box(0);
 }
-if (lean_is_scalar(x_144)) {
- x_145 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_146)) {
+ x_147 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_145 = x_144;
+ x_147 = x_146;
 }
-lean_ctor_set(x_145, 0, x_143);
-return x_145;
+lean_ctor_set(x_147, 0, x_145);
+return x_147;
 }
 }
 else
 {
-lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
+lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40391,33 +41286,33 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_146 = lean_ctor_get(x_8, 1);
-lean_inc(x_146);
+x_148 = lean_ctor_get(x_8, 1);
+lean_inc(x_148);
 if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 0);
  lean_ctor_release(x_8, 1);
- x_147 = x_8;
+ x_149 = x_8;
 } else {
  lean_dec_ref(x_8);
- x_147 = lean_box(0);
+ x_149 = lean_box(0);
 }
-x_148 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
-if (lean_is_scalar(x_147)) {
- x_149 = lean_alloc_ctor(0, 2, 0);
+x_150 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_synthesizeInsts___closed__0));
+if (lean_is_scalar(x_149)) {
+ x_151 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_149 = x_147;
+ x_151 = x_149;
 }
-lean_ctor_set(x_149, 0, x_148);
-lean_ctor_set(x_149, 1, x_146);
-x_150 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_150, 0, x_149);
-return x_150;
+lean_ctor_set(x_151, 0, x_150);
+lean_ctor_set(x_151, 1, x_148);
+x_152 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_152, 0, x_151);
+return x_152;
 }
 }
 }
 else
 {
-uint8_t x_151; 
+uint8_t x_153; 
 lean_dec(x_20);
 lean_dec_ref(x_19);
 lean_dec(x_18);
@@ -40435,20 +41330,20 @@ lean_dec_ref(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_3);
 lean_dec_ref(x_2);
-x_151 = !lean_is_exclusive(x_22);
-if (x_151 == 0)
+x_153 = !lean_is_exclusive(x_22);
+if (x_153 == 0)
 {
 return x_22;
 }
 else
 {
-lean_object* x_152; lean_object* x_153; 
-x_152 = lean_ctor_get(x_22, 0);
-lean_inc(x_152);
+lean_object* x_154; lean_object* x_155; 
+x_154 = lean_ctor_get(x_22, 0);
+lean_inc(x_154);
 lean_dec(x_22);
-x_153 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_153, 0, x_152);
-return x_153;
+x_155 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_155, 0, x_154);
+return x_155;
 }
 }
 }
@@ -41238,7 +42133,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(22u);
-x_3 = lean_unsigned_to_nat(883u);
+x_3 = lean_unsigned_to_nat(893u);
 x_4 = ((lean_object*)(l_Lean_Meta_Grind_EMatch_ematchTheorem___closed__0));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_assign_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -46277,9 +47172,11 @@ l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_M
 lean_mark_persistent(l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards_spec__1___redArg___lam__0___closed__3);
 l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards___closed__0 = _init_l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards___closed__0();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_collectGuards___closed__0);
-l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0 = _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__0();
-l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2 = _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2();
-lean_mark_persistent(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__7___redArg___closed__2);
+l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2();
+lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__2___redArg___closed__2);
+l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0 = _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__0();
+l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2 = _init_l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2();
+lean_mark_persistent(l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem_spec__8___redArg___closed__2);
 l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1 = _init_l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__1);
 l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3 = _init_l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__3();
@@ -46291,6 +47188,8 @@ lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grin
 l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13 = _init_l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___lam__2___closed__13);
 l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___closed__0 = _init_l___private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_instantiateTheorem___closed__0();
+l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0 = _init_l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0();
+lean_mark_persistent(l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatch_0__Lean_Meta_Grind_EMatch_main_spec__0___redArg___closed__0);
 l_Lean_Meta_Grind_EMatch_ematchTheorem___closed__1 = _init_l_Lean_Meta_Grind_EMatch_ematchTheorem___closed__1();
 lean_mark_persistent(l_Lean_Meta_Grind_EMatch_ematchTheorem___closed__1);
 l___private_Lean_Data_PersistentArray_0__Lean_PersistentArray_forFromMAux___at___00Lean_PersistentArray_forM___at___00Lean_Meta_Grind_EMatch_ematchTheorems_spec__0_spec__0___closed__0 = _init_l___private_Lean_Data_PersistentArray_0__Lean_PersistentArray_forFromMAux___at___00Lean_PersistentArray_forM___at___00Lean_Meta_Grind_EMatch_ematchTheorems_spec__0_spec__0___closed__0();
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheorem.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheorem.c
index 4802714c25..a8be6de2f1 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheorem.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheorem.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Lean.Meta.Tactic.Grind.EMatchTheorem
-// Imports: public import Lean.Meta.Tactic.Grind.Extension import Lean.Meta.Tactic.Grind.Util import Lean.Meta.Tactic.TryThis import Lean.Meta.Sym.Util import Lean.Meta.Sym.Eta
+// Imports: public import Lean.Meta.Tactic.Grind.Extension import Lean.Meta.Tactic.Grind.Util import Lean.Meta.Tactic.TryThis import Lean.Meta.Sym.Util import Lean.Meta.Sym.Eta import Init.Omega
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -829,34 +829,111 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Grind_groundPattern_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_groundPattern_x3f___boxed(lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_isGroundPattern(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_isGroundPattern___boxed(lean_object*);
+static const lean_string_object l_Lean_Meta_Grind_mkHOPattern___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 7, .m_capacity = 7, .m_length = 6, .m_data = "ho_pat"};
+static const lean_object* l_Lean_Meta_Grind_mkHOPattern___closed__0 = (const lean_object*)&l_Lean_Meta_Grind_mkHOPattern___closed__0_value;
+static const lean_ctor_object l_Lean_Meta_Grind_mkHOPattern___closed__1_value_aux_0 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_Meta_Grind_mkGroundPattern___closed__0_value),LEAN_SCALAR_PTR_LITERAL(223, 115, 241, 203, 181, 236, 81, 221)}};
+static const lean_ctor_object l_Lean_Meta_Grind_mkHOPattern___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkHOPattern___closed__1_value_aux_0),((lean_object*)&l_Lean_Meta_Grind_mkHOPattern___closed__0_value),LEAN_SCALAR_PTR_LITERAL(140, 210, 34, 127, 243, 81, 104, 148)}};
+static const lean_object* l_Lean_Meta_Grind_mkHOPattern___closed__1 = (const lean_object*)&l_Lean_Meta_Grind_mkHOPattern___closed__1_value;
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_mkHOPattern(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_hoPattern_x3f(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_hoPattern_x3f___boxed(lean_object*);
+LEAN_EXPORT uint8_t l_Lean_Meta_Grind_isHOPattern(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_isHOPattern___boxed(lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Grind_isPatternDontCare(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_isPatternDontCare___boxed(lean_object*);
 uint8_t l_Lean_Expr_isBVar(lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_isAtomicPattern(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_isAtomicPattern___boxed(lean_object*);
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 5, .m_capacity = 5, .m_length = 2, .m_data = "∀ "};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__0 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__0_value;
+static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__1;
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = ", "};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__2 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__2_value;
+static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3;
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__4_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 5, .m_capacity = 5, .m_length = 4, .m_data = "fun "};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__4 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__4_value;
+static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__5;
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__6_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 5, .m_capacity = 5, .m_length = 4, .m_data = " => "};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__6 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__6_value;
+static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__7;
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "_"};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8_value;
+static const lean_ctor_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__9_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8_value),LEAN_SCALAR_PTR_LITERAL(168, 60, 211, 188, 58, 220, 100, 184)}};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__9 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__9_value;
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__10_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "x"};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__10 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__10_value;
+static const lean_ctor_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__11_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__10_value),LEAN_SCALAR_PTR_LITERAL(243, 101, 181, 186, 114, 114, 131, 189)}};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__11 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__11_value;
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__12_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "#"};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__12 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__12_value;
+static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13;
+static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 0, .m_other = 1, .m_tag = 3}, .m_objs = {((lean_object*)&l___private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3___closed__12_value)}};
+static const lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__0_value;
+static lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBodyAtom(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0(lean_object*, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(lean_object*, lean_object*);
+uint8_t l_Lean_Expr_isLambda(lean_object*);
+uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
+lean_object* l_List_get_x3fInternal___redArg(lean_object*, lean_object*);
+lean_object* l_List_lengthTR___redArg(lean_object*);
+uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
+lean_object* l_Lean_MessageData_ofExpr(lean_object*);
+lean_object* lean_expr_dbg_to_string(lean_object*);
+lean_object* l_Lean_MessageData_paren(lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l_Lean_Meta_Grind_ppPattern___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = "`["};
 static const lean_object* l_Lean_Meta_Grind_ppPattern___closed__0 = (const lean_object*)&l_Lean_Meta_Grind_ppPattern___closed__0_value;
 static lean_object* l_Lean_Meta_Grind_ppPattern___closed__1;
 static lean_object* l_Lean_Meta_Grind_ppPattern___closed__2;
-static const lean_string_object l_Lean_Meta_Grind_ppPattern___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "#"};
+static const lean_string_object l_Lean_Meta_Grind_ppPattern___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 4, .m_capacity = 4, .m_length = 3, .m_data = "ho["};
 static const lean_object* l_Lean_Meta_Grind_ppPattern___closed__3 = (const lean_object*)&l_Lean_Meta_Grind_ppPattern___closed__3_value;
 static lean_object* l_Lean_Meta_Grind_ppPattern___closed__4;
-static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*1 + 0, .m_other = 1, .m_tag = 3}, .m_objs = {((lean_object*)&l___private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3___closed__12_value)}};
-static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__0_value;
-static lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppArg(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1(lean_object*, size_t, size_t, lean_object*);
 static const lean_string_object l_Lean_Meta_Grind_ppPattern___closed__5_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 4, .m_capacity = 4, .m_length = 3, .m_data = " + "};
 static const lean_object* l_Lean_Meta_Grind_ppPattern___closed__5 = (const lean_object*)&l_Lean_Meta_Grind_ppPattern___closed__5_value;
 static lean_object* l_Lean_Meta_Grind_ppPattern___closed__6;
-static const lean_string_object l_Lean_Meta_Grind_ppPattern___closed__7_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 2, .m_capacity = 2, .m_length = 1, .m_data = "_"};
-static const lean_object* l_Lean_Meta_Grind_ppPattern___closed__7 = (const lean_object*)&l_Lean_Meta_Grind_ppPattern___closed__7_value;
-static lean_object* l_Lean_Meta_Grind_ppPattern___closed__8;
-lean_object* l_Lean_MessageData_ofExpr(lean_object*);
+static lean_object* l_Lean_Meta_Grind_ppPattern___closed__7;
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_ppPattern(lean_object*);
-lean_object* l_Lean_MessageData_paren(lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static const lean_ctor_object l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1))}};
+static const lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0 = (const lean_object*)&l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0_value;
+static lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__1;
+static lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2;
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0_spec__0(lean_object*, lean_object*, size_t, size_t);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0___boxed(lean_object*, lean_object*);
+lean_object* lean_array_push(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar(lean_object*, lean_object*);
+lean_object* l_StateT_instMonad___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_StateT_instMonad___redArg___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_StateT_instMonad___redArg___lam__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_StateT_instMonad___redArg___lam__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_StateT_map(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_StateT_pure(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_StateT_bind(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__2(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
+static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 82, .m_capacity = 82, .m_length = 81, .m_data = "_private.Lean.Meta.Tactic.Grind.EMatchTheorem.0.Lean.Meta.Grind.MillerCheck.visit"};
+static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__0 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__0_value;
+static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1;
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkMillerHOPattern_x3f(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_isCandidateSymbol___redArg(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_isCandidateSymbol___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_isCandidateSymbol(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -871,7 +948,6 @@ LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_Raw_u2080_expand___at___00Std_D
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbol_spec__1___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbol_spec__0___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbol_spec__0___redArg___boxed(lean_object*, lean_object*);
-lean_object* lean_array_push(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbol___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbol___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbol(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1076,20 +1152,24 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lea
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_ParentKind_genPattern_elim___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_toParentKind(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_toParentKind___boxed(lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg(uint8_t, lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instMonadEST(lean_object*, lean_object*);
-static lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__0;
+static lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__0;
 lean_object* l_Lean_Core_instMonadCoreM___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Core_instMonadCoreM___lam__0___boxed, .m_arity = 5, .m_num_fixed = 0, .m_objs = {} };
-static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__1 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__1_value;
+static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Core_instMonadCoreM___lam__0___boxed, .m_arity = 5, .m_num_fixed = 0, .m_objs = {} };
+static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__1 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__1_value;
 lean_object* l_Lean_Core_instMonadCoreM___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Core_instMonadCoreM___lam__1___boxed, .m_arity = 7, .m_num_fixed = 0, .m_objs = {} };
-static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__2 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__2_value;
+static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Core_instMonadCoreM___lam__1___boxed, .m_arity = 7, .m_num_fixed = 0, .m_objs = {} };
+static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__2 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__2_value;
 lean_object* l_Lean_Meta_instMonadMetaM___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Meta_instMonadMetaM___lam__0___boxed, .m_arity = 7, .m_num_fixed = 0, .m_objs = {} };
-static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3_value;
+static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Meta_instMonadMetaM___lam__0___boxed, .m_arity = 7, .m_num_fixed = 0, .m_objs = {} };
+static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3_value;
 lean_object* l_Lean_Meta_instMonadMetaM___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Meta_instMonadMetaM___lam__1___boxed, .m_arity = 9, .m_num_fixed = 0, .m_objs = {} };
-static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4_value;
+static const lean_closure_object l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_closure_object) + sizeof(void*)*0, .m_other = 0, .m_tag = 245}, .m_fun = (void*)l_Lean_Meta_instMonadMetaM___lam__1___boxed, .m_arity = 9, .m_num_fixed = 0, .m_objs = {} };
+static const lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4 = (const lean_object*)&l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4_value;
 lean_object* l_ReaderT_instMonad___redArg(lean_object*);
 lean_object* l_ReaderT_instFunctorOfMonad___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_instFunctorOfMonad___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1097,10 +1177,8 @@ lean_object* l_ReaderT_instApplicativeOfMonad___redArg___lam__1(lean_object*, le
 lean_object* l_ReaderT_instApplicativeOfMonad___redArg___lam__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_instApplicativeOfMonad___redArg___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instInhabitedForall___redArg___lam__0___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 46, .m_capacity = 46, .m_length = 45, .m_data = "assertion violation: f.isConst || f.isFVar\n  "};
 static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__1 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__1_value;
 static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 84, .m_capacity = 84, .m_length = 83, .m_data = "_private.Lean.Meta.Tactic.Grind.EMatchTheorem.0.Lean.Meta.Grind.NormalizePattern.go"};
@@ -1110,18 +1188,36 @@ static const lean_string_object l___private_Lean_Meta_Tactic_Grind_EMatchTheorem
 static const lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__3 = (const lean_object*)&l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__3_value;
 static lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg(lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isFVar(lean_object*);
 lean_object* l_Lean_indentD(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg___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_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___boxed(lean_object**);
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg___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_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0(uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___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_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3(lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_collectNonHOBVars(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go_spec__0(lean_object*, uint8_t, lean_object*, size_t, size_t);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_app___override(lean_object*, lean_object*);
+lean_object* l_Lean_mkMData(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___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_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM_loop___at___00Lean_Meta_Grind_NormalizePattern_main_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM_loop___at___00Lean_Meta_Grind_NormalizePattern_main_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Grind_NormalizePattern_main___closed__0;
@@ -1131,8 +1227,6 @@ static lean_object* l_Lean_Meta_Grind_NormalizePattern_main___closed__3;
 lean_object* lean_array_to_list(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_NormalizePattern_main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_NormalizePattern_main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Name_quickCmp(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Std_DTreeMap_Internal_Impl_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkTypeFVars_spec__0___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DTreeMap_Internal_Impl_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkTypeFVars_spec__0___redArg___boxed(lean_object*, lean_object*);
@@ -1159,8 +1253,6 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Uns
 lean_object* l_Array_toSubarray___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__2___lam__0(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___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__2___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_ctor_object l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 0}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)(((size_t)(0) << 1) | 1))}};
-static const lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1___closed__0 = (const lean_object*)&l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_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_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1325,33 +1417,30 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Grind_mkEMatchTheorem___boxed(lean_object*,
 static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 45, .m_capacity = 45, .m_length = 44, .m_data = "mkEMatchEqTheoremCore: after preprocessing: "};
 static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__0 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__0_value;
 static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__1;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = ", "};
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 6, .m_capacity = 6, .m_length = 5, .m_data = "debug"};
 static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2_value;
-static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 6, .m_capacity = 6, .m_length = 5, .m_data = "debug"};
-static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4_value;
 lean_object* l_Lean_Name_mkStr4(lean_object*, lean_object*, lean_object*, lean_object*);
-static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value_aux_0 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_Meta_Grind_mkGroundPattern___closed__0_value),LEAN_SCALAR_PTR_LITERAL(223, 115, 241, 203, 181, 236, 81, 221)}};
-static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value_aux_1 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value_aux_0),((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4_value),LEAN_SCALAR_PTR_LITERAL(92, 174, 15, 22, 76, 124, 59, 78)}};
-static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value_aux_2 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value_aux_1),((lean_object*)&l_Lean_Meta_Grind_mkEMatchTheoremCore___closed__4_value),LEAN_SCALAR_PTR_LITERAL(202, 43, 255, 36, 142, 130, 165, 160)}};
-static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value_aux_2),((lean_object*)&l_Lean_Meta_Grind_mkEMatchTheoremCore___closed__5_value),LEAN_SCALAR_PTR_LITERAL(174, 4, 77, 131, 83, 1, 103, 112)}};
-static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5_value;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__6_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 32, .m_capacity = 32, .m_length = 31, .m_data = "mkEMatchEqTheoremCore: origin: "};
+static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value_aux_0 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)(((size_t)(0) << 1) | 1)),((lean_object*)&l_Lean_Meta_Grind_mkGroundPattern___closed__0_value),LEAN_SCALAR_PTR_LITERAL(223, 115, 241, 203, 181, 236, 81, 221)}};
+static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value_aux_1 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value_aux_0),((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2_value),LEAN_SCALAR_PTR_LITERAL(92, 174, 15, 22, 76, 124, 59, 78)}};
+static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value_aux_2 = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value_aux_1),((lean_object*)&l_Lean_Meta_Grind_mkEMatchTheoremCore___closed__4_value),LEAN_SCALAR_PTR_LITERAL(202, 43, 255, 36, 142, 130, 165, 160)}};
+static const lean_ctor_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 8, .m_other = 2, .m_tag = 1}, .m_objs = {((lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value_aux_2),((lean_object*)&l_Lean_Meta_Grind_mkEMatchTheoremCore___closed__5_value),LEAN_SCALAR_PTR_LITERAL(174, 4, 77, 131, 83, 1, 103, 112)}};
+static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3_value;
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 32, .m_capacity = 32, .m_length = 31, .m_data = "mkEMatchEqTheoremCore: origin: "};
+static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4_value;
+static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5;
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__6_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 8, .m_capacity = 8, .m_length = 7, .m_data = ", pat: "};
 static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__6 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__6_value;
 static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__7;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__8_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 8, .m_capacity = 8, .m_length = 7, .m_data = ", pat: "};
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__8_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 11, .m_capacity = 11, .m_length = 10, .m_data = ", useLhs: "};
 static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__8 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__8_value;
 static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__9;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 11, .m_capacity = 11, .m_length = 10, .m_data = ", useLhs: "};
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 6, .m_capacity = 6, .m_length = 5, .m_data = "false"};
 static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10_value;
-static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 6, .m_capacity = 6, .m_length = 5, .m_data = "false"};
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 5, .m_capacity = 5, .m_length = 4, .m_data = "true"};
+static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11_value;
+static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 68, .m_capacity = 68, .m_length = 67, .m_data = "invalid E-matching equality theorem, conclusion must be an equality"};
 static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12_value;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 5, .m_capacity = 5, .m_length = 4, .m_data = "true"};
-static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13_value;
-static const lean_string_object l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__14_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 68, .m_capacity = 68, .m_length = 67, .m_data = "invalid E-matching equality theorem, conclusion must be an equality"};
-static const lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__14 = (const lean_object*)&l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__14_value;
-static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__15;
+static lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13;
 lean_object* lean_expr_abstract(lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0(uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -9378,7 +9467,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(26u);
-x_3 = lean_unsigned_to_nat(136u);
+x_3 = lean_unsigned_to_nat(137u);
 x_4 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__1));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -9391,7 +9480,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(26u);
-x_3 = lean_unsigned_to_nat(135u);
+x_3 = lean_unsigned_to_nat(136u);
 x_4 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__1));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -9404,7 +9493,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(26u);
-x_3 = lean_unsigned_to_nat(132u);
+x_3 = lean_unsigned_to_nat(133u);
 x_4 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__1));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -9417,7 +9506,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(26u);
-x_3 = lean_unsigned_to_nat(131u);
+x_3 = lean_unsigned_to_nat(132u);
 x_4 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__1));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -13308,7 +13397,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(18u);
-x_3 = lean_unsigned_to_nat(329u);
+x_3 = lean_unsigned_to_nat(330u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_EMatchTheoremKind_explainFailure___closed__2));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -13321,7 +13410,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(18u);
-x_3 = lean_unsigned_to_nat(336u);
+x_3 = lean_unsigned_to_nat(337u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_EMatchTheoremKind_explainFailure___closed__2));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -15107,6 +15196,63 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_mkHOPattern(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = ((lean_object*)(l_Lean_Meta_Grind_mkHOPattern___closed__1));
+x_3 = l_Lean_mkAnnotation(x_2, x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_hoPattern_x3f(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = ((lean_object*)(l_Lean_Meta_Grind_mkHOPattern___closed__1));
+x_3 = l_Lean_annotation_x3f(x_2, x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_hoPattern_x3f___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Meta_Grind_hoPattern_x3f(x_1);
+lean_dec_ref(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT uint8_t l_Lean_Meta_Grind_isHOPattern(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Meta_Grind_hoPattern_x3f(x_1);
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 0;
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+lean_dec_ref(x_2);
+x_4 = 1;
+return x_4;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Meta_Grind_isHOPattern___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_Meta_Grind_isHOPattern(x_1);
+lean_dec_ref(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
 LEAN_EXPORT uint8_t l_Lean_Meta_Grind_isPatternDontCare(lean_object* x_1) {
 _start:
 {
@@ -15129,28 +15275,37 @@ return x_3;
 LEAN_EXPORT uint8_t l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_isAtomicPattern(lean_object* x_1) {
 _start:
 {
-uint8_t x_2; uint8_t x_5; 
-x_5 = l_Lean_Expr_isBVar(x_1);
-if (x_5 == 0)
+uint8_t x_2; uint8_t x_6; 
+x_6 = l_Lean_Expr_isBVar(x_1);
+if (x_6 == 0)
 {
-uint8_t x_6; 
-x_6 = l_Lean_Meta_Grind_isPatternDontCare(x_1);
-x_2 = x_6;
-goto block_4;
+uint8_t x_7; 
+x_7 = l_Lean_Meta_Grind_isPatternDontCare(x_1);
+x_2 = x_7;
+goto block_5;
 }
 else
 {
-x_2 = x_5;
-goto block_4;
+x_2 = x_6;
+goto block_5;
 }
-block_4:
+block_5:
 {
 if (x_2 == 0)
 {
 uint8_t x_3; 
 x_3 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_isGroundPattern(x_1);
+if (x_3 == 0)
+{
+uint8_t x_4; 
+x_4 = l_Lean_Meta_Grind_isHOPattern(x_1);
+return x_4;
+}
+else
+{
 return x_3;
 }
+}
 else
 {
 return x_2;
@@ -15168,6 +15323,371 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__0));
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__2));
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__4));
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__6));
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__12));
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__0));
+x_2 = l_Lean_MessageData_ofFormat(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0(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)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; size_t x_12; size_t x_13; 
+x_7 = lean_array_uget(x_2, x_3);
+x_8 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1;
+x_9 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_9, 0, x_5);
+lean_ctor_set(x_9, 1, x_8);
+lean_inc(x_1);
+x_10 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBodyAtom(x_7, x_1);
+x_11 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_11, 0, x_9);
+lean_ctor_set(x_11, 1, x_10);
+x_12 = 1;
+x_13 = lean_usize_add(x_3, x_12);
+x_3 = x_13;
+x_5 = x_11;
+goto _start;
+}
+else
+{
+lean_dec(x_1);
+return x_5;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_21; lean_object* x_22; 
+switch (lean_obj_tag(x_1)) {
+case 7:
+{
+lean_object* x_28; lean_object* x_29; 
+x_28 = lean_ctor_get(x_1, 0);
+x_29 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_29);
+lean_inc(x_28);
+x_21 = x_28;
+x_22 = x_29;
+goto block_27;
+}
+case 6:
+{
+lean_object* x_30; lean_object* x_31; 
+x_30 = lean_ctor_get(x_1, 0);
+x_31 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_31);
+lean_inc(x_30);
+x_21 = x_30;
+x_22 = x_31;
+goto block_27;
+}
+case 0:
+{
+lean_object* x_32; lean_object* x_33; 
+x_32 = lean_ctor_get(x_1, 0);
+lean_inc(x_32);
+lean_dec_ref(x_1);
+lean_inc(x_32);
+x_33 = l_List_get_x3fInternal___redArg(x_2, x_32);
+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; lean_object* x_40; 
+x_34 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13;
+x_35 = l_List_lengthTR___redArg(x_2);
+lean_dec(x_2);
+x_36 = lean_nat_sub(x_32, x_35);
+lean_dec(x_35);
+lean_dec(x_32);
+x_37 = l_Nat_reprFast(x_36);
+x_38 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_38, 0, x_37);
+x_39 = l_Lean_MessageData_ofFormat(x_38);
+x_40 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_40, 0, x_34);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
+}
+else
+{
+lean_object* x_41; lean_object* x_42; 
+lean_dec(x_32);
+lean_dec(x_2);
+x_41 = lean_ctor_get(x_33, 0);
+lean_inc(x_41);
+lean_dec_ref(x_33);
+x_42 = l_Lean_MessageData_ofName(x_41);
+return x_42;
+}
+}
+case 5:
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+x_43 = l_Lean_Expr_getAppFn(x_1);
+x_44 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___at___00Lean_Core_transform___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectOffsets_spec__0_spec__0___lam__1___closed__0;
+x_45 = l_Lean_Expr_getAppNumArgs(x_1);
+lean_inc(x_45);
+x_46 = lean_mk_array(x_45, x_44);
+x_47 = lean_unsigned_to_nat(1u);
+x_48 = lean_nat_sub(x_45, x_47);
+lean_dec(x_45);
+x_49 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_1, x_46, x_48);
+lean_inc(x_2);
+x_50 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(x_43, x_2);
+x_51 = lean_unsigned_to_nat(0u);
+x_52 = lean_array_get_size(x_49);
+x_53 = lean_nat_dec_lt(x_51, x_52);
+if (x_53 == 0)
+{
+lean_dec_ref(x_49);
+lean_dec(x_2);
+return x_50;
+}
+else
+{
+uint8_t x_54; 
+x_54 = lean_nat_dec_le(x_52, x_52);
+if (x_54 == 0)
+{
+if (x_53 == 0)
+{
+lean_dec_ref(x_49);
+lean_dec(x_2);
+return x_50;
+}
+else
+{
+size_t x_55; size_t x_56; lean_object* x_57; 
+x_55 = 0;
+x_56 = lean_usize_of_nat(x_52);
+x_57 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0(x_2, x_49, x_55, x_56, x_50);
+lean_dec_ref(x_49);
+return x_57;
+}
+}
+else
+{
+size_t x_58; size_t x_59; lean_object* x_60; 
+x_58 = 0;
+x_59 = lean_usize_of_nat(x_52);
+x_60 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0(x_2, x_49, x_58, x_59, x_50);
+lean_dec_ref(x_49);
+return x_60;
+}
+}
+}
+case 10:
+{
+lean_object* x_61; 
+x_61 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_61);
+lean_dec_ref(x_1);
+x_1 = x_61;
+goto _start;
+}
+default: 
+{
+uint8_t x_63; 
+lean_dec(x_2);
+x_63 = l_Lean_Expr_hasLooseBVars(x_1);
+if (x_63 == 0)
+{
+lean_object* x_64; 
+x_64 = l_Lean_MessageData_ofExpr(x_1);
+return x_64;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_expr_dbg_to_string(x_1);
+lean_dec_ref(x_1);
+x_66 = l_Lean_stringToMessageData(x_65);
+return x_66;
+}
+}
+}
+block_20:
+{
+lean_object* x_5; lean_object* x_6; uint8_t x_7; 
+lean_inc(x_4);
+x_5 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_5, 0, x_4);
+lean_ctor_set(x_5, 1, x_2);
+x_6 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(x_3, x_5);
+x_7 = l_Lean_Expr_isLambda(x_1);
+lean_dec_ref(x_1);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_8 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__1;
+x_9 = l_Lean_MessageData_ofName(x_4);
+x_10 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_10, 0, x_8);
+lean_ctor_set(x_10, 1, x_9);
+x_11 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3;
+x_12 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_12, 0, x_10);
+lean_ctor_set(x_12, 1, x_11);
+x_13 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_6);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_14 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__5;
+x_15 = l_Lean_MessageData_ofName(x_4);
+x_16 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+x_17 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__7;
+x_18 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_18, 0, x_16);
+lean_ctor_set(x_18, 1, x_17);
+x_19 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_6);
+return x_19;
+}
+}
+block_27:
+{
+uint8_t x_23; 
+x_23 = l_Lean_Name_isAnonymous(x_21);
+if (x_23 == 0)
+{
+uint8_t x_24; 
+x_24 = l_Lean_Name_hasMacroScopes(x_21);
+if (x_24 == 0)
+{
+x_3 = x_22;
+x_4 = x_21;
+goto block_20;
+}
+else
+{
+lean_object* x_25; 
+lean_dec(x_21);
+x_25 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__9));
+x_3 = x_22;
+x_4 = x_25;
+goto block_20;
+}
+}
+else
+{
+lean_object* x_26; 
+lean_dec(x_21);
+x_26 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__11));
+x_3 = x_22;
+x_4 = x_26;
+goto block_20;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBodyAtom(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+lean_object* x_3; 
+x_3 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(x_1, x_2);
+return x_3;
+}
+case 5:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(x_1, x_2);
+x_5 = l_Lean_MessageData_paren(x_4);
+return x_5;
+}
+case 10:
+{
+lean_object* x_6; 
+x_6 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_6);
+lean_dec_ref(x_1);
+x_1 = x_6;
+goto _start;
+}
+default: 
+{
+lean_object* x_8; 
+x_8 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(x_1, x_2);
+return x_8;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___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___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0(x_1, x_2, x_6, x_7, x_5);
+lean_dec_ref(x_2);
+return x_8;
+}
+}
 static lean_object* _init_l_Lean_Meta_Grind_ppPattern___closed__1() {
 _start:
 {
@@ -15195,15 +15715,6 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__0));
-x_2 = l_Lean_MessageData_ofFormat(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
@@ -15217,7 +15728,7 @@ else
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; 
 x_6 = lean_array_uget(x_1, x_3);
-x_7 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__1;
+x_7 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1;
 x_8 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_8, 0, x_4);
 lean_ctor_set(x_8, 1, x_7);
@@ -15242,11 +15753,11 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Grind_ppPattern___closed__8() {
+static lean_object* _init_l_Lean_Meta_Grind_ppPattern___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = ((lean_object*)(l_Lean_Meta_Grind_ppPattern___closed__7));
+x_1 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8));
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
@@ -15276,84 +15787,109 @@ return x_8;
 }
 else
 {
-uint8_t x_9; 
+lean_object* x_9; 
 lean_dec(x_2);
-x_9 = l_Lean_Meta_Grind_isPatternDontCare(x_1);
-if (x_9 == 0)
+x_9 = l_Lean_Meta_Grind_hoPattern_x3f(x_1);
+if (lean_obj_tag(x_9) == 1)
+{
+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_dec_ref(x_1);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+lean_dec_ref(x_9);
+x_11 = l_Lean_Meta_Grind_ppPattern___closed__4;
+x_12 = lean_box(0);
+x_13 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody(x_10, x_12);
+x_14 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_14, 0, x_11);
+lean_ctor_set(x_14, 1, x_13);
+x_15 = l_Lean_Meta_Grind_ppPattern___closed__2;
+x_16 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+return x_16;
+}
+else
+{
+uint8_t x_17; 
+lean_dec(x_9);
+x_17 = l_Lean_Meta_Grind_isPatternDontCare(x_1);
+if (x_17 == 0)
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_10 = lean_ctor_get(x_1, 0);
-lean_inc(x_10);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_18 = lean_ctor_get(x_1, 0);
+lean_inc(x_18);
 lean_dec_ref(x_1);
-x_11 = l_Lean_Meta_Grind_ppPattern___closed__4;
-x_12 = l_Nat_reprFast(x_10);
-x_13 = lean_alloc_ctor(3, 1, 0);
-lean_ctor_set(x_13, 0, x_12);
-x_14 = l_Lean_MessageData_ofFormat(x_13);
-x_15 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_15, 0, x_11);
-lean_ctor_set(x_15, 1, x_14);
-return x_15;
+x_19 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13;
+x_20 = l_Nat_reprFast(x_18);
+x_21 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_21, 0, x_20);
+x_22 = l_Lean_MessageData_ofFormat(x_21);
+x_23 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_23, 0, x_19);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; uint8_t x_18; 
-x_16 = ((lean_object*)(l_Lean_Meta_Grind_mkOffsetPattern___closed__1));
-x_17 = lean_unsigned_to_nat(2u);
-x_18 = l_Lean_Expr_isAppOfArity(x_1, x_16, x_17);
-if (x_18 == 0)
+lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_24 = ((lean_object*)(l_Lean_Meta_Grind_mkOffsetPattern___closed__1));
+x_25 = lean_unsigned_to_nat(2u);
+x_26 = l_Lean_Expr_isAppOfArity(x_1, x_24, x_25);
+if (x_26 == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; 
-x_19 = l_Lean_Expr_getAppFn(x_1);
-x_20 = l_Lean_MessageData_ofExpr(x_19);
-x_21 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___at___00Lean_Core_transform___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectOffsets_spec__0_spec__0___lam__1___closed__0;
-x_22 = l_Lean_Expr_getAppNumArgs(x_1);
-lean_inc(x_22);
-x_23 = lean_mk_array(x_22, x_21);
-x_24 = lean_unsigned_to_nat(1u);
-x_25 = lean_nat_sub(x_22, x_24);
-lean_dec(x_22);
-x_26 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_1, x_23, x_25);
-x_27 = lean_array_size(x_26);
-x_28 = 0;
-x_29 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1(x_26, x_27, x_28, x_20);
-lean_dec_ref(x_26);
-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; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; lean_object* x_37; 
+x_27 = l_Lean_Expr_getAppFn(x_1);
+x_28 = l_Lean_MessageData_ofExpr(x_27);
+x_29 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___at___00Lean_Core_transform___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectOffsets_spec__0_spec__0___lam__1___closed__0;
 x_30 = l_Lean_Expr_getAppNumArgs(x_1);
-x_31 = lean_unsigned_to_nat(1u);
-x_32 = lean_nat_sub(x_30, x_31);
+lean_inc(x_30);
+x_31 = lean_mk_array(x_30, x_29);
+x_32 = lean_unsigned_to_nat(1u);
+x_33 = lean_nat_sub(x_30, x_32);
 lean_dec(x_30);
-lean_inc(x_32);
-x_33 = l_Lean_Expr_getRevArg_x21(x_1, x_32);
-x_34 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppArg(x_33);
-x_35 = lean_nat_sub(x_32, x_31);
-lean_dec(x_32);
-x_36 = l_Lean_Expr_getRevArg_x21(x_1, x_35);
+x_34 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_1, x_31, x_33);
+x_35 = lean_array_size(x_34);
+x_36 = 0;
+x_37 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1(x_34, x_35, x_36, x_28);
+lean_dec_ref(x_34);
+return x_37;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_38 = l_Lean_Expr_getAppNumArgs(x_1);
+x_39 = lean_unsigned_to_nat(1u);
+x_40 = lean_nat_sub(x_38, x_39);
+lean_dec(x_38);
+lean_inc(x_40);
+x_41 = l_Lean_Expr_getRevArg_x21(x_1, x_40);
+x_42 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppArg(x_41);
+x_43 = lean_nat_sub(x_40, x_39);
+lean_dec(x_40);
+x_44 = l_Lean_Expr_getRevArg_x21(x_1, x_43);
 lean_dec_ref(x_1);
-x_37 = l_Lean_Meta_Grind_ppPattern(x_36);
-x_38 = l_Lean_Meta_Grind_ppPattern___closed__6;
-x_39 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_39, 0, x_34);
-lean_ctor_set(x_39, 1, x_38);
-x_40 = lean_alloc_ctor(7, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+x_45 = l_Lean_Meta_Grind_ppPattern(x_44);
+x_46 = l_Lean_Meta_Grind_ppPattern___closed__6;
+x_47 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_47, 0, x_42);
+lean_ctor_set(x_47, 1, x_46);
+x_48 = lean_alloc_ctor(7, 2, 0);
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_45);
+return x_48;
 }
 }
 }
 else
 {
-lean_object* x_41; 
+lean_object* x_49; 
 lean_dec_ref(x_1);
-x_41 = l_Lean_Meta_Grind_ppPattern___closed__8;
-return x_41;
+x_49 = l_Lean_Meta_Grind_ppPattern___closed__7;
+return x_49;
+}
 }
 }
 }
@@ -15391,6 +15927,780 @@ lean_dec_ref(x_1);
 return x_7;
 }
 }
+static lean_object* _init_l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__1() {
+_start:
+{
+uint8_t x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = 0;
+x_2 = lean_box(x_1);
+x_3 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_3, 0, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__1;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg(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_1);
+if (x_6 == 0)
+{
+lean_dec(x_4);
+return x_5;
+}
+else
+{
+lean_object* x_7; uint8_t x_8; 
+lean_dec_ref(x_5);
+x_7 = lean_array_fget_borrowed(x_2, x_4);
+x_8 = lean_expr_eqv(x_7, x_3);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0));
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_4, x_10);
+lean_dec(x_4);
+x_4 = x_11;
+x_5 = x_9;
+goto _start;
+}
+else
+{
+lean_object* x_13; 
+lean_dec(x_4);
+x_13 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2;
+return x_13;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___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_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg(x_1, x_2, x_3, x_4, x_5);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg(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_1);
+if (x_6 == 0)
+{
+lean_dec(x_4);
+return x_5;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; 
+lean_dec_ref(x_5);
+x_7 = lean_box(0);
+x_8 = lean_array_fget_borrowed(x_2, x_4);
+if (lean_obj_tag(x_8) == 0)
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_ctor_get(x_8, 0);
+x_10 = lean_nat_dec_lt(x_9, x_3);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_dec(x_4);
+x_11 = lean_box(x_10);
+x_12 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_12, 0, x_11);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_7);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_14 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0));
+x_15 = lean_unsigned_to_nat(0u);
+x_16 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg(x_4, x_2, x_8, x_15, x_14);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_16, 0);
+x_19 = lean_ctor_get(x_16, 1);
+lean_dec(x_19);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_20; lean_object* x_21; 
+lean_free_object(x_16);
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_4, x_20);
+lean_dec(x_4);
+x_4 = x_21;
+x_5 = x_14;
+goto _start;
+}
+else
+{
+lean_dec(x_4);
+lean_ctor_set(x_16, 1, x_7);
+return x_16;
+}
+}
+else
+{
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_16, 0);
+lean_inc(x_23);
+lean_dec(x_16);
+if (lean_obj_tag(x_23) == 0)
+{
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_unsigned_to_nat(1u);
+x_25 = lean_nat_add(x_4, x_24);
+lean_dec(x_4);
+x_4 = x_25;
+x_5 = x_14;
+goto _start;
+}
+else
+{
+lean_object* x_27; 
+lean_dec(x_4);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_23);
+lean_ctor_set(x_27, 1, x_7);
+return x_27;
+}
+}
+}
+}
+else
+{
+lean_object* x_28; 
+lean_dec(x_4);
+x_28 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2;
+return x_28;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg___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_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+return x_6;
+}
+}
+LEAN_EXPORT uint8_t l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs(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; 
+x_3 = lean_array_get_size(x_1);
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0));
+x_6 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg(x_3, x_1, x_2, x_4, x_5);
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+lean_dec_ref(x_6);
+if (lean_obj_tag(x_7) == 0)
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_ctor_get(x_7, 0);
+lean_inc(x_9);
+lean_dec_ref(x_7);
+x_10 = lean_unbox(x_9);
+lean_dec(x_9);
+return x_10;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs(x_1, x_2);
+lean_dec(x_2);
+lean_dec_ref(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0(lean_object* x_1, lean_object* x_2, 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_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg(x_1, x_2, x_3, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___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_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec_ref(x_3);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___redArg(x_1, x_2, x_3, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+return x_9;
+}
+}
+LEAN_EXPORT uint8_t l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0_spec__0(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = lean_usize_dec_eq(x_3, x_4);
+if (x_5 == 0)
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_uget(x_2, x_3);
+x_7 = lean_nat_dec_eq(x_1, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
+{
+size_t x_8; size_t x_9; 
+x_8 = 1;
+x_9 = lean_usize_add(x_3, x_8);
+x_3 = x_9;
+goto _start;
+}
+else
+{
+return x_7;
+}
+}
+else
+{
+uint8_t x_11; 
+x_11 = 0;
+return x_11;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+size_t x_5; size_t x_6; uint8_t x_7; lean_object* x_8; 
+x_5 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_6 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_7 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0_spec__0(x_1, x_2, x_5, x_6);
+lean_dec_ref(x_2);
+lean_dec(x_1);
+x_8 = lean_box(x_7);
+return x_8;
+}
+}
+LEAN_EXPORT uint8_t l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; uint8_t x_5; 
+x_3 = lean_unsigned_to_nat(0u);
+x_4 = lean_array_get_size(x_1);
+x_5 = lean_nat_dec_lt(x_3, x_4);
+if (x_5 == 0)
+{
+return x_5;
+}
+else
+{
+if (x_5 == 0)
+{
+return x_5;
+}
+else
+{
+size_t x_6; size_t x_7; uint8_t x_8; 
+x_6 = 0;
+x_7 = lean_usize_of_nat(x_4);
+x_8 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0_spec__0(x_2, x_1, x_6, x_7);
+return x_8;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0(x_1, x_2);
+lean_dec(x_2);
+lean_dec_ref(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; 
+x_3 = l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0(x_2, x_1);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_box(0);
+x_5 = lean_array_push(x_2, x_1);
+x_6 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_6, 0, x_4);
+lean_ctor_set(x_6, 1, x_5);
+return x_6;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; 
+lean_dec(x_1);
+x_7 = lean_box(0);
+x_8 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_8, 0, x_7);
+lean_ctor_set(x_8, 1, x_2);
+return x_8;
+}
+}
+}
+LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__2(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; 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; 
+x_3 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__0));
+x_4 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__1));
+x_5 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__2));
+x_6 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__3));
+x_7 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__4));
+x_8 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__5));
+x_9 = ((lean_object*)(l_panic___at___00Lean_Meta_Grind_isGenPattern_x3f_spec__0___closed__6));
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_3);
+lean_ctor_set(x_10, 1, x_4);
+x_11 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_5);
+lean_ctor_set(x_11, 2, x_6);
+lean_ctor_set(x_11, 3, x_7);
+lean_ctor_set(x_11, 4, x_8);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_9);
+lean_inc_ref(x_12);
+x_13 = lean_alloc_closure((void*)(l_StateT_instMonad___redArg___lam__1), 6, 1);
+lean_closure_set(x_13, 0, x_12);
+lean_inc_ref(x_12);
+x_14 = lean_alloc_closure((void*)(l_StateT_instMonad___redArg___lam__4), 6, 1);
+lean_closure_set(x_14, 0, x_12);
+lean_inc_ref(x_12);
+x_15 = lean_alloc_closure((void*)(l_StateT_instMonad___redArg___lam__7), 6, 1);
+lean_closure_set(x_15, 0, x_12);
+lean_inc_ref(x_12);
+x_16 = lean_alloc_closure((void*)(l_StateT_instMonad___redArg___lam__9), 6, 1);
+lean_closure_set(x_16, 0, x_12);
+lean_inc_ref(x_12);
+x_17 = lean_alloc_closure((void*)(l_StateT_map), 8, 3);
+lean_closure_set(x_17, 0, lean_box(0));
+lean_closure_set(x_17, 1, lean_box(0));
+lean_closure_set(x_17, 2, x_12);
+x_18 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_13);
+lean_inc_ref(x_12);
+x_19 = lean_alloc_closure((void*)(l_StateT_pure), 6, 3);
+lean_closure_set(x_19, 0, lean_box(0));
+lean_closure_set(x_19, 1, lean_box(0));
+lean_closure_set(x_19, 2, x_12);
+x_20 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_20, 0, x_18);
+lean_ctor_set(x_20, 1, x_19);
+lean_ctor_set(x_20, 2, x_14);
+lean_ctor_set(x_20, 3, x_15);
+lean_ctor_set(x_20, 4, x_16);
+x_21 = lean_alloc_closure((void*)(l_StateT_bind), 8, 3);
+lean_closure_set(x_21, 0, lean_box(0));
+lean_closure_set(x_21, 1, lean_box(0));
+lean_closure_set(x_21, 2, x_12);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_21);
+x_23 = lean_box(0);
+x_24 = l_instInhabitedOfMonad___redArg(x_22, x_23);
+x_25 = lean_panic_fn(x_24, x_1);
+x_26 = lean_apply_1(x_25, x_2);
+return x_26;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__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_2) == 5)
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_6 = lean_ctor_get(x_2, 0);
+lean_inc_ref(x_6);
+x_7 = lean_ctor_get(x_2, 1);
+lean_inc_ref(x_7);
+lean_dec_ref(x_2);
+x_8 = lean_array_set(x_3, x_4, x_7);
+x_9 = lean_unsigned_to_nat(1u);
+x_10 = lean_nat_sub(x_4, x_9);
+lean_dec(x_4);
+x_2 = x_6;
+x_3 = x_8;
+x_4 = x_10;
+goto _start;
+}
+else
+{
+lean_dec(x_4);
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_12; uint8_t x_13; uint8_t x_19; 
+x_12 = lean_ctor_get(x_2, 0);
+lean_inc(x_12);
+lean_dec_ref(x_2);
+x_19 = lean_nat_dec_le(x_1, x_12);
+if (x_19 == 0)
+{
+lean_dec_ref(x_3);
+x_13 = x_19;
+goto block_18;
+}
+else
+{
+uint8_t x_20; 
+x_20 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs(x_3, x_1);
+lean_dec_ref(x_3);
+x_13 = x_20;
+goto block_18;
+}
+block_18:
+{
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; 
+lean_dec(x_12);
+lean_dec(x_1);
+x_14 = lean_box(0);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_5);
+return x_15;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_nat_sub(x_12, x_1);
+lean_dec(x_1);
+lean_dec(x_12);
+x_17 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar(x_16, x_5);
+return x_17;
+}
+}
+}
+else
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; 
+lean_dec_ref(x_2);
+x_21 = lean_unsigned_to_nat(0u);
+x_22 = lean_array_get_size(x_3);
+x_23 = lean_box(0);
+x_24 = lean_nat_dec_lt(x_21, x_22);
+if (x_24 == 0)
+{
+lean_object* x_25; 
+lean_dec_ref(x_3);
+lean_dec(x_1);
+x_25 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_5);
+return x_25;
+}
+else
+{
+uint8_t x_26; 
+x_26 = lean_nat_dec_le(x_22, x_22);
+if (x_26 == 0)
+{
+if (x_24 == 0)
+{
+lean_object* x_27; 
+lean_dec_ref(x_3);
+lean_dec(x_1);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_23);
+lean_ctor_set(x_27, 1, x_5);
+return x_27;
+}
+else
+{
+size_t x_28; size_t x_29; lean_object* x_30; 
+x_28 = 0;
+x_29 = lean_usize_of_nat(x_22);
+x_30 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0(x_1, x_3, x_28, x_29, x_23, x_5);
+lean_dec_ref(x_3);
+return x_30;
+}
+}
+else
+{
+size_t x_31; size_t x_32; lean_object* x_33; 
+x_31 = 0;
+x_32 = lean_usize_of_nat(x_22);
+x_33 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0(x_1, x_3, x_31, x_32, x_23, x_5);
+lean_dec_ref(x_3);
+return x_33;
+}
+}
+}
+}
+}
+}
+static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1() {
+_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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
+x_2 = lean_unsigned_to_nat(27u);
+x_3 = lean_unsigned_to_nat(513u);
+x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__0));
+x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
+x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_ctor_get(x_1, 0);
+lean_inc(x_10);
+lean_dec_ref(x_1);
+x_11 = lean_nat_dec_le(x_2, x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; 
+lean_dec(x_10);
+lean_dec(x_2);
+x_12 = lean_box(0);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_3);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_nat_sub(x_10, x_2);
+lean_dec(x_2);
+lean_dec(x_10);
+x_15 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar(x_14, x_3);
+return x_15;
+}
+}
+case 5:
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_16 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___at___00Lean_Core_transform___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectOffsets_spec__0_spec__0___lam__1___closed__0;
+x_17 = l_Lean_Expr_getAppNumArgs(x_1);
+lean_inc(x_17);
+x_18 = lean_mk_array(x_17, x_16);
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_sub(x_17, x_19);
+lean_dec(x_17);
+x_21 = l_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__1(x_2, x_1, x_18, x_20, x_3);
+return x_21;
+}
+case 6:
+{
+lean_object* x_22; 
+x_22 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_22);
+lean_dec_ref(x_1);
+x_4 = x_22;
+x_5 = x_3;
+goto block_9;
+}
+case 7:
+{
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_1, 2);
+lean_inc_ref(x_23);
+lean_dec_ref(x_1);
+x_4 = x_23;
+x_5 = x_3;
+goto block_9;
+}
+case 8:
+{
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_2);
+lean_dec_ref(x_1);
+x_24 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1;
+x_25 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__2(x_24, x_3);
+return x_25;
+}
+case 10:
+{
+lean_object* x_26; 
+x_26 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_26);
+lean_dec_ref(x_1);
+x_1 = x_26;
+goto _start;
+}
+case 11:
+{
+lean_object* x_28; lean_object* x_29; 
+lean_dec(x_2);
+lean_dec_ref(x_1);
+x_28 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1;
+x_29 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__2(x_28, x_3);
+return x_29;
+}
+default: 
+{
+lean_object* x_30; lean_object* x_31; 
+lean_dec(x_2);
+lean_dec_ref(x_1);
+x_30 = lean_box(0);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_3);
+return x_31;
+}
+}
+block_9:
+{
+lean_object* x_6; lean_object* x_7; 
+x_6 = lean_unsigned_to_nat(1u);
+x_7 = lean_nat_add(x_2, x_6);
+lean_dec(x_2);
+x_1 = x_4;
+x_2 = x_7;
+x_3 = x_5;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_eq(x_3, x_4);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; size_t x_12; size_t x_13; 
+x_8 = lean_array_uget(x_2, x_3);
+lean_inc(x_1);
+x_9 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit(x_8, x_1, x_6);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
+lean_inc(x_11);
+lean_dec_ref(x_9);
+x_12 = 1;
+x_13 = lean_usize_add(x_3, x_12);
+x_3 = x_13;
+x_5 = x_10;
+x_6 = x_11;
+goto _start;
+}
+else
+{
+lean_object* x_15; 
+lean_dec(x_1);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_5);
+lean_ctor_set(x_15, 1, x_6);
+return x_15;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+size_t x_7; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_8 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_9 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit_spec__0(x_1, x_2, x_7, x_8, x_5, x_6);
+lean_dec_ref(x_2);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkMillerHOPattern_x3f(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+x_2 = lean_unsigned_to_nat(0u);
+x_3 = l_Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2___closed__3;
+x_4 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit(x_1, x_2, x_3);
+x_5 = lean_ctor_get(x_4, 1);
+lean_inc(x_5);
+lean_dec_ref(x_4);
+x_6 = l_Array_isEmpty___redArg(x_5);
+if (x_6 == 0)
+{
+lean_object* x_7; 
+x_7 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_7, 0, x_5);
+return x_7;
+}
+else
+{
+lean_object* x_8; 
+lean_dec(x_5);
+x_8 = lean_box(0);
+return x_8;
+}
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_isCandidateSymbol___redArg(lean_object* x_1, uint8_t x_2, lean_object* x_3) {
 _start:
 {
@@ -18742,7 +20052,7 @@ lean_dec(x_21);
 if (x_22 == 0)
 {
 lean_free_object(x_19);
-lean_dec_ref(x_18);
+lean_dec_ref(x_17);
 x_12 = lean_box(0);
 goto block_15;
 }
@@ -18750,7 +20060,7 @@ else
 {
 lean_object* x_23; 
 x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_18);
+lean_ctor_set(x_23, 0, x_17);
 lean_ctor_set(x_19, 0, x_23);
 return x_19;
 }
@@ -18765,7 +20075,7 @@ x_25 = lean_unbox(x_24);
 lean_dec(x_24);
 if (x_25 == 0)
 {
-lean_dec_ref(x_18);
+lean_dec_ref(x_17);
 x_12 = lean_box(0);
 goto block_15;
 }
@@ -18773,7 +20083,7 @@ else
 {
 lean_object* x_26; lean_object* x_27; 
 x_26 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_26, 0, x_18);
+lean_ctor_set(x_26, 0, x_17);
 x_27 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_27, 0, x_26);
 return x_27;
@@ -18784,7 +20094,7 @@ block_33:
 {
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 0, x_29);
 x_32 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_32, 0, x_31);
 return x_32;
@@ -18844,15 +20154,15 @@ switch (x_4) {
 case 3:
 {
 x_16 = x_35;
-x_17 = lean_box(0);
-x_18 = x_34;
+x_17 = x_34;
+x_18 = lean_box(0);
 goto block_28;
 }
 case 0:
 {
 x_16 = x_35;
-x_17 = lean_box(0);
-x_18 = x_34;
+x_17 = x_34;
+x_18 = lean_box(0);
 goto block_28;
 }
 default: 
@@ -18869,8 +20179,8 @@ else
 {
 lean_free_object(x_36);
 lean_dec(x_35);
-x_29 = lean_box(0);
-x_30 = x_34;
+x_29 = x_34;
+x_30 = lean_box(0);
 goto block_33;
 }
 }
@@ -18878,8 +20188,8 @@ else
 {
 lean_free_object(x_36);
 lean_dec(x_35);
-x_29 = lean_box(0);
-x_30 = x_34;
+x_29 = x_34;
+x_30 = lean_box(0);
 goto block_33;
 }
 }
@@ -18930,15 +20240,15 @@ switch (x_4) {
 case 3:
 {
 x_16 = x_35;
-x_17 = lean_box(0);
-x_18 = x_34;
+x_17 = x_34;
+x_18 = lean_box(0);
 goto block_28;
 }
 case 0:
 {
 x_16 = x_35;
-x_17 = lean_box(0);
-x_18 = x_34;
+x_17 = x_34;
+x_18 = lean_box(0);
 goto block_28;
 }
 default: 
@@ -18954,16 +20264,16 @@ goto block_15;
 else
 {
 lean_dec(x_35);
-x_29 = lean_box(0);
-x_30 = x_34;
+x_29 = x_34;
+x_30 = lean_box(0);
 goto block_33;
 }
 }
 else
 {
 lean_dec(x_35);
-x_29 = lean_box(0);
-x_30 = x_34;
+x_29 = x_34;
+x_30 = lean_box(0);
 goto block_33;
 }
 }
@@ -19270,7 +20580,156 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__0() {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg(uint8_t x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_7; uint8_t x_12; 
+x_12 = lean_usize_dec_eq(x_3, x_4);
+if (x_12 == 0)
+{
+uint8_t x_13; uint8_t x_14; lean_object* x_15; lean_object* x_19; lean_object* x_20; 
+x_13 = 1;
+x_19 = lean_array_uget(x_2, x_3);
+x_20 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_foundBVar___redArg(x_19, x_5);
+lean_dec(x_19);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; uint8_t x_22; 
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+lean_dec_ref(x_20);
+x_22 = lean_unbox(x_21);
+lean_dec(x_21);
+if (x_22 == 0)
+{
+x_14 = x_1;
+x_15 = lean_box(0);
+goto block_18;
+}
+else
+{
+x_7 = lean_box(0);
+goto block_11;
+}
+}
+else
+{
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_23; uint8_t x_24; 
+x_23 = lean_ctor_get(x_20, 0);
+lean_inc(x_23);
+lean_dec_ref(x_20);
+x_24 = lean_unbox(x_23);
+lean_dec(x_23);
+x_14 = x_24;
+x_15 = lean_box(0);
+goto block_18;
+}
+else
+{
+return x_20;
+}
+}
+block_18:
+{
+if (x_14 == 0)
+{
+x_7 = lean_box(0);
+goto block_11;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_box(x_13);
+x_17 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_16);
+return x_17;
+}
+}
+}
+else
+{
+uint8_t x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = 0;
+x_26 = lean_box(x_25);
+x_27 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_27, 0, x_26);
+return x_27;
+}
+block_11:
+{
+size_t x_8; size_t x_9; 
+x_8 = 1;
+x_9 = lean_usize_add(x_3, x_8);
+x_3 = x_9;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; size_t x_8; size_t x_9; lean_object* x_10; 
+x_7 = lean_unbox(x_1);
+x_8 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_9 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_10 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg(x_7, x_2, x_8, x_9, x_5);
+lean_dec(x_5);
+lean_dec_ref(x_2);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_ctor_get(x_4, 5);
+x_8 = l_Lean_addMessageContextFull___at___00Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6_spec__8(x_1, x_2, x_3, x_4, x_5);
+x_9 = !lean_is_exclusive(x_8);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_ctor_get(x_8, 0);
+lean_inc(x_7);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_7);
+lean_ctor_set(x_11, 1, x_10);
+lean_ctor_set_tag(x_8, 1);
+lean_ctor_set(x_8, 0, x_11);
+return x_8;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_12 = lean_ctor_get(x_8, 0);
+lean_inc(x_12);
+lean_dec(x_8);
+lean_inc(x_7);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_7);
+lean_ctor_set(x_13, 1, x_12);
+x_14 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+return x_14;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+return x_7;
+}
+}
+static lean_object* _init_l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__0() {
 _start:
 {
 lean_object* x_1; 
@@ -19278,11 +20737,11 @@ x_1 = l_instMonadEST(lean_box(0), lean_box(0));
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_9 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__0;
+x_9 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__0;
 x_10 = l_ReaderT_instMonad___redArg(x_9);
 x_11 = !lean_is_exclusive(x_10);
 if (x_11 == 0)
@@ -19301,8 +20760,8 @@ x_17 = lean_ctor_get(x_12, 3);
 x_18 = lean_ctor_get(x_12, 4);
 x_19 = lean_ctor_get(x_12, 1);
 lean_dec(x_19);
-x_20 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__1));
-x_21 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__2));
+x_20 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__1));
+x_21 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__2));
 lean_inc_ref(x_15);
 x_22 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_22, 0, x_15);
@@ -19341,8 +20800,8 @@ x_35 = lean_ctor_get(x_30, 3);
 x_36 = lean_ctor_get(x_30, 4);
 x_37 = lean_ctor_get(x_30, 1);
 lean_dec(x_37);
-x_38 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3));
-x_39 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4));
+x_38 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3));
+x_39 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4));
 lean_inc_ref(x_33);
 x_40 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_40, 0, x_33);
@@ -19384,8 +20843,8 @@ lean_inc(x_54);
 lean_inc(x_53);
 lean_inc(x_52);
 lean_dec(x_30);
-x_56 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3));
-x_57 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4));
+x_56 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3));
+x_57 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4));
 lean_inc_ref(x_52);
 x_58 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_58, 0, x_52);
@@ -19443,8 +20902,8 @@ if (lean_is_exclusive(x_71)) {
  lean_dec_ref(x_71);
  x_76 = lean_box(0);
 }
-x_77 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3));
-x_78 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4));
+x_77 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3));
+x_78 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4));
 lean_inc_ref(x_72);
 x_79 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_79, 0, x_72);
@@ -19494,8 +20953,8 @@ lean_inc(x_95);
 lean_inc(x_94);
 lean_inc(x_93);
 lean_dec(x_12);
-x_97 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__1));
-x_98 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__2));
+x_97 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__1));
+x_98 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__2));
 lean_inc_ref(x_93);
 x_99 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_99, 0, x_93);
@@ -19548,8 +21007,8 @@ if (lean_is_exclusive(x_107)) {
  lean_dec_ref(x_107);
  x_113 = lean_box(0);
 }
-x_114 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3));
-x_115 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4));
+x_114 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3));
+x_115 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4));
 lean_inc_ref(x_109);
 x_116 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_116, 0, x_109);
@@ -19616,8 +21075,8 @@ if (lean_is_exclusive(x_130)) {
  lean_dec_ref(x_130);
  x_135 = lean_box(0);
 }
-x_136 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__1));
-x_137 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__2));
+x_136 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__1));
+x_137 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__2));
 lean_inc_ref(x_131);
 x_138 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_138, 0, x_131);
@@ -19675,8 +21134,8 @@ if (lean_is_exclusive(x_147)) {
  lean_dec_ref(x_147);
  x_153 = lean_box(0);
 }
-x_154 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__3));
-x_155 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__4));
+x_154 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__3));
+x_155 = ((lean_object*)(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__4));
 lean_inc_ref(x_149);
 x_156 = lean_alloc_closure((void*)(l_ReaderT_instFunctorOfMonad___redArg___lam__0), 6, 1);
 lean_closure_set(x_156, 0, x_149);
@@ -19719,68 +21178,21 @@ return x_169;
 }
 }
 }
-LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; 
-x_9 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_9 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-lean_object* x_7; lean_object* x_8; uint8_t x_9; 
-x_7 = lean_ctor_get(x_4, 5);
-x_8 = l_Lean_addMessageContextFull___at___00Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6_spec__8(x_1, x_2, x_3, x_4, x_5);
-x_9 = !lean_is_exclusive(x_8);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; 
-x_10 = lean_ctor_get(x_8, 0);
-lean_inc(x_7);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_7);
-lean_ctor_set(x_11, 1, x_10);
-lean_ctor_set_tag(x_8, 1);
-lean_ctor_set(x_8, 0, x_11);
-return x_8;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = lean_ctor_get(x_8, 0);
-lean_inc(x_12);
-lean_dec(x_8);
-lean_inc(x_7);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_7);
-lean_ctor_set(x_13, 1, x_12);
-x_14 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_14, 0, x_13);
-return x_14;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_5);
-lean_dec_ref(x_4);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-return x_7;
-}
-}
 static lean_object* _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__2() {
 _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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__1));
 x_2 = lean_unsigned_to_nat(2u);
-x_3 = lean_unsigned_to_nat(660u);
+x_3 = lean_unsigned_to_nat(763u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__0));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -19933,7 +21345,7 @@ x_49 = lean_ctor_get(x_48, 0);
 lean_inc(x_49);
 lean_dec_ref(x_48);
 x_50 = lean_unsigned_to_nat(0u);
-x_51 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg(x_47, x_33, x_2, x_49, x_50, x_46, x_34, x_35, x_36, x_37, x_38, x_39);
+x_51 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(x_47, x_33, x_2, x_49, x_50, x_46, x_34, x_35, x_36, x_37, x_38, x_39);
 lean_dec(x_49);
 if (lean_obj_tag(x_51) == 0)
 {
@@ -20018,7 +21430,7 @@ lean_object* x_66; lean_object* x_67;
 lean_dec(x_32);
 lean_dec_ref(x_1);
 x_66 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__2;
-x_67 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1(x_66, x_4, x_5, x_6, x_7, x_8, x_9);
+x_67 = l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(x_66, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_67;
 }
 else
@@ -20099,7 +21511,7 @@ x_79 = l_Lean_indentD(x_78);
 x_80 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_80, 0, x_77);
 lean_ctor_set(x_80, 1, x_79);
-x_81 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(x_80, x_6, x_7, x_8, x_9);
+x_81 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg(x_80, x_6, x_7, x_8, x_9);
 lean_dec(x_9);
 lean_dec_ref(x_8);
 lean_dec(x_7);
@@ -20139,82 +21551,82 @@ return x_84;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg(lean_object* x_1, uint8_t x_2, uint8_t x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-uint8_t x_12; 
-x_12 = l_Lean_Expr_hasLooseBVars(x_1);
-if (x_12 == 0)
+lean_object* x_12; uint8_t x_16; 
+x_16 = l_Lean_Expr_hasLooseBVars(x_1);
+if (x_16 == 0)
 {
-uint8_t x_13; 
-x_13 = l_Lean_Expr_hasMVar(x_1);
-if (x_13 == 0)
+uint8_t x_17; 
+x_17 = l_Lean_Expr_hasMVar(x_1);
+if (x_17 == 0)
 {
-lean_object* x_14; 
+lean_object* x_18; 
 lean_inc(x_10);
 lean_inc_ref(x_9);
 lean_inc(x_8);
 lean_inc_ref(x_7);
 lean_inc_ref(x_1);
-x_14 = l_Lean_Meta_isProof(x_1, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_14) == 0)
-{
-uint8_t x_15; 
-x_15 = !lean_is_exclusive(x_14);
-if (x_15 == 0)
-{
-lean_object* x_16; uint8_t x_17; 
-x_16 = lean_ctor_get(x_14, 0);
-x_17 = lean_unbox(x_16);
-lean_dec(x_16);
-if (x_17 == 0)
-{
-lean_object* x_18; 
-lean_free_object(x_14);
-lean_inc(x_10);
-lean_inc_ref(x_9);
-x_18 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_expandOffsetPatterns(x_1, x_9, x_10);
+x_18 = l_Lean_Meta_isProof(x_1, x_7, x_8, x_9, x_10);
 if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-if (lean_is_exclusive(x_18)) {
- lean_ctor_release(x_18, 0);
- x_20 = x_18;
+uint8_t x_19; 
+x_19 = !lean_is_exclusive(x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; uint8_t x_21; 
+x_20 = lean_ctor_get(x_18, 0);
+x_21 = lean_unbox(x_20);
+lean_dec(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; 
+lean_free_object(x_18);
+lean_inc(x_10);
+lean_inc_ref(x_9);
+x_22 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_expandOffsetPatterns(x_1, x_9, x_10);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+if (lean_is_exclusive(x_22)) {
+ lean_ctor_release(x_22, 0);
+ x_24 = x_22;
 } else {
- lean_dec_ref(x_18);
- x_20 = lean_box(0);
+ lean_dec_ref(x_22);
+ x_24 = lean_box(0);
 }
 if (x_2 == 0)
 {
 if (x_4 == 0)
 {
-lean_object* x_25; 
-lean_inc(x_19);
-x_25 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbolsAt(x_19, x_5, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_25) == 0)
+lean_object* x_29; 
+lean_inc(x_23);
+x_29 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbolsAt(x_23, x_5, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_dec_ref(x_25);
-x_21 = lean_box(0);
-goto block_24;
+lean_dec_ref(x_29);
+x_25 = lean_box(0);
+goto block_28;
 }
 else
 {
-uint8_t x_26; 
-lean_dec(x_20);
-lean_dec(x_19);
-x_26 = !lean_is_exclusive(x_25);
-if (x_26 == 0)
+uint8_t x_30; 
+lean_dec(x_24);
+lean_dec(x_23);
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
 {
-return x_25;
+return x_29;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_ctor_get(x_25, 0);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_28, 0, x_27);
-return x_28;
+lean_object* x_31; lean_object* x_32; 
+x_31 = lean_ctor_get(x_29, 0);
+lean_inc(x_31);
+lean_dec(x_29);
+x_32 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_32, 0, x_31);
+return x_32;
 }
 }
 }
@@ -20226,8 +21638,8 @@ lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
-x_21 = lean_box(0);
-goto block_24;
+x_25 = lean_box(0);
+goto block_28;
 }
 }
 else
@@ -20238,20 +21650,20 @@ lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
-x_21 = lean_box(0);
-goto block_24;
+x_25 = lean_box(0);
+goto block_28;
 }
-block_24:
+block_28:
 {
-lean_object* x_22; lean_object* x_23; 
-x_22 = l_Lean_Meta_Grind_mkGroundPattern(x_19);
-if (lean_is_scalar(x_20)) {
- x_23 = lean_alloc_ctor(0, 1, 0);
+lean_object* x_26; lean_object* x_27; 
+x_26 = l_Lean_Meta_Grind_mkGroundPattern(x_23);
+if (lean_is_scalar(x_24)) {
+ x_27 = lean_alloc_ctor(0, 1, 0);
 } else {
- x_23 = x_20;
+ x_27 = x_24;
 }
-lean_ctor_set(x_23, 0, x_22);
-return x_23;
+lean_ctor_set(x_27, 0, x_26);
+return x_27;
 }
 }
 else
@@ -20262,84 +21674,84 @@ lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
+return x_22;
+}
+}
+else
+{
+lean_object* x_33; 
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec_ref(x_5);
+lean_dec_ref(x_1);
+x_33 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+lean_ctor_set(x_18, 0, x_33);
 return x_18;
 }
 }
 else
 {
-lean_object* x_29; 
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec_ref(x_7);
-lean_dec(x_6);
-lean_dec_ref(x_5);
-lean_dec_ref(x_1);
-x_29 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-lean_ctor_set(x_14, 0, x_29);
-return x_14;
-}
-}
-else
+lean_object* x_34; uint8_t x_35; 
+x_34 = lean_ctor_get(x_18, 0);
+lean_inc(x_34);
+lean_dec(x_18);
+x_35 = lean_unbox(x_34);
+lean_dec(x_34);
+if (x_35 == 0)
 {
-lean_object* x_30; uint8_t x_31; 
-x_30 = lean_ctor_get(x_14, 0);
-lean_inc(x_30);
-lean_dec(x_14);
-x_31 = lean_unbox(x_30);
-lean_dec(x_30);
-if (x_31 == 0)
-{
-lean_object* x_32; 
+lean_object* x_36; 
 lean_inc(x_10);
 lean_inc_ref(x_9);
-x_32 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_expandOffsetPatterns(x_1, x_9, x_10);
-if (lean_obj_tag(x_32) == 0)
+x_36 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_expandOffsetPatterns(x_1, x_9, x_10);
+if (lean_obj_tag(x_36) == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-if (lean_is_exclusive(x_32)) {
- lean_ctor_release(x_32, 0);
- x_34 = x_32;
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_36, 0);
+lean_inc(x_37);
+if (lean_is_exclusive(x_36)) {
+ lean_ctor_release(x_36, 0);
+ x_38 = x_36;
 } else {
- lean_dec_ref(x_32);
- x_34 = lean_box(0);
+ lean_dec_ref(x_36);
+ x_38 = lean_box(0);
 }
 if (x_2 == 0)
 {
 if (x_4 == 0)
 {
-lean_object* x_39; 
-lean_inc(x_33);
-x_39 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbolsAt(x_33, x_5, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_39) == 0)
+lean_object* x_43; 
+lean_inc(x_37);
+x_43 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveSymbolsAt(x_37, x_5, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_dec_ref(x_39);
-x_35 = lean_box(0);
-goto block_38;
+lean_dec_ref(x_43);
+x_39 = lean_box(0);
+goto block_42;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-lean_dec(x_34);
-lean_dec(x_33);
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- x_41 = x_39;
+lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+lean_dec(x_38);
+lean_dec(x_37);
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+if (lean_is_exclusive(x_43)) {
+ lean_ctor_release(x_43, 0);
+ x_45 = x_43;
 } else {
- lean_dec_ref(x_39);
- x_41 = lean_box(0);
+ lean_dec_ref(x_43);
+ x_45 = lean_box(0);
 }
-if (lean_is_scalar(x_41)) {
- x_42 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_45)) {
+ x_46 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_42 = x_41;
+ x_46 = x_45;
 }
-lean_ctor_set(x_42, 0, x_40);
-return x_42;
+lean_ctor_set(x_46, 0, x_44);
+return x_46;
 }
 }
 else
@@ -20350,8 +21762,8 @@ lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
-x_35 = lean_box(0);
-goto block_38;
+x_39 = lean_box(0);
+goto block_42;
 }
 }
 else
@@ -20362,20 +21774,20 @@ lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
-x_35 = lean_box(0);
-goto block_38;
+x_39 = lean_box(0);
+goto block_42;
 }
-block_38:
+block_42:
 {
-lean_object* x_36; lean_object* x_37; 
-x_36 = l_Lean_Meta_Grind_mkGroundPattern(x_33);
-if (lean_is_scalar(x_34)) {
- x_37 = lean_alloc_ctor(0, 1, 0);
+lean_object* x_40; lean_object* x_41; 
+x_40 = l_Lean_Meta_Grind_mkGroundPattern(x_37);
+if (lean_is_scalar(x_38)) {
+ x_41 = lean_alloc_ctor(0, 1, 0);
 } else {
- x_37 = x_34;
+ x_41 = x_38;
 }
-lean_ctor_set(x_37, 0, x_36);
-return x_37;
+lean_ctor_set(x_41, 0, x_40);
+return x_41;
 }
 }
 else
@@ -20386,12 +21798,12 @@ lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
-return x_32;
+return x_36;
 }
 }
 else
 {
-lean_object* x_43; lean_object* x_44; 
+lean_object* x_47; lean_object* x_48; 
 lean_dec(x_10);
 lean_dec_ref(x_9);
 lean_dec(x_8);
@@ -20399,16 +21811,16 @@ lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
 lean_dec_ref(x_1);
-x_43 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-x_44 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-return x_44;
+x_47 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+x_48 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_48, 0, x_47);
+return x_48;
 }
 }
 }
 else
 {
-uint8_t x_45; 
+uint8_t x_49; 
 lean_dec(x_10);
 lean_dec_ref(x_9);
 lean_dec(x_8);
@@ -20416,26 +21828,26 @@ lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
 lean_dec_ref(x_1);
-x_45 = !lean_is_exclusive(x_14);
-if (x_45 == 0)
+x_49 = !lean_is_exclusive(x_18);
+if (x_49 == 0)
 {
-return x_14;
+return x_18;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; 
-x_46 = lean_ctor_get(x_14, 0);
-lean_inc(x_46);
-lean_dec(x_14);
-x_47 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_47, 0, x_46);
-return x_47;
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_ctor_get(x_18, 0);
+lean_inc(x_50);
+lean_dec(x_18);
+x_51 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_51, 0, x_50);
+return x_51;
 }
 }
 }
 else
 {
-lean_object* x_48; lean_object* x_49; 
+lean_object* x_52; lean_object* x_53; 
 lean_dec(x_10);
 lean_dec_ref(x_9);
 lean_dec(x_8);
@@ -20443,278 +21855,252 @@ lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
 lean_dec_ref(x_1);
-x_48 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-x_49 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_49, 0, x_48);
-return x_49;
+x_52 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+x_53 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_53, 0, x_52);
+return x_53;
 }
 }
 else
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_50; lean_object* x_51; 
+lean_object* x_54; lean_object* x_55; 
 lean_dec(x_10);
 lean_dec_ref(x_9);
 lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec_ref(x_5);
-x_50 = lean_ctor_get(x_1, 0);
-x_51 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_foundBVar___redArg(x_50, x_6);
-if (lean_obj_tag(x_51) == 0)
+x_54 = lean_ctor_get(x_1, 0);
+x_55 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_foundBVar___redArg(x_54, x_6);
+if (lean_obj_tag(x_55) == 0)
 {
-uint8_t x_52; 
-x_52 = !lean_is_exclusive(x_51);
-if (x_52 == 0)
+uint8_t x_56; 
+x_56 = !lean_is_exclusive(x_55);
+if (x_56 == 0)
 {
-lean_object* x_53; 
-x_53 = lean_ctor_get(x_51, 0);
+lean_object* x_57; 
+x_57 = lean_ctor_get(x_55, 0);
 if (x_2 == 0)
 {
-lean_free_object(x_51);
-lean_dec(x_53);
-goto block_61;
+lean_free_object(x_55);
+lean_dec(x_57);
+goto block_65;
+}
+else
+{
+uint8_t x_66; 
+x_66 = lean_unbox(x_57);
+lean_dec(x_57);
+if (x_66 == 0)
+{
+lean_free_object(x_55);
+goto block_65;
+}
+else
+{
+if (x_4 == 2)
+{
+lean_free_object(x_55);
+goto block_65;
+}
+else
+{
+lean_object* x_67; 
+lean_dec(x_6);
+lean_dec_ref(x_1);
+x_67 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+lean_ctor_set(x_55, 0, x_67);
+return x_55;
+}
+}
+}
+block_65:
+{
+lean_object* x_58; 
+lean_inc(x_54);
+x_58 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveBVar___redArg(x_54, x_6);
+lean_dec(x_6);
+if (lean_obj_tag(x_58) == 0)
+{
+uint8_t x_59; 
+x_59 = !lean_is_exclusive(x_58);
+if (x_59 == 0)
+{
+lean_object* x_60; 
+x_60 = lean_ctor_get(x_58, 0);
+lean_dec(x_60);
+lean_ctor_set(x_58, 0, x_1);
+return x_58;
+}
+else
+{
+lean_object* x_61; 
+lean_dec(x_58);
+x_61 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_61, 0, x_1);
+return x_61;
+}
 }
 else
 {
 uint8_t x_62; 
-x_62 = lean_unbox(x_53);
-lean_dec(x_53);
+lean_dec_ref(x_1);
+x_62 = !lean_is_exclusive(x_58);
 if (x_62 == 0)
 {
-lean_free_object(x_51);
-goto block_61;
+return x_58;
 }
 else
 {
-if (x_4 == 2)
-{
-lean_free_object(x_51);
-goto block_61;
-}
-else
-{
-lean_object* x_63; 
-lean_dec(x_6);
-lean_dec_ref(x_1);
-x_63 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-lean_ctor_set(x_51, 0, x_63);
-return x_51;
-}
-}
-}
-block_61:
-{
-lean_object* x_54; 
-lean_inc(x_50);
-x_54 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveBVar___redArg(x_50, x_6);
-lean_dec(x_6);
-if (lean_obj_tag(x_54) == 0)
-{
-uint8_t x_55; 
-x_55 = !lean_is_exclusive(x_54);
-if (x_55 == 0)
-{
-lean_object* x_56; 
-x_56 = lean_ctor_get(x_54, 0);
-lean_dec(x_56);
-lean_ctor_set(x_54, 0, x_1);
-return x_54;
-}
-else
-{
-lean_object* x_57; 
-lean_dec(x_54);
-x_57 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_57, 0, x_1);
-return x_57;
-}
-}
-else
-{
-uint8_t x_58; 
-lean_dec_ref(x_1);
-x_58 = !lean_is_exclusive(x_54);
-if (x_58 == 0)
-{
-return x_54;
-}
-else
-{
-lean_object* x_59; lean_object* x_60; 
-x_59 = lean_ctor_get(x_54, 0);
-lean_inc(x_59);
-lean_dec(x_54);
-x_60 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_60, 0, x_59);
-return x_60;
+lean_object* x_63; lean_object* x_64; 
+x_63 = lean_ctor_get(x_58, 0);
+lean_inc(x_63);
+lean_dec(x_58);
+x_64 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_64, 0, x_63);
+return x_64;
 }
 }
 }
 }
 else
 {
-lean_object* x_64; 
-x_64 = lean_ctor_get(x_51, 0);
-lean_inc(x_64);
-lean_dec(x_51);
+lean_object* x_68; 
+x_68 = lean_ctor_get(x_55, 0);
+lean_inc(x_68);
+lean_dec(x_55);
 if (x_2 == 0)
 {
-lean_dec(x_64);
-goto block_71;
+lean_dec(x_68);
+goto block_75;
 }
 else
 {
-uint8_t x_72; 
-x_72 = lean_unbox(x_64);
-lean_dec(x_64);
-if (x_72 == 0)
+uint8_t x_76; 
+x_76 = lean_unbox(x_68);
+lean_dec(x_68);
+if (x_76 == 0)
 {
-goto block_71;
+goto block_75;
 }
 else
 {
 if (x_4 == 2)
 {
-goto block_71;
+goto block_75;
 }
 else
 {
-lean_object* x_73; lean_object* x_74; 
+lean_object* x_77; lean_object* x_78; 
 lean_dec(x_6);
 lean_dec_ref(x_1);
-x_73 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-x_74 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_74, 0, x_73);
+x_77 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+x_78 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_78, 0, x_77);
+return x_78;
+}
+}
+}
+block_75:
+{
+lean_object* x_69; 
+lean_inc(x_54);
+x_69 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveBVar___redArg(x_54, x_6);
+lean_dec(x_6);
+if (lean_obj_tag(x_69) == 0)
+{
+lean_object* x_70; lean_object* x_71; 
+if (lean_is_exclusive(x_69)) {
+ lean_ctor_release(x_69, 0);
+ x_70 = x_69;
+} else {
+ lean_dec_ref(x_69);
+ x_70 = lean_box(0);
+}
+if (lean_is_scalar(x_70)) {
+ x_71 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_71 = x_70;
+}
+lean_ctor_set(x_71, 0, x_1);
+return x_71;
+}
+else
+{
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+lean_dec_ref(x_1);
+x_72 = lean_ctor_get(x_69, 0);
+lean_inc(x_72);
+if (lean_is_exclusive(x_69)) {
+ lean_ctor_release(x_69, 0);
+ x_73 = x_69;
+} else {
+ lean_dec_ref(x_69);
+ x_73 = lean_box(0);
+}
+if (lean_is_scalar(x_73)) {
+ x_74 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_74 = x_73;
+}
+lean_ctor_set(x_74, 0, x_72);
 return x_74;
 }
 }
 }
-block_71:
-{
-lean_object* x_65; 
-lean_inc(x_50);
-x_65 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveBVar___redArg(x_50, x_6);
-lean_dec(x_6);
-if (lean_obj_tag(x_65) == 0)
-{
-lean_object* x_66; lean_object* x_67; 
-if (lean_is_exclusive(x_65)) {
- lean_ctor_release(x_65, 0);
- x_66 = x_65;
-} else {
- lean_dec_ref(x_65);
- x_66 = lean_box(0);
-}
-if (lean_is_scalar(x_66)) {
- x_67 = lean_alloc_ctor(0, 1, 0);
-} else {
- x_67 = x_66;
-}
-lean_ctor_set(x_67, 0, x_1);
-return x_67;
 }
 else
 {
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-lean_dec_ref(x_1);
-x_68 = lean_ctor_get(x_65, 0);
-lean_inc(x_68);
-if (lean_is_exclusive(x_65)) {
- lean_ctor_release(x_65, 0);
- x_69 = x_65;
-} else {
- lean_dec_ref(x_65);
- x_69 = lean_box(0);
-}
-if (lean_is_scalar(x_69)) {
- x_70 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_70 = x_69;
-}
-lean_ctor_set(x_70, 0, x_68);
-return x_70;
-}
-}
-}
-}
-else
-{
-uint8_t x_75; 
+uint8_t x_79; 
 lean_dec(x_6);
 lean_dec_ref(x_1);
-x_75 = !lean_is_exclusive(x_51);
-if (x_75 == 0)
+x_79 = !lean_is_exclusive(x_55);
+if (x_79 == 0)
 {
-return x_51;
+return x_55;
 }
 else
 {
-lean_object* x_76; lean_object* x_77; 
-x_76 = lean_ctor_get(x_51, 0);
-lean_inc(x_76);
-lean_dec(x_51);
-x_77 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_77, 0, x_76);
-return x_77;
+lean_object* x_80; lean_object* x_81; 
+x_80 = lean_ctor_get(x_55, 0);
+lean_inc(x_80);
+lean_dec(x_55);
+x_81 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_81, 0, x_80);
+return x_81;
 }
 }
 }
 else
 {
-uint8_t x_78; lean_object* x_79; 
-x_78 = 0;
-lean_inc_ref(x_5);
-x_79 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_getPatternFn_x3f(x_1, x_2, x_78, x_3, x_5, x_6, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_79) == 0)
-{
-uint8_t x_80; 
-x_80 = !lean_is_exclusive(x_79);
-if (x_80 == 0)
-{
-lean_object* x_81; 
-x_81 = lean_ctor_get(x_79, 0);
-if (lean_obj_tag(x_81) == 1)
-{
-lean_object* x_82; 
-lean_free_object(x_79);
-lean_dec_ref(x_81);
-x_82 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_2, x_78, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_82;
-}
-else
+uint8_t x_82; 
+x_82 = l_Lean_Expr_isLambda(x_1);
+if (x_82 == 0)
 {
 lean_object* x_83; 
-lean_dec(x_81);
-lean_dec(x_10);
-lean_dec_ref(x_9);
-lean_dec(x_8);
-lean_dec_ref(x_7);
-lean_dec(x_6);
-lean_dec_ref(x_5);
-lean_dec_ref(x_1);
-x_83 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-lean_ctor_set(x_79, 0, x_83);
-return x_79;
-}
-}
-else
+lean_inc_ref(x_5);
+x_83 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_getPatternFn_x3f(x_1, x_2, x_82, x_3, x_5, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_83) == 0)
 {
-lean_object* x_84; 
-x_84 = lean_ctor_get(x_79, 0);
-lean_inc(x_84);
-lean_dec(x_79);
-if (lean_obj_tag(x_84) == 1)
+uint8_t x_84; 
+x_84 = !lean_is_exclusive(x_83);
+if (x_84 == 0)
 {
 lean_object* x_85; 
-lean_dec_ref(x_84);
-x_85 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_2, x_78, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_85;
+x_85 = lean_ctor_get(x_83, 0);
+if (lean_obj_tag(x_85) == 1)
+{
+lean_object* x_86; 
+lean_free_object(x_83);
+lean_dec_ref(x_85);
+x_86 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_2, x_82, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_86;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; 
-lean_dec(x_84);
+lean_object* x_87; 
+lean_dec(x_85);
 lean_dec(x_10);
 lean_dec_ref(x_9);
 lean_dec(x_8);
@@ -20722,16 +22108,28 @@ lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
 lean_dec_ref(x_1);
-x_86 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
-x_87 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_87, 0, x_86);
-return x_87;
-}
+x_87 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+lean_ctor_set(x_83, 0, x_87);
+return x_83;
 }
 }
 else
 {
-uint8_t x_88; 
+lean_object* x_88; 
+x_88 = lean_ctor_get(x_83, 0);
+lean_inc(x_88);
+lean_dec(x_83);
+if (lean_obj_tag(x_88) == 1)
+{
+lean_object* x_89; 
+lean_dec_ref(x_88);
+x_89 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_2, x_82, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_89;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; 
+lean_dec(x_88);
 lean_dec(x_10);
 lean_dec_ref(x_9);
 lean_dec(x_8);
@@ -20739,27 +22137,179 @@ lean_dec_ref(x_7);
 lean_dec(x_6);
 lean_dec_ref(x_5);
 lean_dec_ref(x_1);
-x_88 = !lean_is_exclusive(x_79);
-if (x_88 == 0)
-{
-return x_79;
+x_90 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+x_91 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_91, 0, x_90);
+return x_91;
+}
+}
 }
 else
 {
-lean_object* x_89; lean_object* x_90; 
-x_89 = lean_ctor_get(x_79, 0);
-lean_inc(x_89);
-lean_dec(x_79);
-x_90 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_90, 0, x_89);
-return x_90;
+uint8_t x_92; 
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec_ref(x_5);
+lean_dec_ref(x_1);
+x_92 = !lean_is_exclusive(x_83);
+if (x_92 == 0)
+{
+return x_83;
+}
+else
+{
+lean_object* x_93; lean_object* x_94; 
+x_93 = lean_ctor_get(x_83, 0);
+lean_inc(x_93);
+lean_dec(x_83);
+x_94 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_94, 0, x_93);
+return x_94;
+}
+}
+}
+else
+{
+lean_object* x_95; 
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec_ref(x_5);
+lean_inc_ref(x_1);
+x_95 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkMillerHOPattern_x3f(x_1);
+if (lean_obj_tag(x_95) == 1)
+{
+lean_object* x_96; lean_object* x_97; lean_object* x_98; uint8_t x_99; 
+x_96 = lean_ctor_get(x_95, 0);
+lean_inc(x_96);
+lean_dec_ref(x_95);
+x_97 = lean_unsigned_to_nat(0u);
+x_98 = lean_array_get_size(x_96);
+x_99 = lean_nat_dec_lt(x_97, x_98);
+if (x_99 == 0)
+{
+lean_dec(x_96);
+lean_dec(x_6);
+lean_dec_ref(x_1);
+x_12 = lean_box(0);
+goto block_15;
+}
+else
+{
+if (x_99 == 0)
+{
+lean_dec(x_96);
+lean_dec(x_6);
+lean_dec_ref(x_1);
+x_12 = lean_box(0);
+goto block_15;
+}
+else
+{
+size_t x_100; size_t x_101; lean_object* x_102; 
+x_100 = 0;
+x_101 = lean_usize_of_nat(x_98);
+x_102 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg(x_82, x_96, x_100, x_101, x_6);
+lean_dec(x_6);
+lean_dec(x_96);
+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; 
+x_104 = lean_ctor_get(x_102, 0);
+x_105 = lean_unbox(x_104);
+lean_dec(x_104);
+if (x_105 == 0)
+{
+lean_free_object(x_102);
+lean_dec_ref(x_1);
+x_12 = lean_box(0);
+goto block_15;
+}
+else
+{
+lean_object* x_106; 
+x_106 = l_Lean_Meta_Grind_mkHOPattern(x_1);
+lean_ctor_set(x_102, 0, x_106);
+return x_102;
+}
+}
+else
+{
+lean_object* x_107; uint8_t x_108; 
+x_107 = lean_ctor_get(x_102, 0);
+lean_inc(x_107);
+lean_dec(x_102);
+x_108 = lean_unbox(x_107);
+lean_dec(x_107);
+if (x_108 == 0)
+{
+lean_dec_ref(x_1);
+x_12 = lean_box(0);
+goto block_15;
+}
+else
+{
+lean_object* x_109; lean_object* x_110; 
+x_109 = l_Lean_Meta_Grind_mkHOPattern(x_1);
+x_110 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_110, 0, x_109);
+return x_110;
+}
+}
+}
+else
+{
+uint8_t x_111; 
+lean_dec_ref(x_1);
+x_111 = !lean_is_exclusive(x_102);
+if (x_111 == 0)
+{
+return x_102;
+}
+else
+{
+lean_object* x_112; lean_object* x_113; 
+x_112 = lean_ctor_get(x_102, 0);
+lean_inc(x_112);
+lean_dec(x_102);
+x_113 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_113, 0, x_112);
+return x_113;
 }
 }
 }
 }
 }
+else
+{
+lean_dec(x_95);
+lean_dec(x_6);
+lean_dec_ref(x_1);
+x_12 = lean_box(0);
+goto block_15;
 }
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg(lean_object* x_1, uint8_t x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+}
+}
+}
+block_15:
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+x_14 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+return x_14;
+}
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(lean_object* x_1, uint8_t x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 uint8_t x_14; 
@@ -20872,18 +22422,28 @@ goto block_28;
 }
 }
 }
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
 uint8_t x_14; uint8_t x_15; lean_object* x_16; 
 x_14 = lean_unbox(x_2);
 x_15 = lean_unbox(x_3);
-x_16 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg(x_1, x_14, x_15, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+x_16 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(x_1, x_14, x_15, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 lean_dec_ref(x_4);
 lean_dec(x_1);
 return x_16;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+uint8_t x_11; uint8_t x_12; lean_object* x_13; 
+x_11 = lean_unbox(x_2);
+x_12 = lean_unbox(x_3);
+x_13 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_11, x_12, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_13;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg___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:
 {
@@ -20895,25 +22455,43 @@ x_15 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_Norma
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0(uint8_t x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-uint8_t x_11; uint8_t x_12; lean_object* x_13; 
-x_11 = lean_unbox(x_2);
-x_12 = lean_unbox(x_3);
-x_13 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_11, x_12, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_13;
+lean_object* x_12; 
+x_12 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___redArg(x_1, x_2, x_3, x_4, x_6);
+return x_12;
 }
 }
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(lean_object* x_1, uint8_t x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+uint8_t x_12; size_t x_13; size_t x_14; lean_object* x_15; 
+x_12 = lean_unbox(x_1);
+x_13 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_14 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_15 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_goArg_spec__0(x_12, x_2, x_13, x_14, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec_ref(x_5);
+lean_dec_ref(x_2);
+return x_15;
+}
+}
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3(lean_object* x_1, uint8_t x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
 lean_object* x_18; 
-x_18 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___redArg(x_1, x_2, x_4, x_5, x_8, x_9, x_11, x_12, x_13, x_14, x_15, x_16);
+x_18 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(x_1, x_2, x_4, x_5, x_8, x_9, x_11, x_12, x_13, x_14, x_15, x_16);
 return x_18;
 }
 }
-LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___boxed(lean_object** _args) {
+LEAN_EXPORT lean_object* l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___boxed(lean_object** _args) {
 lean_object* x_1 = _args[0];
 lean_object* x_2 = _args[1];
 lean_object* x_3 = _args[2];
@@ -20936,26 +22514,26 @@ _start:
 uint8_t x_18; uint8_t x_19; lean_object* x_20; 
 x_18 = lean_unbox(x_2);
 x_19 = lean_unbox(x_4);
-x_20 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2(x_1, x_18, x_3, x_19, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+x_20 = l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3(x_1, x_18, x_3, x_19, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
 lean_dec_ref(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
 return x_20;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_10; 
-x_10 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___redArg(x_2, x_5, x_6, x_7, x_8);
+x_10 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___redArg(x_2, x_5, x_6, x_7, x_8);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+LEAN_EXPORT lean_object* l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
-x_10 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_10 = l_Lean_throwError___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
@@ -20965,6 +22543,772 @@ lean_dec_ref(x_3);
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_collectNonHOBVars(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; uint8_t x_15; 
+x_15 = l_Lean_Meta_Grind_isPatternDontCare(x_1);
+if (x_15 == 0)
+{
+lean_object* x_16; 
+x_16 = l_Lean_Meta_Grind_hoPattern_x3f(x_1);
+if (lean_obj_tag(x_16) == 0)
+{
+x_3 = x_15;
+goto block_14;
+}
+else
+{
+lean_dec_ref(x_16);
+lean_dec_ref(x_1);
+return x_2;
+}
+}
+else
+{
+x_3 = x_15;
+goto block_14;
+}
+block_14:
+{
+if (x_3 == 0)
+{
+lean_object* x_4; 
+x_4 = l_Lean_Meta_Grind_groundPattern_x3f(x_1);
+if (lean_obj_tag(x_4) == 0)
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+lean_object* x_5; uint8_t x_6; 
+x_5 = lean_ctor_get(x_1, 0);
+lean_inc(x_5);
+lean_dec_ref(x_1);
+x_6 = l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0(x_2, x_5);
+if (x_6 == 0)
+{
+lean_object* x_7; 
+x_7 = lean_array_push(x_2, x_5);
+return x_7;
+}
+else
+{
+lean_dec(x_5);
+return x_2;
+}
+}
+case 5:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_1, 0);
+lean_inc_ref(x_8);
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_9);
+lean_dec_ref(x_1);
+x_10 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_collectNonHOBVars(x_8, x_2);
+x_1 = x_9;
+x_2 = x_10;
+goto _start;
+}
+case 10:
+{
+lean_object* x_12; 
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_12);
+lean_dec_ref(x_1);
+x_1 = x_12;
+goto _start;
+}
+default: 
+{
+lean_dec_ref(x_1);
+return x_2;
+}
+}
+}
+else
+{
+lean_dec_ref(x_4);
+lean_dec_ref(x_1);
+return x_2;
+}
+}
+else
+{
+lean_dec_ref(x_1);
+return x_2;
+}
+}
+}
+}
+LEAN_EXPORT uint8_t l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go_spec__0(lean_object* x_1, uint8_t x_2, lean_object* x_3, size_t x_4, size_t x_5) {
+_start:
+{
+uint8_t x_6; 
+x_6 = lean_usize_dec_eq(x_4, x_5);
+if (x_6 == 0)
+{
+uint8_t x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = 1;
+x_8 = lean_array_uget(x_3, x_4);
+x_9 = l_Array_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_addVar_spec__0(x_1, x_8);
+lean_dec(x_8);
+if (x_9 == 0)
+{
+return x_7;
+}
+else
+{
+if (x_2 == 0)
+{
+size_t x_10; size_t x_11; 
+x_10 = 1;
+x_11 = lean_usize_add(x_4, x_10);
+x_4 = x_11;
+goto _start;
+}
+else
+{
+return x_7;
+}
+}
+}
+else
+{
+uint8_t x_13; 
+x_13 = 0;
+return x_13;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; size_t x_7; size_t x_8; uint8_t x_9; lean_object* x_10; 
+x_6 = lean_unbox(x_2);
+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___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go_spec__0(x_1, x_6, x_3, x_7, x_8);
+lean_dec_ref(x_3);
+lean_dec_ref(x_1);
+x_10 = lean_box(x_9);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; uint8_t x_29; 
+x_29 = l_Lean_Meta_Grind_isPatternDontCare(x_2);
+if (x_29 == 0)
+{
+lean_object* x_30; 
+x_30 = l_Lean_Meta_Grind_groundPattern_x3f(x_2);
+if (lean_obj_tag(x_30) == 0)
+{
+x_3 = x_29;
+goto block_28;
+}
+else
+{
+lean_dec_ref(x_30);
+return x_2;
+}
+}
+else
+{
+x_3 = x_29;
+goto block_28;
+}
+block_28:
+{
+if (x_3 == 0)
+{
+uint8_t x_4; 
+x_4 = l_Lean_Expr_isBVar(x_2);
+if (x_4 == 0)
+{
+lean_object* x_5; 
+x_5 = l_Lean_Meta_Grind_hoPattern_x3f(x_2);
+if (lean_obj_tag(x_5) == 1)
+{
+lean_object* x_6; lean_object* x_7; 
+x_6 = lean_ctor_get(x_5, 0);
+lean_inc(x_6);
+lean_dec_ref(x_5);
+x_7 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkMillerHOPattern_x3f(x_6);
+if (lean_obj_tag(x_7) == 1)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+lean_dec_ref(x_7);
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = lean_array_get_size(x_8);
+x_11 = lean_nat_dec_lt(x_9, x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_8);
+lean_dec_ref(x_2);
+x_12 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+return x_12;
+}
+else
+{
+if (x_11 == 0)
+{
+lean_object* x_13; 
+lean_dec(x_8);
+lean_dec_ref(x_2);
+x_13 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+return x_13;
+}
+else
+{
+size_t x_14; size_t x_15; uint8_t x_16; 
+x_14 = 0;
+x_15 = lean_usize_of_nat(x_10);
+x_16 = l___private_Init_Data_Array_Basic_0__Array_anyMUnsafe_any___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go_spec__0(x_1, x_4, x_8, x_14, x_15);
+lean_dec(x_8);
+if (x_16 == 0)
+{
+lean_object* x_17; 
+lean_dec_ref(x_2);
+x_17 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+return x_17;
+}
+else
+{
+return x_2;
+}
+}
+}
+}
+else
+{
+lean_object* x_18; 
+lean_dec(x_7);
+lean_dec_ref(x_2);
+x_18 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare;
+return x_18;
+}
+}
+else
+{
+lean_dec(x_5);
+switch (lean_obj_tag(x_2)) {
+case 5:
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_19 = lean_ctor_get(x_2, 0);
+lean_inc_ref(x_19);
+x_20 = lean_ctor_get(x_2, 1);
+lean_inc_ref(x_20);
+lean_dec_ref(x_2);
+x_21 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(x_1, x_19);
+x_22 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(x_1, x_20);
+x_23 = l_Lean_Expr_app___override(x_21, x_22);
+return x_23;
+}
+case 10:
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_24 = lean_ctor_get(x_2, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_2, 1);
+lean_inc_ref(x_25);
+lean_dec_ref(x_2);
+x_26 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(x_1, x_25);
+x_27 = l_Lean_mkMData(x_24, x_26);
+return x_27;
+}
+default: 
+{
+return x_2;
+}
+}
+}
+}
+else
+{
+return x_2;
+}
+}
+else
+{
+return x_2;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(x_1, x_2);
+lean_dec_ref(x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(x_2, x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns(x_1, x_2);
+lean_dec_ref(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_eq(x_2, x_3);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; 
+x_8 = lean_array_uget(x_1, x_2);
+x_9 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveBVar___redArg(x_8, x_5);
+if (lean_obj_tag(x_9) == 0)
+{
+lean_object* x_10; size_t x_11; size_t x_12; 
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+lean_dec_ref(x_9);
+x_11 = 1;
+x_12 = lean_usize_add(x_2, x_11);
+x_2 = x_12;
+x_4 = x_10;
+goto _start;
+}
+else
+{
+return x_9;
+}
+}
+else
+{
+lean_object* x_14; 
+x_14 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_14, 0, x_4);
+return x_14;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg___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_3);
+lean_dec(x_3);
+x_9 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_1, x_7, x_8, x_4, x_5);
+lean_dec(x_5);
+lean_dec_ref(x_1);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_Meta_Grind_hoPattern_x3f(x_1);
+if (lean_obj_tag(x_9) == 1)
+{
+uint8_t x_10; 
+x_10 = !lean_is_exclusive(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_ctor_get(x_9, 0);
+x_12 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkMillerHOPattern_x3f(x_11);
+if (lean_obj_tag(x_12) == 1)
+{
+uint8_t x_13; 
+lean_free_object(x_9);
+x_13 = !lean_is_exclusive(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
+x_14 = lean_ctor_get(x_12, 0);
+x_15 = lean_unsigned_to_nat(0u);
+x_16 = lean_array_get_size(x_14);
+x_17 = lean_box(0);
+x_18 = lean_nat_dec_lt(x_15, x_16);
+if (x_18 == 0)
+{
+lean_dec(x_14);
+lean_ctor_set_tag(x_12, 0);
+lean_ctor_set(x_12, 0, x_17);
+return x_12;
+}
+else
+{
+uint8_t x_19; 
+x_19 = lean_nat_dec_le(x_16, x_16);
+if (x_19 == 0)
+{
+if (x_18 == 0)
+{
+lean_dec(x_14);
+lean_ctor_set_tag(x_12, 0);
+lean_ctor_set(x_12, 0, x_17);
+return x_12;
+}
+else
+{
+size_t x_20; size_t x_21; lean_object* x_22; 
+lean_free_object(x_12);
+x_20 = 0;
+x_21 = lean_usize_of_nat(x_16);
+x_22 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_14, x_20, x_21, x_17, x_3);
+lean_dec(x_14);
+return x_22;
+}
+}
+else
+{
+size_t x_23; size_t x_24; lean_object* x_25; 
+lean_free_object(x_12);
+x_23 = 0;
+x_24 = lean_usize_of_nat(x_16);
+x_25 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_14, x_23, x_24, x_17, x_3);
+lean_dec(x_14);
+return x_25;
+}
+}
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
+x_26 = lean_ctor_get(x_12, 0);
+lean_inc(x_26);
+lean_dec(x_12);
+x_27 = lean_unsigned_to_nat(0u);
+x_28 = lean_array_get_size(x_26);
+x_29 = lean_box(0);
+x_30 = lean_nat_dec_lt(x_27, x_28);
+if (x_30 == 0)
+{
+lean_object* x_31; 
+lean_dec(x_26);
+x_31 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_31, 0, x_29);
+return x_31;
+}
+else
+{
+uint8_t x_32; 
+x_32 = lean_nat_dec_le(x_28, x_28);
+if (x_32 == 0)
+{
+if (x_30 == 0)
+{
+lean_object* x_33; 
+lean_dec(x_26);
+x_33 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_33, 0, x_29);
+return x_33;
+}
+else
+{
+size_t x_34; size_t x_35; lean_object* x_36; 
+x_34 = 0;
+x_35 = lean_usize_of_nat(x_28);
+x_36 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_26, x_34, x_35, x_29, x_3);
+lean_dec(x_26);
+return x_36;
+}
+}
+else
+{
+size_t x_37; size_t x_38; lean_object* x_39; 
+x_37 = 0;
+x_38 = lean_usize_of_nat(x_28);
+x_39 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_26, x_37, x_38, x_29, x_3);
+lean_dec(x_26);
+return x_39;
+}
+}
+}
+}
+else
+{
+lean_object* x_40; 
+lean_dec(x_12);
+x_40 = lean_box(0);
+lean_ctor_set_tag(x_9, 0);
+lean_ctor_set(x_9, 0, x_40);
+return x_9;
+}
+}
+else
+{
+lean_object* x_41; lean_object* x_42; 
+x_41 = lean_ctor_get(x_9, 0);
+lean_inc(x_41);
+lean_dec(x_9);
+x_42 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkMillerHOPattern_x3f(x_41);
+if (lean_obj_tag(x_42) == 1)
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
+x_43 = lean_ctor_get(x_42, 0);
+lean_inc(x_43);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ x_44 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_44 = lean_box(0);
+}
+x_45 = lean_unsigned_to_nat(0u);
+x_46 = lean_array_get_size(x_43);
+x_47 = lean_box(0);
+x_48 = lean_nat_dec_lt(x_45, x_46);
+if (x_48 == 0)
+{
+lean_object* x_49; 
+lean_dec(x_43);
+if (lean_is_scalar(x_44)) {
+ x_49 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_49 = x_44;
+ lean_ctor_set_tag(x_49, 0);
+}
+lean_ctor_set(x_49, 0, x_47);
+return x_49;
+}
+else
+{
+uint8_t x_50; 
+x_50 = lean_nat_dec_le(x_46, x_46);
+if (x_50 == 0)
+{
+if (x_48 == 0)
+{
+lean_object* x_51; 
+lean_dec(x_43);
+if (lean_is_scalar(x_44)) {
+ x_51 = lean_alloc_ctor(0, 1, 0);
+} else {
+ x_51 = x_44;
+ lean_ctor_set_tag(x_51, 0);
+}
+lean_ctor_set(x_51, 0, x_47);
+return x_51;
+}
+else
+{
+size_t x_52; size_t x_53; lean_object* x_54; 
+lean_dec(x_44);
+x_52 = 0;
+x_53 = lean_usize_of_nat(x_46);
+x_54 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_43, x_52, x_53, x_47, x_3);
+lean_dec(x_43);
+return x_54;
+}
+}
+else
+{
+size_t x_55; size_t x_56; lean_object* x_57; 
+lean_dec(x_44);
+x_55 = 0;
+x_56 = lean_usize_of_nat(x_46);
+x_57 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_43, x_55, x_56, x_47, x_3);
+lean_dec(x_43);
+return x_57;
+}
+}
+}
+else
+{
+lean_object* x_58; lean_object* x_59; 
+lean_dec(x_42);
+x_58 = lean_box(0);
+x_59 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_59, 0, x_58);
+return x_59;
+}
+}
+}
+else
+{
+lean_dec(x_9);
+if (lean_obj_tag(x_1) == 5)
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_1, 0);
+x_61 = lean_ctor_get(x_1, 1);
+x_62 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars(x_60, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_62) == 0)
+{
+lean_dec_ref(x_62);
+x_1 = x_61;
+goto _start;
+}
+else
+{
+return x_62;
+}
+}
+else
+{
+lean_object* x_64; lean_object* x_65; 
+x_64 = lean_box(0);
+x_65 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_65, 0, x_64);
+return x_65;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_12; 
+x_12 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___redArg(x_1, x_2, x_3, x_4, x_6);
+return x_12;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+size_t x_12; size_t x_13; lean_object* x_14; 
+x_12 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_13 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_14 = l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars_spec__0(x_1, x_12, x_13, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_10);
+lean_dec_ref(x_9);
+lean_dec(x_8);
+lean_dec_ref(x_7);
+lean_dec(x_6);
+lean_dec_ref(x_5);
+lean_dec_ref(x_1);
+return x_14;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(lean_object* x_1, 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_9; uint8_t x_10; lean_object* x_11; 
+x_9 = 0;
+x_10 = 1;
+lean_inc(x_7);
+lean_inc_ref(x_6);
+lean_inc(x_5);
+lean_inc_ref(x_4);
+lean_inc(x_3);
+lean_inc_ref(x_2);
+x_11 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_9, x_10, x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_11) == 0)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+lean_dec_ref(x_11);
+x_13 = l_Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2___closed__3;
+lean_inc(x_12);
+x_14 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_collectNonHOBVars(x_12, x_13);
+x_15 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_removeRedundantHOPatterns_go(x_14, x_12);
+lean_dec_ref(x_14);
+x_16 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_saveHOPatternBVars(x_15, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+if (lean_obj_tag(x_16) == 0)
+{
+uint8_t x_17; 
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; 
+x_18 = lean_ctor_get(x_16, 0);
+lean_dec(x_18);
+lean_ctor_set(x_16, 0, x_15);
+return x_16;
+}
+else
+{
+lean_object* x_19; 
+lean_dec(x_16);
+x_19 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_19, 0, x_15);
+return x_19;
+}
+}
+else
+{
+uint8_t x_20; 
+lean_dec_ref(x_15);
+x_20 = !lean_is_exclusive(x_16);
+if (x_20 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_21; lean_object* x_22; 
+x_21 = lean_ctor_get(x_16, 0);
+lean_inc(x_21);
+lean_dec(x_16);
+x_22 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_22, 0, x_21);
+return x_22;
+}
+}
+}
+else
+{
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec_ref(x_4);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+return x_11;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l_List_mapM_loop___at___00Lean_Meta_Grind_NormalizePattern_main_spec__0(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -20988,26 +23332,24 @@ uint8_t x_12;
 x_12 = !lean_is_exclusive(x_1);
 if (x_12 == 0)
 {
-lean_object* x_13; lean_object* x_14; uint8_t x_15; uint8_t x_16; lean_object* x_17; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
 x_13 = lean_ctor_get(x_1, 0);
 x_14 = lean_ctor_get(x_1, 1);
-x_15 = 0;
-x_16 = 1;
 lean_inc(x_8);
 lean_inc_ref(x_7);
 lean_inc(x_6);
 lean_inc_ref(x_5);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_17 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_13, x_15, x_16, x_3, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_17) == 0)
+x_15 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(x_13, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_15) == 0)
 {
-lean_object* x_18; 
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-lean_dec_ref(x_17);
+lean_object* x_16; 
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+lean_dec_ref(x_15);
 lean_ctor_set(x_1, 1, x_2);
-lean_ctor_set(x_1, 0, x_18);
+lean_ctor_set(x_1, 0, x_16);
 {
 lean_object* _tmp_0 = x_14;
 lean_object* _tmp_1 = x_1;
@@ -21018,7 +23360,7 @@ goto _start;
 }
 else
 {
-uint8_t x_20; 
+uint8_t x_18; 
 lean_free_object(x_1);
 lean_dec(x_14);
 lean_dec(x_8);
@@ -21028,57 +23370,55 @@ lean_dec_ref(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec(x_2);
-x_20 = !lean_is_exclusive(x_17);
-if (x_20 == 0)
+x_18 = !lean_is_exclusive(x_15);
+if (x_18 == 0)
 {
-return x_17;
+return x_15;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; 
-x_21 = lean_ctor_get(x_17, 0);
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_ctor_get(x_15, 0);
+lean_inc(x_19);
+lean_dec(x_15);
+x_20 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_20, 0, x_19);
+return x_20;
+}
+}
+}
+else
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_1, 0);
+x_22 = lean_ctor_get(x_1, 1);
+lean_inc(x_22);
 lean_inc(x_21);
-lean_dec(x_17);
-x_22 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_22, 0, x_21);
-return x_22;
-}
-}
-}
-else
-{
-lean_object* x_23; lean_object* x_24; uint8_t x_25; uint8_t x_26; lean_object* x_27; 
-x_23 = lean_ctor_get(x_1, 0);
-x_24 = lean_ctor_get(x_1, 1);
-lean_inc(x_24);
-lean_inc(x_23);
 lean_dec(x_1);
-x_25 = 0;
-x_26 = 1;
 lean_inc(x_8);
 lean_inc_ref(x_7);
 lean_inc(x_6);
 lean_inc_ref(x_5);
 lean_inc(x_4);
 lean_inc_ref(x_3);
-x_27 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_23, x_25, x_26, x_3, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_27) == 0)
+x_23 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(x_21, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_23) == 0)
 {
-lean_object* x_28; lean_object* x_29; 
-x_28 = lean_ctor_get(x_27, 0);
-lean_inc(x_28);
-lean_dec_ref(x_27);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_2);
-x_1 = x_24;
-x_2 = x_29;
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+lean_dec_ref(x_23);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_24);
+lean_ctor_set(x_25, 1, x_2);
+x_1 = x_22;
+x_2 = x_25;
 goto _start;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-lean_dec(x_24);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_dec(x_22);
 lean_dec(x_8);
 lean_dec_ref(x_7);
 lean_dec(x_6);
@@ -21086,22 +23426,22 @@ lean_dec_ref(x_5);
 lean_dec(x_4);
 lean_dec_ref(x_3);
 lean_dec(x_2);
-x_31 = lean_ctor_get(x_27, 0);
-lean_inc(x_31);
-if (lean_is_exclusive(x_27)) {
- lean_ctor_release(x_27, 0);
- x_32 = x_27;
+x_27 = lean_ctor_get(x_23, 0);
+lean_inc(x_27);
+if (lean_is_exclusive(x_23)) {
+ lean_ctor_release(x_23, 0);
+ x_28 = x_23;
 } else {
- lean_dec_ref(x_27);
- x_32 = lean_box(0);
+ lean_dec_ref(x_23);
+ x_28 = lean_box(0);
 }
-if (lean_is_scalar(x_32)) {
- x_33 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_28)) {
+ x_29 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_33 = x_32;
+ x_29 = x_28;
 }
-lean_ctor_set(x_33, 0, x_31);
-return x_33;
+lean_ctor_set(x_29, 0, x_27);
+return x_29;
 }
 }
 }
@@ -21251,24 +23591,6 @@ x_9 = l_Lean_Meta_Grind_NormalizePattern_main(x_1, x_2, x_3, x_4, x_5, x_6, x_7)
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(lean_object* x_1, 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_9; uint8_t x_10; lean_object* x_11; 
-x_9 = 0;
-x_10 = 1;
-x_11 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go(x_1, x_9, x_10, x_2, x_3, x_4, x_5, x_6, x_7);
-return x_11;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_normalizePattern(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-return x_9;
-}
-}
 LEAN_EXPORT uint8_t l_Std_DTreeMap_Internal_Impl_contains___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkTypeFVars_spec__0___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -22091,7 +24413,7 @@ else
 {
 lean_object* x_23; size_t x_24; size_t x_25; 
 lean_free_object(x_15);
-x_23 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1___closed__0));
+x_23 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0));
 x_24 = 1;
 x_25 = lean_usize_add(x_5, x_24);
 x_5 = x_25;
@@ -22127,7 +24449,7 @@ return x_33;
 else
 {
 lean_object* x_34; size_t x_35; size_t x_36; 
-x_34 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1___closed__0));
+x_34 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0));
 x_35 = 1;
 x_36 = lean_usize_add(x_5, x_35);
 x_5 = x_36;
@@ -22202,7 +24524,7 @@ else
 lean_object* x_19; lean_object* x_20; size_t x_21; size_t x_22; lean_object* x_23; 
 lean_dec(x_7);
 x_19 = lean_box(0);
-x_20 = ((lean_object*)(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_canBeSynthesized_spec__1___closed__0));
+x_20 = ((lean_object*)(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__0));
 x_21 = lean_array_size(x_3);
 x_22 = 0;
 lean_inc(x_11);
@@ -24276,7 +26598,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 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkCoverage___lam__0___closed__1));
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(769u);
+x_3 = lean_unsigned_to_nat(916u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_checkCoverage___lam__0___closed__0));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -25588,7 +27910,7 @@ return x_4;
 LEAN_EXPORT lean_object* l_Lean_logAt___at___00Lean_log___at___00Lean_logInfo___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_logPatternWhen_spec__2_spec__2_spec__3(lean_object* x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_50; lean_object* x_51; uint8_t x_52; uint8_t x_53; uint8_t x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_77; uint8_t x_78; lean_object* x_79; uint8_t x_80; uint8_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_88; lean_object* x_89; uint8_t x_90; uint8_t x_91; lean_object* x_92; lean_object* x_93; uint8_t x_94; uint8_t x_100; lean_object* x_101; uint8_t x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; uint8_t x_106; uint8_t x_107; uint8_t x_109; uint8_t x_125; 
+lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_50; uint8_t x_51; lean_object* x_52; lean_object* x_53; uint8_t x_54; lean_object* x_55; uint8_t x_56; lean_object* x_57; lean_object* x_77; uint8_t x_78; lean_object* x_79; uint8_t x_80; lean_object* x_81; uint8_t x_82; lean_object* x_83; lean_object* x_84; lean_object* x_88; uint8_t x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; lean_object* x_93; uint8_t x_94; uint8_t x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; uint8_t x_104; lean_object* x_105; uint8_t x_106; uint8_t x_107; uint8_t x_109; uint8_t x_125; 
 x_100 = 2;
 x_125 = l_Lean_instBEqMessageSeverity_beq(x_3, x_100);
 if (x_125 == 0)
@@ -25623,15 +27945,15 @@ lean_ctor_set(x_25, 0, x_21);
 lean_ctor_set(x_25, 1, x_22);
 x_26 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_13);
+lean_ctor_set(x_26, 1, x_12);
 x_27 = lean_alloc_ctor(0, 5, 3);
-lean_ctor_set(x_27, 0, x_16);
-lean_ctor_set(x_27, 1, x_12);
+lean_ctor_set(x_27, 0, x_15);
+lean_ctor_set(x_27, 1, x_14);
 lean_ctor_set(x_27, 2, x_10);
-lean_ctor_set(x_27, 3, x_15);
+lean_ctor_set(x_27, 3, x_13);
 lean_ctor_set(x_27, 4, x_26);
-lean_ctor_set_uint8(x_27, sizeof(void*)*5, x_14);
-lean_ctor_set_uint8(x_27, sizeof(void*)*5 + 1, x_11);
+lean_ctor_set_uint8(x_27, sizeof(void*)*5, x_11);
+lean_ctor_set_uint8(x_27, sizeof(void*)*5 + 1, x_16);
 lean_ctor_set_uint8(x_27, sizeof(void*)*5 + 2, x_4);
 x_28 = l_Lean_MessageLog_add(x_27, x_24);
 lean_ctor_set(x_20, 6, x_28);
@@ -25668,15 +27990,15 @@ lean_ctor_set(x_41, 0, x_21);
 lean_ctor_set(x_41, 1, x_22);
 x_42 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_13);
+lean_ctor_set(x_42, 1, x_12);
 x_43 = lean_alloc_ctor(0, 5, 3);
-lean_ctor_set(x_43, 0, x_16);
-lean_ctor_set(x_43, 1, x_12);
+lean_ctor_set(x_43, 0, x_15);
+lean_ctor_set(x_43, 1, x_14);
 lean_ctor_set(x_43, 2, x_10);
-lean_ctor_set(x_43, 3, x_15);
+lean_ctor_set(x_43, 3, x_13);
 lean_ctor_set(x_43, 4, x_42);
-lean_ctor_set_uint8(x_43, sizeof(void*)*5, x_14);
-lean_ctor_set_uint8(x_43, sizeof(void*)*5 + 1, x_11);
+lean_ctor_set_uint8(x_43, sizeof(void*)*5, x_11);
+lean_ctor_set_uint8(x_43, sizeof(void*)*5 + 1, x_16);
 lean_ctor_set_uint8(x_43, sizeof(void*)*5 + 2, x_4);
 x_44 = l_Lean_MessageLog_add(x_43, x_38);
 x_45 = lean_alloc_ctor(0, 9, 0);
@@ -25707,23 +28029,23 @@ if (x_60 == 0)
 lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
 x_61 = lean_ctor_get(x_59, 0);
 lean_inc_ref(x_55);
-x_62 = l_Lean_FileMap_toPosition(x_55, x_51);
-lean_dec(x_51);
+x_62 = l_Lean_FileMap_toPosition(x_55, x_53);
+lean_dec(x_53);
 x_63 = l_Lean_FileMap_toPosition(x_55, x_57);
 lean_dec(x_57);
 x_64 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_64, 0, x_63);
 x_65 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6___closed__1));
-if (x_52 == 0)
+if (x_54 == 0)
 {
 lean_free_object(x_59);
 lean_dec_ref(x_50);
 x_10 = x_64;
-x_11 = x_53;
-x_12 = x_62;
-x_13 = x_61;
-x_14 = x_54;
-x_15 = x_65;
+x_11 = x_51;
+x_12 = x_61;
+x_13 = x_65;
+x_14 = x_62;
+x_15 = x_52;
 x_16 = x_56;
 x_17 = x_7;
 x_18 = x_8;
@@ -25741,7 +28063,7 @@ lean_object* x_67;
 lean_dec_ref(x_64);
 lean_dec_ref(x_62);
 lean_dec(x_61);
-lean_dec_ref(x_56);
+lean_dec_ref(x_52);
 lean_dec_ref(x_7);
 x_67 = lean_box(0);
 lean_ctor_set(x_59, 0, x_67);
@@ -25751,11 +28073,11 @@ else
 {
 lean_free_object(x_59);
 x_10 = x_64;
-x_11 = x_53;
-x_12 = x_62;
-x_13 = x_61;
-x_14 = x_54;
-x_15 = x_65;
+x_11 = x_51;
+x_12 = x_61;
+x_13 = x_65;
+x_14 = x_62;
+x_15 = x_52;
 x_16 = x_56;
 x_17 = x_7;
 x_18 = x_8;
@@ -25771,22 +28093,22 @@ x_68 = lean_ctor_get(x_59, 0);
 lean_inc(x_68);
 lean_dec(x_59);
 lean_inc_ref(x_55);
-x_69 = l_Lean_FileMap_toPosition(x_55, x_51);
-lean_dec(x_51);
+x_69 = l_Lean_FileMap_toPosition(x_55, x_53);
+lean_dec(x_53);
 x_70 = l_Lean_FileMap_toPosition(x_55, x_57);
 lean_dec(x_57);
 x_71 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_71, 0, x_70);
 x_72 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6___closed__1));
-if (x_52 == 0)
+if (x_54 == 0)
 {
 lean_dec_ref(x_50);
 x_10 = x_71;
-x_11 = x_53;
-x_12 = x_69;
-x_13 = x_68;
-x_14 = x_54;
-x_15 = x_72;
+x_11 = x_51;
+x_12 = x_68;
+x_13 = x_72;
+x_14 = x_69;
+x_15 = x_52;
 x_16 = x_56;
 x_17 = x_7;
 x_18 = x_8;
@@ -25804,7 +28126,7 @@ lean_object* x_74; lean_object* x_75;
 lean_dec_ref(x_71);
 lean_dec_ref(x_69);
 lean_dec(x_68);
-lean_dec_ref(x_56);
+lean_dec_ref(x_52);
 lean_dec_ref(x_7);
 x_74 = lean_box(0);
 x_75 = lean_alloc_ctor(0, 1, 0);
@@ -25814,11 +28136,11 @@ return x_75;
 else
 {
 x_10 = x_71;
-x_11 = x_53;
-x_12 = x_69;
-x_13 = x_68;
-x_14 = x_54;
-x_15 = x_72;
+x_11 = x_51;
+x_12 = x_68;
+x_13 = x_72;
+x_14 = x_69;
+x_15 = x_52;
 x_16 = x_56;
 x_17 = x_7;
 x_18 = x_8;
@@ -25831,18 +28153,18 @@ goto block_49;
 block_87:
 {
 lean_object* x_85; 
-x_85 = l_Lean_Syntax_getTailPos_x3f(x_79, x_81);
-lean_dec(x_79);
+x_85 = l_Lean_Syntax_getTailPos_x3f(x_83, x_78);
+lean_dec(x_83);
 if (lean_obj_tag(x_85) == 0)
 {
 lean_inc(x_84);
 x_50 = x_77;
-x_51 = x_84;
-x_52 = x_78;
-x_53 = x_80;
-x_54 = x_81;
-x_55 = x_82;
-x_56 = x_83;
+x_51 = x_78;
+x_52 = x_79;
+x_53 = x_84;
+x_54 = x_80;
+x_55 = x_81;
+x_56 = x_82;
 x_57 = x_84;
 goto block_76;
 }
@@ -25853,12 +28175,12 @@ x_86 = lean_ctor_get(x_85, 0);
 lean_inc(x_86);
 lean_dec_ref(x_85);
 x_50 = x_77;
-x_51 = x_84;
-x_52 = x_78;
-x_53 = x_80;
-x_54 = x_81;
-x_55 = x_82;
-x_56 = x_83;
+x_51 = x_78;
+x_52 = x_79;
+x_53 = x_84;
+x_54 = x_80;
+x_55 = x_81;
+x_56 = x_82;
 x_57 = x_86;
 goto block_76;
 }
@@ -25866,20 +28188,20 @@ goto block_76;
 block_99:
 {
 lean_object* x_95; lean_object* x_96; 
-x_95 = l_Lean_replaceRef(x_1, x_89);
-lean_dec(x_89);
-x_96 = l_Lean_Syntax_getPos_x3f(x_95, x_91);
+x_95 = l_Lean_replaceRef(x_1, x_90);
+lean_dec(x_90);
+x_96 = l_Lean_Syntax_getPos_x3f(x_95, x_89);
 if (lean_obj_tag(x_96) == 0)
 {
 lean_object* x_97; 
 x_97 = lean_unsigned_to_nat(0u);
 x_77 = x_88;
-x_78 = x_90;
-x_79 = x_95;
-x_80 = x_94;
-x_81 = x_91;
-x_82 = x_92;
-x_83 = x_93;
+x_78 = x_89;
+x_79 = x_91;
+x_80 = x_92;
+x_81 = x_93;
+x_82 = x_94;
+x_83 = x_95;
 x_84 = x_97;
 goto block_87;
 }
@@ -25890,12 +28212,12 @@ x_98 = lean_ctor_get(x_96, 0);
 lean_inc(x_98);
 lean_dec_ref(x_96);
 x_77 = x_88;
-x_78 = x_90;
-x_79 = x_95;
-x_80 = x_94;
-x_81 = x_91;
-x_82 = x_92;
-x_83 = x_93;
+x_78 = x_89;
+x_79 = x_91;
+x_80 = x_92;
+x_81 = x_93;
+x_82 = x_94;
+x_83 = x_95;
 x_84 = x_98;
 goto block_87;
 }
@@ -25904,10 +28226,10 @@ block_108:
 {
 if (x_107 == 0)
 {
-x_88 = x_103;
-x_89 = x_101;
+x_88 = x_101;
+x_89 = x_106;
 x_90 = x_102;
-x_91 = x_106;
+x_91 = x_103;
 x_92 = x_104;
 x_93 = x_105;
 x_94 = x_3;
@@ -25915,10 +28237,10 @@ goto block_99;
 }
 else
 {
-x_88 = x_103;
-x_89 = x_101;
+x_88 = x_101;
+x_89 = x_106;
 x_90 = x_102;
-x_91 = x_106;
+x_91 = x_103;
 x_92 = x_104;
 x_93 = x_105;
 x_94 = x_100;
@@ -25944,14 +28266,14 @@ x_118 = 1;
 x_119 = l_Lean_instBEqMessageSeverity_beq(x_3, x_118);
 if (x_119 == 0)
 {
-lean_inc_ref(x_110);
 lean_inc_ref(x_111);
+lean_inc_ref(x_110);
 lean_inc(x_113);
-x_101 = x_113;
-x_102 = x_114;
-x_103 = x_117;
-x_104 = x_111;
-x_105 = x_110;
+x_101 = x_117;
+x_102 = x_113;
+x_103 = x_110;
+x_104 = x_114;
+x_105 = x_111;
 x_106 = x_109;
 x_107 = x_119;
 goto block_108;
@@ -25961,14 +28283,14 @@ else
 lean_object* x_120; uint8_t x_121; 
 x_120 = l_Lean_warningAsError;
 x_121 = l_Lean_Option_get___at___00Lean_logAt___at___00Lean_log___at___00Lean_logInfo___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_logPatternWhen_spec__2_spec__2_spec__3_spec__4(x_112, x_120);
-lean_inc_ref(x_110);
 lean_inc_ref(x_111);
+lean_inc_ref(x_110);
 lean_inc(x_113);
-x_101 = x_113;
-x_102 = x_114;
-x_103 = x_117;
-x_104 = x_111;
-x_105 = x_110;
+x_101 = x_117;
+x_102 = x_113;
+x_103 = x_110;
+x_104 = x_114;
+x_105 = x_111;
 x_106 = x_109;
 x_107 = x_121;
 goto block_108;
@@ -26978,11 +29300,11 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3() {
+static lean_object* _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2));
+x_1 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__4));
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
@@ -27005,20 +29327,11 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11() {
+static lean_object* _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__15() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__14));
+x_1 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
@@ -27180,7 +29493,7 @@ goto block_98;
 block_112:
 {
 lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; 
-x_105 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__15;
+x_105 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13;
 x_106 = l_Lean_indentExpr(x_5);
 x_107 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_107, 0, x_105);
@@ -27300,7 +29613,7 @@ x_35 = l_Lean_MessageData_ofExpr(x_27);
 x_36 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_36, 0, x_34);
 lean_ctor_set(x_36, 1, x_35);
-x_37 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3;
+x_37 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3;
 x_38 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_38, 0, x_36);
 lean_ctor_set(x_38, 1, x_37);
@@ -27402,28 +29715,28 @@ x_62 = l_Lean_MessageData_ofFormat(x_61);
 x_63 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_63, 0, x_59);
 lean_ctor_set(x_63, 1, x_62);
-lean_inc(x_54);
-x_64 = l_Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6(x_54, x_63, x_56, x_58, x_55, x_57);
+lean_inc(x_57);
+x_64 = l_Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6(x_57, x_63, x_56, x_53, x_58, x_55);
 if (lean_obj_tag(x_64) == 0)
 {
 lean_dec_ref(x_64);
 x_19 = x_52;
-x_20 = x_54;
+x_20 = x_57;
 x_21 = x_56;
-x_22 = x_58;
-x_23 = x_55;
-x_24 = x_57;
+x_22 = x_53;
+x_23 = x_58;
+x_24 = x_55;
 x_25 = lean_box(0);
 goto block_51;
 }
 else
 {
 uint8_t x_65; 
-lean_dec(x_58);
+lean_dec_ref(x_58);
 lean_dec(x_57);
 lean_dec_ref(x_56);
-lean_dec_ref(x_55);
-lean_dec(x_54);
+lean_dec(x_55);
+lean_dec(x_53);
 lean_dec_ref(x_52);
 x_65 = !lean_is_exclusive(x_64);
 if (x_65 == 0)
@@ -27445,8 +29758,8 @@ return x_67;
 block_90:
 {
 lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; 
-x_75 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
-x_76 = l_Lean_isTracingEnabledFor___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__5___redArg(x_75, x_69);
+x_75 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
+x_76 = l_Lean_isTracingEnabledFor___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__5___redArg(x_75, x_72);
 x_77 = lean_ctor_get(x_76, 0);
 lean_inc(x_77);
 lean_dec_ref(x_76);
@@ -27457,22 +29770,22 @@ if (x_78 == 0)
 lean_dec_ref(x_2);
 x_19 = x_74;
 x_20 = x_75;
-x_21 = x_70;
-x_22 = x_72;
-x_23 = x_69;
-x_24 = x_71;
+x_21 = x_71;
+x_22 = x_69;
+x_23 = x_72;
+x_24 = x_70;
 x_25 = lean_box(0);
 goto block_51;
 }
 else
 {
 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_79 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__7;
+x_79 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5;
 x_80 = l_Lean_Meta_Grind_Origin_pp(x_2);
 x_81 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_81, 0, x_79);
 lean_ctor_set(x_81, 1, x_80);
-x_82 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__9;
+x_82 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__7;
 x_83 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_83, 0, x_81);
 lean_ctor_set(x_83, 1, x_82);
@@ -27481,20 +29794,20 @@ x_84 = l_Lean_MessageData_ofExpr(x_74);
 x_85 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_85, 0, x_83);
 lean_ctor_set(x_85, 1, x_84);
-x_86 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11;
+x_86 = l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__9;
 x_87 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_87, 0, x_85);
 lean_ctor_set(x_87, 1, x_86);
 if (x_3 == 0)
 {
 lean_object* x_88; 
-x_88 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_88 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_52 = x_74;
-x_53 = lean_box(0);
-x_54 = x_75;
-x_55 = x_69;
-x_56 = x_70;
-x_57 = x_71;
+x_53 = x_69;
+x_54 = lean_box(0);
+x_55 = x_70;
+x_56 = x_71;
+x_57 = x_75;
 x_58 = x_72;
 x_59 = x_87;
 x_60 = x_88;
@@ -27503,13 +29816,13 @@ goto block_68;
 else
 {
 lean_object* x_89; 
-x_89 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_89 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_52 = x_74;
-x_53 = lean_box(0);
-x_54 = x_75;
-x_55 = x_69;
-x_56 = x_70;
-x_57 = x_71;
+x_53 = x_69;
+x_54 = lean_box(0);
+x_55 = x_70;
+x_56 = x_71;
+x_57 = x_75;
 x_58 = x_72;
 x_59 = x_87;
 x_60 = x_89;
@@ -27522,10 +29835,10 @@ block_98:
 if (x_3 == 0)
 {
 lean_dec_ref(x_91);
-x_69 = x_95;
-x_70 = x_93;
-x_71 = x_96;
-x_72 = x_94;
+x_69 = x_94;
+x_70 = x_96;
+x_71 = x_93;
+x_72 = x_95;
 x_73 = lean_box(0);
 x_74 = x_92;
 goto block_90;
@@ -27533,10 +29846,10 @@ goto block_90;
 else
 {
 lean_dec_ref(x_92);
-x_69 = x_95;
-x_70 = x_93;
-x_71 = x_96;
-x_72 = x_94;
+x_69 = x_94;
+x_70 = x_96;
+x_71 = x_93;
+x_72 = x_95;
 x_73 = lean_box(0);
 x_74 = x_91;
 goto block_90;
@@ -29180,7 +31493,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lea
 _start:
 {
 uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_55; lean_object* x_56; uint8_t x_57; 
-x_28 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_28 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_55 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_28, x_8);
 x_56 = lean_ctor_get(x_55, 0);
 lean_inc(x_56);
@@ -30566,7 +32879,7 @@ switch (lean_obj_tag(x_1)) {
 case 5:
 {
 lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; uint8_t x_89; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_176; 
-x_75 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_75 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_176 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_75, x_8);
 if (lean_obj_tag(x_176) == 0)
 {
@@ -30661,7 +32974,7 @@ block_106:
 if (x_89 == 0)
 {
 lean_object* x_90; 
-x_90 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_75, x_87);
+x_90 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_75, x_85);
 if (lean_obj_tag(x_90) == 0)
 {
 lean_object* x_91; uint8_t x_92; 
@@ -30673,27 +32986,27 @@ lean_dec(x_91);
 if (x_92 == 0)
 {
 lean_object* x_93; lean_object* x_94; 
-lean_dec_ref(x_78);
+lean_dec_ref(x_88);
 x_93 = lean_box(0);
-lean_inc(x_79);
-lean_inc_ref(x_87);
+lean_inc(x_78);
+lean_inc_ref(x_85);
+lean_inc(x_82);
+lean_inc_ref(x_77);
+lean_inc(x_84);
+lean_inc_ref(x_76);
 lean_inc(x_80);
-lean_inc_ref(x_81);
-lean_inc(x_76);
-lean_inc_ref(x_84);
-lean_inc(x_83);
-lean_inc_ref(x_86);
-x_94 = lean_apply_10(x_82, x_93, x_86, x_83, x_84, x_76, x_81, x_80, x_87, x_79, lean_box(0));
+lean_inc_ref(x_83);
+x_94 = lean_apply_10(x_79, x_93, x_83, x_80, x_76, x_84, x_77, x_82, x_85, x_78, lean_box(0));
 x_57 = x_76;
 x_58 = x_77;
 x_59 = x_83;
-x_60 = x_79;
-x_61 = x_84;
+x_60 = x_84;
+x_61 = x_78;
 x_62 = x_85;
-x_63 = x_86;
+x_63 = x_87;
 x_64 = x_80;
 x_65 = x_81;
-x_66 = x_87;
+x_66 = x_82;
 x_67 = x_94;
 goto block_72;
 }
@@ -30701,53 +33014,53 @@ else
 {
 lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
 x_95 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_OldCollector_collect___closed__1;
-x_96 = l_Lean_Exception_toMessageData(x_78);
+x_96 = l_Lean_Exception_toMessageData(x_88);
 x_97 = l_Lean_indentD(x_96);
 x_98 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_98, 0, x_95);
 lean_ctor_set(x_98, 1, x_97);
-x_99 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__1___redArg(x_75, x_98, x_81, x_80, x_87, x_79);
+x_99 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__1___redArg(x_75, x_98, x_77, x_82, x_85, x_78);
 if (lean_obj_tag(x_99) == 0)
 {
 lean_object* x_100; lean_object* x_101; 
 x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
 lean_dec_ref(x_99);
-lean_inc(x_79);
-lean_inc_ref(x_87);
+lean_inc(x_78);
+lean_inc_ref(x_85);
+lean_inc(x_82);
+lean_inc_ref(x_77);
+lean_inc(x_84);
+lean_inc_ref(x_76);
 lean_inc(x_80);
-lean_inc_ref(x_81);
-lean_inc(x_76);
-lean_inc_ref(x_84);
-lean_inc(x_83);
-lean_inc_ref(x_86);
-x_101 = lean_apply_10(x_82, x_100, x_86, x_83, x_84, x_76, x_81, x_80, x_87, x_79, lean_box(0));
+lean_inc_ref(x_83);
+x_101 = lean_apply_10(x_79, x_100, x_83, x_80, x_76, x_84, x_77, x_82, x_85, x_78, lean_box(0));
 x_57 = x_76;
 x_58 = x_77;
 x_59 = x_83;
-x_60 = x_79;
-x_61 = x_84;
+x_60 = x_84;
+x_61 = x_78;
 x_62 = x_85;
-x_63 = x_86;
+x_63 = x_87;
 x_64 = x_80;
 x_65 = x_81;
-x_66 = x_87;
+x_66 = x_82;
 x_67 = x_101;
 goto block_72;
 }
 else
 {
-lean_dec_ref(x_87);
-lean_dec_ref(x_86);
+lean_dec(x_87);
 lean_dec_ref(x_85);
-lean_dec_ref(x_84);
-lean_dec(x_83);
-lean_dec_ref(x_82);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec(x_82);
 lean_dec_ref(x_81);
 lean_dec(x_80);
-lean_dec(x_79);
-lean_dec(x_77);
-lean_dec(x_76);
+lean_dec_ref(x_79);
+lean_dec(x_78);
+lean_dec_ref(x_77);
+lean_dec_ref(x_76);
 lean_dec_ref(x_1);
 return x_99;
 }
@@ -30756,18 +33069,18 @@ return x_99;
 else
 {
 uint8_t x_102; 
-lean_dec_ref(x_87);
-lean_dec_ref(x_86);
+lean_dec_ref(x_88);
+lean_dec(x_87);
 lean_dec_ref(x_85);
-lean_dec_ref(x_84);
-lean_dec(x_83);
-lean_dec_ref(x_82);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec(x_82);
 lean_dec_ref(x_81);
 lean_dec(x_80);
-lean_dec(x_79);
-lean_dec_ref(x_78);
-lean_dec(x_77);
-lean_dec(x_76);
+lean_dec_ref(x_79);
+lean_dec(x_78);
+lean_dec_ref(x_77);
+lean_dec_ref(x_76);
 lean_dec_ref(x_1);
 x_102 = !lean_is_exclusive(x_90);
 if (x_102 == 0)
@@ -30789,20 +33102,20 @@ return x_104;
 else
 {
 lean_object* x_105; 
-lean_dec_ref(x_87);
-lean_dec_ref(x_86);
+lean_dec(x_87);
 lean_dec_ref(x_85);
-lean_dec_ref(x_84);
-lean_dec(x_83);
-lean_dec_ref(x_82);
+lean_dec(x_84);
+lean_dec_ref(x_83);
+lean_dec(x_82);
 lean_dec_ref(x_81);
 lean_dec(x_80);
-lean_dec(x_79);
-lean_dec(x_77);
-lean_dec(x_76);
+lean_dec_ref(x_79);
+lean_dec(x_78);
+lean_dec_ref(x_77);
+lean_dec_ref(x_76);
 lean_dec_ref(x_1);
 x_105 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_105, 0, x_78);
+lean_ctor_set(x_105, 0, x_88);
 return x_105;
 }
 }
@@ -30817,17 +33130,17 @@ lean_inc_ref(x_118);
 x_121 = l_Lean_Exception_isRuntime(x_118);
 x_76 = x_107;
 x_77 = x_108;
-x_78 = x_118;
-x_79 = x_110;
-x_80 = x_114;
-x_81 = x_116;
+x_78 = x_111;
+x_79 = x_113;
+x_80 = x_116;
+x_81 = x_115;
 x_82 = x_117;
 x_83 = x_109;
-x_84 = x_112;
-x_85 = x_111;
-x_86 = x_113;
-x_87 = x_115;
-x_88 = lean_box(0);
+x_84 = x_110;
+x_85 = x_112;
+x_86 = lean_box(0);
+x_87 = x_114;
+x_88 = x_118;
 x_89 = x_121;
 goto block_106;
 }
@@ -30835,17 +33148,17 @@ else
 {
 x_76 = x_107;
 x_77 = x_108;
-x_78 = x_118;
-x_79 = x_110;
-x_80 = x_114;
-x_81 = x_116;
+x_78 = x_111;
+x_79 = x_113;
+x_80 = x_116;
+x_81 = x_115;
 x_82 = x_117;
 x_83 = x_109;
-x_84 = x_112;
-x_85 = x_111;
-x_86 = x_113;
-x_87 = x_115;
-x_88 = lean_box(0);
+x_84 = x_110;
+x_85 = x_112;
+x_86 = lean_box(0);
+x_87 = x_114;
+x_88 = x_118;
 x_89 = x_120;
 goto block_106;
 }
@@ -30855,20 +33168,20 @@ block_137:
 if (lean_obj_tag(x_134) == 0)
 {
 lean_object* x_135; 
-lean_dec_ref(x_133);
+lean_dec_ref(x_129);
 x_135 = lean_ctor_get(x_134, 0);
 lean_inc(x_135);
 lean_dec_ref(x_134);
 x_42 = x_123;
 x_43 = x_124;
-x_44 = x_126;
-x_45 = x_125;
-x_46 = x_128;
-x_47 = x_127;
+x_44 = x_125;
+x_45 = x_126;
+x_46 = x_127;
+x_47 = x_128;
 x_48 = x_130;
-x_49 = x_129;
-x_50 = x_132;
-x_51 = x_131;
+x_49 = x_132;
+x_50 = x_131;
+x_51 = x_133;
 x_52 = x_135;
 x_53 = lean_box(0);
 goto block_56;
@@ -30883,8 +33196,8 @@ x_107 = x_123;
 x_108 = x_124;
 x_109 = x_125;
 x_110 = x_126;
-x_111 = x_128;
-x_112 = x_127;
+x_111 = x_127;
+x_112 = x_128;
 x_113 = x_129;
 x_114 = x_130;
 x_115 = x_132;
@@ -30968,17 +33281,17 @@ lean_inc_ref(x_140);
 lean_inc_ref(x_138);
 lean_inc(x_150);
 x_160 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_OldCollector_collect___lam__1(x_1, x_75, x_154, x_150, x_159, x_138, x_139, x_140, x_141, x_142, x_143, x_144, x_145);
-x_123 = x_141;
-x_124 = x_148;
-x_125 = x_139;
-x_126 = x_145;
-x_127 = x_140;
-x_128 = x_150;
-x_129 = x_138;
-x_130 = x_143;
-x_131 = x_142;
-x_132 = x_144;
-x_133 = x_155;
+x_123 = x_140;
+x_124 = x_142;
+x_125 = x_138;
+x_126 = x_141;
+x_127 = x_145;
+x_128 = x_144;
+x_129 = x_155;
+x_130 = x_148;
+x_131 = x_139;
+x_132 = x_150;
+x_133 = x_143;
 x_134 = x_160;
 goto block_137;
 }
@@ -31007,17 +33320,17 @@ lean_inc_ref(x_140);
 lean_inc_ref(x_138);
 lean_inc(x_150);
 x_166 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_OldCollector_collect___lam__1(x_1, x_75, x_154, x_150, x_165, x_138, x_139, x_140, x_141, x_142, x_143, x_144, x_145);
-x_123 = x_141;
-x_124 = x_148;
-x_125 = x_139;
-x_126 = x_145;
-x_127 = x_140;
-x_128 = x_150;
-x_129 = x_138;
-x_130 = x_143;
-x_131 = x_142;
-x_132 = x_144;
-x_133 = x_155;
+x_123 = x_140;
+x_124 = x_142;
+x_125 = x_138;
+x_126 = x_141;
+x_127 = x_145;
+x_128 = x_144;
+x_129 = x_155;
+x_130 = x_148;
+x_131 = x_139;
+x_132 = x_150;
+x_133 = x_143;
 x_134 = x_166;
 goto block_137;
 }
@@ -31028,17 +33341,17 @@ lean_dec(x_154);
 x_167 = lean_ctor_get(x_164, 0);
 lean_inc(x_167);
 lean_dec_ref(x_164);
-x_107 = x_141;
-x_108 = x_148;
-x_109 = x_139;
-x_110 = x_145;
-x_111 = x_150;
-x_112 = x_140;
-x_113 = x_138;
-x_114 = x_143;
-x_115 = x_144;
-x_116 = x_142;
-x_117 = x_155;
+x_107 = x_140;
+x_108 = x_142;
+x_109 = x_138;
+x_110 = x_141;
+x_111 = x_145;
+x_112 = x_144;
+x_113 = x_155;
+x_114 = x_148;
+x_115 = x_150;
+x_116 = x_139;
+x_117 = x_143;
 x_118 = x_167;
 x_119 = lean_box(0);
 goto block_122;
@@ -31052,17 +33365,17 @@ lean_dec(x_154);
 x_168 = lean_ctor_get(x_156, 0);
 lean_inc(x_168);
 lean_dec_ref(x_156);
-x_107 = x_141;
-x_108 = x_148;
-x_109 = x_139;
-x_110 = x_145;
-x_111 = x_150;
-x_112 = x_140;
-x_113 = x_138;
-x_114 = x_143;
-x_115 = x_144;
-x_116 = x_142;
-x_117 = x_155;
+x_107 = x_140;
+x_108 = x_142;
+x_109 = x_138;
+x_110 = x_141;
+x_111 = x_145;
+x_112 = x_144;
+x_113 = x_155;
+x_114 = x_148;
+x_115 = x_150;
+x_116 = x_139;
+x_117 = x_143;
 x_118 = x_168;
 x_119 = lean_box(0);
 goto block_122;
@@ -31387,32 +33700,32 @@ block_56:
 if (lean_obj_tag(x_52) == 0)
 {
 lean_dec_ref(x_52);
-x_11 = x_43;
-x_12 = x_46;
-x_13 = x_49;
-x_14 = x_45;
-x_15 = x_47;
-x_16 = x_42;
-x_17 = x_51;
-x_18 = x_48;
-x_19 = x_50;
-x_20 = x_44;
+x_11 = x_48;
+x_12 = x_49;
+x_13 = x_44;
+x_14 = x_50;
+x_15 = x_42;
+x_16 = x_45;
+x_17 = x_43;
+x_18 = x_51;
+x_19 = x_47;
+x_20 = x_46;
 x_21 = lean_box(0);
 goto block_41;
 }
 else
 {
 lean_object* x_54; lean_object* x_55; 
-lean_dec_ref(x_51);
-lean_dec_ref(x_50);
+lean_dec(x_51);
+lean_dec(x_50);
 lean_dec_ref(x_49);
 lean_dec(x_48);
 lean_dec_ref(x_47);
-lean_dec_ref(x_46);
+lean_dec(x_46);
 lean_dec(x_45);
-lean_dec(x_44);
-lean_dec(x_43);
-lean_dec(x_42);
+lean_dec_ref(x_44);
+lean_dec_ref(x_43);
+lean_dec_ref(x_42);
 lean_dec_ref(x_1);
 x_54 = lean_ctor_get(x_52, 0);
 lean_inc(x_54);
@@ -31432,14 +33745,14 @@ lean_inc(x_68);
 lean_dec_ref(x_67);
 x_42 = x_57;
 x_43 = x_58;
-x_44 = x_60;
-x_45 = x_59;
-x_46 = x_62;
-x_47 = x_61;
-x_48 = x_64;
-x_49 = x_63;
-x_50 = x_66;
-x_51 = x_65;
+x_44 = x_59;
+x_45 = x_60;
+x_46 = x_61;
+x_47 = x_62;
+x_48 = x_63;
+x_49 = x_65;
+x_50 = x_64;
+x_51 = x_66;
 x_52 = x_68;
 x_53 = lean_box(0);
 goto block_56;
@@ -31447,16 +33760,16 @@ goto block_56;
 else
 {
 uint8_t x_69; 
-lean_dec_ref(x_66);
+lean_dec(x_66);
 lean_dec_ref(x_65);
 lean_dec(x_64);
-lean_dec_ref(x_63);
+lean_dec(x_63);
 lean_dec_ref(x_62);
-lean_dec_ref(x_61);
+lean_dec(x_61);
 lean_dec(x_60);
-lean_dec(x_59);
-lean_dec(x_58);
-lean_dec(x_57);
+lean_dec_ref(x_59);
+lean_dec_ref(x_58);
+lean_dec_ref(x_57);
 lean_dec_ref(x_1);
 x_69 = !lean_is_exclusive(x_67);
 if (x_69 == 0)
@@ -31535,7 +33848,7 @@ x_29 = lean_ctor_get(x_4, 1);
 lean_dec(x_29);
 x_30 = lean_ctor_get(x_4, 0);
 lean_dec(x_30);
-x_31 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_31 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_32 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_31, x_11);
 if (lean_obj_tag(x_32) == 0)
 {
@@ -31590,14 +33903,14 @@ x_70 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_69);
 if (x_70 == 0)
 {
 lean_object* x_71; 
-x_71 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_71 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_60 = x_71;
 goto block_68;
 }
 else
 {
 lean_object* x_72; 
-x_72 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_72 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_60 = x_72;
 goto block_68;
 }
@@ -31764,7 +34077,7 @@ else
 {
 lean_object* x_76; lean_object* x_77; 
 lean_dec(x_4);
-x_76 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_76 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_77 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_76, x_11);
 if (lean_obj_tag(x_77) == 0)
 {
@@ -31822,14 +34135,14 @@ x_116 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_115);
 if (x_116 == 0)
 {
 lean_object* x_117; 
-x_117 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_117 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_106 = x_117;
 goto block_114;
 }
 else
 {
 lean_object* x_118; 
-x_118 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_118 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_106 = x_118;
 goto block_114;
 }
@@ -32628,7 +34941,7 @@ else
 {
 lean_object* x_68; lean_object* x_69; 
 lean_dec_ref(x_8);
-x_68 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_68 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_69 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_68, x_12);
 if (lean_obj_tag(x_69) == 0)
 {
@@ -32941,7 +35254,7 @@ else
 {
 lean_object* x_121; lean_object* x_122; 
 lean_dec_ref(x_8);
-x_121 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_121 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_122 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_121, x_12);
 if (lean_obj_tag(x_122) == 0)
 {
@@ -33353,7 +35666,7 @@ else
 {
 lean_object* x_69; lean_object* x_70; 
 lean_dec_ref(x_9);
-x_69 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_69 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_70 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_69, x_13);
 if (lean_obj_tag(x_70) == 0)
 {
@@ -33666,7 +35979,7 @@ else
 {
 lean_object* x_122; lean_object* x_123; 
 lean_dec_ref(x_9);
-x_122 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_122 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_123 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_122, x_13);
 if (lean_obj_tag(x_123) == 0)
 {
@@ -33932,7 +36245,7 @@ lean_dec(x_5);
 lean_dec_ref(x_4);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_31 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_31 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_32 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_31, x_10);
 x_33 = lean_ctor_get(x_32, 0);
 lean_inc(x_33);
@@ -34161,7 +36474,7 @@ lean_dec(x_74);
 lean_dec(x_40);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_110 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_110 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_111 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_110, x_10);
 x_112 = lean_ctor_get(x_111, 0);
 lean_inc(x_112);
@@ -34240,7 +36553,7 @@ block_63:
 if (x_45 == 0)
 {
 lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
-x_46 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_46 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_47 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_46, x_10);
 x_48 = lean_ctor_get(x_47, 0);
 lean_inc(x_48);
@@ -34476,7 +36789,7 @@ switch (lean_obj_tag(x_2)) {
 case 5:
 {
 lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_103; 
-x_69 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_69 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_103 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_69, x_9);
 if (lean_obj_tag(x_103) == 0)
 {
@@ -34597,8 +36910,8 @@ x_85 = lean_unbox(x_84);
 lean_dec(x_84);
 if (x_85 == 0)
 {
-x_12 = x_82;
-x_13 = x_80;
+x_12 = x_80;
+x_13 = x_82;
 x_14 = x_70;
 x_15 = x_71;
 x_16 = x_72;
@@ -34624,8 +36937,8 @@ x_88 = lean_unbox(x_87);
 lean_dec(x_87);
 if (x_88 == 0)
 {
-x_43 = x_82;
-x_44 = x_80;
+x_43 = x_80;
+x_44 = x_82;
 x_45 = x_70;
 x_46 = x_71;
 x_47 = x_72;
@@ -34650,8 +36963,8 @@ x_92 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0
 if (lean_obj_tag(x_92) == 0)
 {
 lean_dec_ref(x_92);
-x_43 = x_82;
-x_44 = x_80;
+x_43 = x_80;
+x_44 = x_82;
 x_45 = x_70;
 x_46 = x_71;
 x_47 = x_72;
@@ -34969,15 +37282,15 @@ block_42:
 {
 lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; size_t x_31; size_t x_32; lean_object* x_33; 
 x_23 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___at___00Lean_Core_transform___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectOffsets_spec__0_spec__0___lam__1___closed__0;
-lean_inc(x_13);
-x_24 = lean_mk_array(x_13, x_23);
+lean_inc(x_12);
+x_24 = lean_mk_array(x_12, x_23);
 x_25 = lean_unsigned_to_nat(1u);
-x_26 = lean_nat_sub(x_13, x_25);
-lean_dec(x_13);
+x_26 = lean_nat_sub(x_12, x_25);
+lean_dec(x_12);
 x_27 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_2, x_24, x_26);
 x_28 = lean_unsigned_to_nat(0u);
-x_29 = lean_array_get_size(x_12);
-x_30 = l_Array_toSubarray___redArg(x_12, x_28, x_29);
+x_29 = lean_array_get_size(x_13);
+x_30 = l_Array_toSubarray___redArg(x_13, x_28, x_29);
 x_31 = lean_array_size(x_27);
 x_32 = 0;
 x_33 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collect_go_spec__0(x_1, x_27, x_31, x_32, x_30, x_14, x_15, x_16, x_17, x_18, x_19, x_20, x_21);
@@ -35036,9 +37349,9 @@ lean_inc(x_48);
 lean_inc_ref(x_47);
 lean_inc(x_46);
 lean_inc_ref(x_45);
-lean_inc_ref(x_43);
+lean_inc_ref(x_44);
 lean_inc_ref(x_2);
-x_54 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_normalizePattern_x3f(x_2, x_43, x_1, x_45, x_46, x_47, x_48, x_49, x_50, x_51, x_52);
+x_54 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_normalizePattern_x3f(x_2, x_44, x_1, x_45, x_46, x_47, x_48, x_49, x_50, x_51, x_52);
 if (lean_obj_tag(x_54) == 0)
 {
 lean_object* x_55; 
@@ -35048,8 +37361,8 @@ lean_dec_ref(x_54);
 if (lean_obj_tag(x_55) == 1)
 {
 lean_object* x_56; lean_object* x_57; 
-lean_dec(x_44);
-lean_dec_ref(x_43);
+lean_dec_ref(x_44);
+lean_dec(x_43);
 lean_dec_ref(x_2);
 x_56 = lean_ctor_get(x_55, 0);
 lean_inc(x_56);
@@ -35114,8 +37427,8 @@ lean_dec(x_48);
 lean_dec_ref(x_47);
 lean_dec(x_46);
 lean_dec_ref(x_45);
-lean_dec(x_44);
-lean_dec_ref(x_43);
+lean_dec_ref(x_44);
+lean_dec(x_43);
 lean_dec_ref(x_2);
 x_63 = !lean_is_exclusive(x_54);
 if (x_63 == 0)
@@ -35205,7 +37518,7 @@ x_52 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_32);
 if (lean_obj_tag(x_52) == 0)
 {
 lean_object* x_53; lean_object* x_54; 
-x_53 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_53 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_54 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_53, x_12);
 if (lean_obj_tag(x_54) == 0)
 {
@@ -35254,14 +37567,14 @@ x_72 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_71);
 if (x_72 == 0)
 {
 lean_object* x_73; 
-x_73 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_73 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_62 = x_73;
 goto block_70;
 }
 else
 {
 lean_object* x_74; 
-x_74 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_74 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_62 = x_74;
 goto block_70;
 }
@@ -35451,7 +37764,7 @@ x_99 = l_Lean_Meta_Grind_isOffsetPattern_x3f(x_78);
 if (lean_obj_tag(x_99) == 0)
 {
 lean_object* x_100; lean_object* x_101; 
-x_100 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_100 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_101 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_100, x_12);
 if (lean_obj_tag(x_101) == 0)
 {
@@ -35500,14 +37813,14 @@ x_119 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_118);
 if (x_119 == 0)
 {
 lean_object* x_120; 
-x_120 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_120 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_109 = x_120;
 goto block_117;
 }
 else
 {
 lean_object* x_121; 
-x_121 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_121 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_109 = x_121;
 goto block_117;
 }
@@ -35974,7 +38287,7 @@ else
 {
 lean_object* x_18; lean_object* x_19; 
 lean_dec_ref(x_6);
-x_18 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_18 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_19 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_addNewPattern_spec__0___redArg(x_18, x_13);
 if (lean_obj_tag(x_19) == 0)
 {
@@ -38565,12 +40878,12 @@ goto block_20;
 block_10:
 {
 uint8_t x_7; 
-lean_dec(x_3);
-x_7 = lean_nat_dec_le(x_6, x_5);
+lean_dec(x_5);
+x_7 = lean_nat_dec_le(x_6, x_3);
 if (x_7 == 0)
 {
 lean_object* x_8; 
-lean_dec(x_5);
+lean_dec(x_3);
 lean_inc(x_6);
 x_8 = l___private_Init_Data_Array_QSort_Basic_0__Array_qsort_sort___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectUsedPriorities_spec__0___redArg(x_4, x_6, x_6);
 lean_dec(x_6);
@@ -38579,8 +40892,8 @@ return x_8;
 else
 {
 lean_object* x_9; 
-x_9 = l___private_Init_Data_Array_QSort_Basic_0__Array_qsort_sort___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectUsedPriorities_spec__0___redArg(x_4, x_6, x_5);
-lean_dec(x_5);
+x_9 = l___private_Init_Data_Array_QSort_Basic_0__Array_qsort_sort___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectUsedPriorities_spec__0___redArg(x_4, x_6, x_3);
+lean_dec(x_3);
 return x_9;
 }
 }
@@ -38603,17 +40916,17 @@ x_18 = lean_nat_dec_le(x_14, x_17);
 if (x_18 == 0)
 {
 lean_inc(x_17);
-x_3 = x_13;
+x_3 = x_17;
 x_4 = x_11;
-x_5 = x_17;
+x_5 = x_13;
 x_6 = x_17;
 goto block_10;
 }
 else
 {
-x_3 = x_13;
+x_3 = x_17;
 x_4 = x_11;
-x_5 = x_17;
+x_5 = x_13;
 x_6 = x_14;
 goto block_10;
 }
@@ -39515,7 +41828,7 @@ switch (lean_obj_tag(x_1)) {
 case 5:
 {
 lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_73; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_207; 
-x_59 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_59 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_207 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__0___redArg(x_59, x_2, x_9);
 if (lean_obj_tag(x_207) == 0)
 {
@@ -39675,7 +41988,7 @@ block_100:
 if (x_73 == 0)
 {
 lean_object* x_74; 
-x_74 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__0___redArg(x_59, x_72, x_68);
+x_74 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__0___redArg(x_59, x_63, x_65);
 if (lean_obj_tag(x_74) == 0)
 {
 lean_object* x_75; lean_object* x_76; uint8_t x_77; 
@@ -39687,21 +42000,21 @@ x_77 = lean_unbox(x_76);
 if (x_77 == 0)
 {
 lean_object* x_78; 
-lean_dec_ref(x_63);
+lean_dec_ref(x_69);
 x_78 = lean_ctor_get(x_75, 1);
 lean_inc(x_78);
 lean_dec(x_75);
-x_18 = x_60;
-x_19 = x_66;
+x_18 = x_66;
+x_19 = x_67;
 x_20 = x_78;
-x_21 = x_61;
-x_22 = x_64;
-x_23 = x_69;
-x_24 = x_67;
+x_21 = x_60;
+x_22 = x_71;
+x_23 = x_61;
+x_24 = x_70;
 x_25 = x_62;
-x_26 = x_71;
-x_27 = x_68;
-x_28 = x_65;
+x_26 = x_64;
+x_27 = x_65;
+x_28 = x_72;
 x_29 = lean_box(0);
 goto block_58;
 }
@@ -39716,12 +42029,12 @@ x_80 = lean_ctor_get(x_75, 1);
 x_81 = lean_ctor_get(x_75, 0);
 lean_dec(x_81);
 x_82 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_OldCollector_collect___closed__1;
-x_83 = l_Lean_Exception_toMessageData(x_63);
+x_83 = l_Lean_Exception_toMessageData(x_69);
 x_84 = l_Lean_indentD(x_83);
 lean_ctor_set_tag(x_75, 7);
 lean_ctor_set(x_75, 1, x_84);
 lean_ctor_set(x_75, 0, x_82);
-x_85 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__1___redArg(x_59, x_75, x_80, x_62, x_71, x_68, x_65);
+x_85 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__1___redArg(x_59, x_75, x_80, x_62, x_64, x_65, x_72);
 if (lean_obj_tag(x_85) == 0)
 {
 lean_object* x_86; lean_object* x_87; 
@@ -39731,28 +42044,28 @@ lean_dec_ref(x_85);
 x_87 = lean_ctor_get(x_86, 1);
 lean_inc(x_87);
 lean_dec(x_86);
-x_18 = x_60;
-x_19 = x_66;
+x_18 = x_66;
+x_19 = x_67;
 x_20 = x_87;
-x_21 = x_61;
-x_22 = x_64;
-x_23 = x_69;
-x_24 = x_67;
+x_21 = x_60;
+x_22 = x_71;
+x_23 = x_61;
+x_24 = x_70;
 x_25 = x_62;
-x_26 = x_71;
-x_27 = x_68;
-x_28 = x_65;
+x_26 = x_64;
+x_27 = x_65;
+x_28 = x_72;
 x_29 = lean_box(0);
 goto block_58;
 }
 else
 {
-lean_dec(x_71);
-lean_dec_ref(x_69);
-lean_dec_ref(x_68);
-lean_dec(x_67);
+lean_dec(x_72);
+lean_dec(x_70);
+lean_dec_ref(x_67);
 lean_dec(x_66);
-lean_dec(x_65);
+lean_dec_ref(x_65);
+lean_dec(x_64);
 lean_dec_ref(x_62);
 lean_dec_ref(x_61);
 lean_dec_ref(x_60);
@@ -39767,12 +42080,12 @@ x_88 = lean_ctor_get(x_75, 1);
 lean_inc(x_88);
 lean_dec(x_75);
 x_89 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_OldCollector_collect___closed__1;
-x_90 = l_Lean_Exception_toMessageData(x_63);
+x_90 = l_Lean_Exception_toMessageData(x_69);
 x_91 = l_Lean_indentD(x_90);
 x_92 = lean_alloc_ctor(7, 2, 0);
 lean_ctor_set(x_92, 0, x_89);
 lean_ctor_set(x_92, 1, x_91);
-x_93 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__1___redArg(x_59, x_92, x_88, x_62, x_71, x_68, x_65);
+x_93 = l_Lean_addTrace___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__1___redArg(x_59, x_92, x_88, x_62, x_64, x_65, x_72);
 if (lean_obj_tag(x_93) == 0)
 {
 lean_object* x_94; lean_object* x_95; 
@@ -39782,28 +42095,28 @@ lean_dec_ref(x_93);
 x_95 = lean_ctor_get(x_94, 1);
 lean_inc(x_95);
 lean_dec(x_94);
-x_18 = x_60;
-x_19 = x_66;
+x_18 = x_66;
+x_19 = x_67;
 x_20 = x_95;
-x_21 = x_61;
-x_22 = x_64;
-x_23 = x_69;
-x_24 = x_67;
+x_21 = x_60;
+x_22 = x_71;
+x_23 = x_61;
+x_24 = x_70;
 x_25 = x_62;
-x_26 = x_71;
-x_27 = x_68;
-x_28 = x_65;
+x_26 = x_64;
+x_27 = x_65;
+x_28 = x_72;
 x_29 = lean_box(0);
 goto block_58;
 }
 else
 {
-lean_dec(x_71);
-lean_dec_ref(x_69);
-lean_dec_ref(x_68);
-lean_dec(x_67);
+lean_dec(x_72);
+lean_dec(x_70);
+lean_dec_ref(x_67);
 lean_dec(x_66);
-lean_dec(x_65);
+lean_dec_ref(x_65);
+lean_dec(x_64);
 lean_dec_ref(x_62);
 lean_dec_ref(x_61);
 lean_dec_ref(x_60);
@@ -39816,13 +42129,13 @@ return x_93;
 else
 {
 uint8_t x_96; 
-lean_dec(x_71);
+lean_dec(x_72);
+lean_dec(x_70);
 lean_dec_ref(x_69);
-lean_dec_ref(x_68);
-lean_dec(x_67);
+lean_dec_ref(x_67);
 lean_dec(x_66);
-lean_dec(x_65);
-lean_dec_ref(x_63);
+lean_dec_ref(x_65);
+lean_dec(x_64);
 lean_dec_ref(x_62);
 lean_dec_ref(x_61);
 lean_dec_ref(x_60);
@@ -39847,19 +42160,19 @@ return x_98;
 else
 {
 lean_object* x_99; 
-lean_dec_ref(x_72);
-lean_dec(x_71);
-lean_dec_ref(x_69);
-lean_dec_ref(x_68);
-lean_dec(x_67);
+lean_dec(x_72);
+lean_dec(x_70);
+lean_dec_ref(x_67);
 lean_dec(x_66);
-lean_dec(x_65);
+lean_dec_ref(x_65);
+lean_dec(x_64);
+lean_dec_ref(x_63);
 lean_dec_ref(x_62);
 lean_dec_ref(x_61);
 lean_dec_ref(x_60);
 lean_dec_ref(x_1);
 x_99 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_99, 0, x_63);
+lean_ctor_set(x_99, 0, x_69);
 return x_99;
 }
 }
@@ -39872,37 +42185,37 @@ if (x_114 == 0)
 uint8_t x_115; 
 lean_inc_ref(x_112);
 x_115 = l_Lean_Exception_isRuntime(x_112);
-x_60 = x_102;
-x_61 = x_105;
-x_62 = x_104;
-x_63 = x_112;
+x_60 = x_101;
+x_61 = x_104;
+x_62 = x_105;
+x_63 = x_106;
 x_64 = x_107;
-x_65 = x_111;
-x_66 = x_110;
-x_67 = x_101;
-x_68 = x_103;
-x_69 = x_106;
-x_70 = lean_box(0);
-x_71 = x_108;
-x_72 = x_109;
+x_65 = x_109;
+x_66 = x_108;
+x_67 = x_110;
+x_68 = lean_box(0);
+x_69 = x_112;
+x_70 = x_111;
+x_71 = x_103;
+x_72 = x_102;
 x_73 = x_115;
 goto block_100;
 }
 else
 {
-x_60 = x_102;
-x_61 = x_105;
-x_62 = x_104;
-x_63 = x_112;
+x_60 = x_101;
+x_61 = x_104;
+x_62 = x_105;
+x_63 = x_106;
 x_64 = x_107;
-x_65 = x_111;
-x_66 = x_110;
-x_67 = x_101;
-x_68 = x_103;
-x_69 = x_106;
-x_70 = lean_box(0);
-x_71 = x_108;
-x_72 = x_109;
+x_65 = x_109;
+x_66 = x_108;
+x_67 = x_110;
+x_68 = lean_box(0);
+x_69 = x_112;
+x_70 = x_111;
+x_71 = x_103;
+x_72 = x_102;
 x_73 = x_114;
 goto block_100;
 }
@@ -39912,7 +42225,7 @@ block_148:
 if (lean_obj_tag(x_128) == 0)
 {
 uint8_t x_129; 
-lean_dec_ref(x_125);
+lean_dec_ref(x_122);
 x_129 = !lean_is_exclusive(x_128);
 if (x_129 == 0)
 {
@@ -39926,17 +42239,17 @@ lean_free_object(x_128);
 x_132 = lean_ctor_get(x_130, 1);
 lean_inc(x_132);
 lean_dec(x_130);
-x_18 = x_118;
+x_18 = x_124;
 x_19 = x_126;
 x_20 = x_132;
-x_21 = x_121;
-x_22 = x_123;
-x_23 = x_122;
-x_24 = x_117;
-x_25 = x_120;
-x_26 = x_124;
-x_27 = x_119;
-x_28 = x_127;
+x_21 = x_117;
+x_22 = x_119;
+x_23 = x_120;
+x_24 = x_127;
+x_25 = x_121;
+x_26 = x_123;
+x_27 = x_125;
+x_28 = x_118;
 x_29 = lean_box(0);
 goto block_58;
 }
@@ -39945,14 +42258,14 @@ else
 uint8_t x_133; 
 lean_inc_ref(x_131);
 lean_dec(x_127);
-lean_dec(x_126);
+lean_dec_ref(x_126);
+lean_dec_ref(x_125);
 lean_dec(x_124);
-lean_dec_ref(x_122);
+lean_dec(x_123);
 lean_dec_ref(x_121);
 lean_dec_ref(x_120);
-lean_dec_ref(x_119);
-lean_dec_ref(x_118);
-lean_dec(x_117);
+lean_dec(x_118);
+lean_dec_ref(x_117);
 lean_dec_ref(x_1);
 x_133 = !lean_is_exclusive(x_130);
 if (x_133 == 0)
@@ -39996,17 +42309,17 @@ lean_object* x_141;
 x_141 = lean_ctor_get(x_139, 1);
 lean_inc(x_141);
 lean_dec(x_139);
-x_18 = x_118;
+x_18 = x_124;
 x_19 = x_126;
 x_20 = x_141;
-x_21 = x_121;
-x_22 = x_123;
-x_23 = x_122;
-x_24 = x_117;
-x_25 = x_120;
-x_26 = x_124;
-x_27 = x_119;
-x_28 = x_127;
+x_21 = x_117;
+x_22 = x_119;
+x_23 = x_120;
+x_24 = x_127;
+x_25 = x_121;
+x_26 = x_123;
+x_27 = x_125;
+x_28 = x_118;
 x_29 = lean_box(0);
 goto block_58;
 }
@@ -40015,14 +42328,14 @@ else
 lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; 
 lean_inc_ref(x_140);
 lean_dec(x_127);
-lean_dec(x_126);
+lean_dec_ref(x_126);
+lean_dec_ref(x_125);
 lean_dec(x_124);
-lean_dec_ref(x_122);
+lean_dec(x_123);
 lean_dec_ref(x_121);
 lean_dec_ref(x_120);
-lean_dec_ref(x_119);
-lean_dec_ref(x_118);
-lean_dec(x_117);
+lean_dec(x_118);
+lean_dec_ref(x_117);
 lean_dec_ref(x_1);
 x_142 = lean_ctor_get(x_139, 1);
 lean_inc(x_142);
@@ -40103,8 +42416,8 @@ x_165 = lean_unbox(x_164);
 lean_dec(x_164);
 if (x_165 == 0)
 {
-x_18 = x_162;
-x_19 = x_160;
+x_18 = x_160;
+x_19 = x_162;
 x_20 = x_149;
 x_21 = x_150;
 x_22 = x_151;
@@ -40150,17 +42463,17 @@ lean_inc(x_153);
 lean_inc_ref(x_152);
 lean_inc_ref(x_150);
 x_177 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons___lam__0(x_1, x_59, x_166, x_176, x_175, x_150, x_151, x_152, x_153, x_154, x_155, x_156, x_157);
-x_117 = x_153;
-x_118 = x_162;
-x_119 = x_156;
-x_120 = x_154;
-x_121 = x_150;
-x_122 = x_152;
-x_123 = x_151;
-x_124 = x_155;
-x_125 = x_149;
-x_126 = x_160;
-x_127 = x_157;
+x_117 = x_150;
+x_118 = x_157;
+x_119 = x_151;
+x_120 = x_152;
+x_121 = x_154;
+x_122 = x_149;
+x_123 = x_155;
+x_124 = x_160;
+x_125 = x_156;
+x_126 = x_162;
+x_127 = x_153;
 x_128 = x_177;
 goto block_148;
 }
@@ -40200,17 +42513,17 @@ lean_inc(x_153);
 lean_inc_ref(x_152);
 lean_inc_ref(x_150);
 x_187 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons___lam__0(x_1, x_59, x_166, x_185, x_186, x_150, x_151, x_152, x_153, x_154, x_155, x_156, x_157);
-x_117 = x_153;
-x_118 = x_162;
-x_119 = x_156;
-x_120 = x_154;
-x_121 = x_150;
-x_122 = x_152;
-x_123 = x_151;
-x_124 = x_155;
-x_125 = x_149;
-x_126 = x_160;
-x_127 = x_157;
+x_117 = x_150;
+x_118 = x_157;
+x_119 = x_151;
+x_120 = x_152;
+x_121 = x_154;
+x_122 = x_149;
+x_123 = x_155;
+x_124 = x_160;
+x_125 = x_156;
+x_126 = x_162;
+x_127 = x_153;
 x_128 = x_187;
 goto block_148;
 }
@@ -40220,17 +42533,17 @@ lean_object* x_188;
 x_188 = lean_ctor_get(x_183, 0);
 lean_inc(x_188);
 lean_dec_ref(x_183);
-x_101 = x_153;
-x_102 = x_162;
-x_103 = x_156;
-x_104 = x_154;
-x_105 = x_150;
-x_106 = x_152;
-x_107 = x_151;
-x_108 = x_155;
-x_109 = x_149;
-x_110 = x_160;
-x_111 = x_157;
+x_101 = x_150;
+x_102 = x_157;
+x_103 = x_151;
+x_104 = x_152;
+x_105 = x_154;
+x_106 = x_149;
+x_107 = x_155;
+x_108 = x_160;
+x_109 = x_156;
+x_110 = x_162;
+x_111 = x_153;
 x_112 = x_188;
 x_113 = lean_box(0);
 goto block_116;
@@ -40268,17 +42581,17 @@ lean_inc(x_153);
 lean_inc_ref(x_152);
 lean_inc_ref(x_150);
 x_197 = l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons___lam__0(x_1, x_59, x_166, x_195, x_196, x_150, x_151, x_152, x_153, x_154, x_155, x_156, x_157);
-x_117 = x_153;
-x_118 = x_162;
-x_119 = x_156;
-x_120 = x_154;
-x_121 = x_150;
-x_122 = x_152;
-x_123 = x_151;
-x_124 = x_155;
-x_125 = x_149;
-x_126 = x_160;
-x_127 = x_157;
+x_117 = x_150;
+x_118 = x_157;
+x_119 = x_151;
+x_120 = x_152;
+x_121 = x_154;
+x_122 = x_149;
+x_123 = x_155;
+x_124 = x_160;
+x_125 = x_156;
+x_126 = x_162;
+x_127 = x_153;
 x_128 = x_197;
 goto block_148;
 }
@@ -40288,17 +42601,17 @@ lean_object* x_198;
 x_198 = lean_ctor_get(x_193, 0);
 lean_inc(x_198);
 lean_dec_ref(x_193);
-x_101 = x_153;
-x_102 = x_162;
-x_103 = x_156;
-x_104 = x_154;
-x_105 = x_150;
-x_106 = x_152;
-x_107 = x_151;
-x_108 = x_155;
-x_109 = x_149;
-x_110 = x_160;
-x_111 = x_157;
+x_101 = x_150;
+x_102 = x_157;
+x_103 = x_151;
+x_104 = x_152;
+x_105 = x_154;
+x_106 = x_149;
+x_107 = x_155;
+x_108 = x_160;
+x_109 = x_156;
+x_110 = x_162;
+x_111 = x_153;
 x_112 = x_198;
 x_113 = lean_box(0);
 goto block_116;
@@ -40312,17 +42625,17 @@ lean_object* x_199;
 x_199 = lean_ctor_get(x_171, 0);
 lean_inc(x_199);
 lean_dec_ref(x_171);
-x_101 = x_153;
-x_102 = x_162;
-x_103 = x_156;
-x_104 = x_154;
-x_105 = x_150;
-x_106 = x_152;
-x_107 = x_151;
-x_108 = x_155;
-x_109 = x_149;
-x_110 = x_160;
-x_111 = x_157;
+x_101 = x_150;
+x_102 = x_157;
+x_103 = x_151;
+x_104 = x_152;
+x_105 = x_154;
+x_106 = x_149;
+x_107 = x_155;
+x_108 = x_160;
+x_109 = x_156;
+x_110 = x_162;
+x_111 = x_153;
 x_112 = x_199;
 x_113 = lean_box(0);
 goto block_116;
@@ -40614,15 +42927,15 @@ block_58:
 {
 lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; size_t x_38; size_t x_39; lean_object* x_40; 
 x_30 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___at___00Lean_Core_transform___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectOffsets_spec__0_spec__0___lam__1___closed__0;
-lean_inc(x_19);
-x_31 = lean_mk_array(x_19, x_30);
+lean_inc(x_18);
+x_31 = lean_mk_array(x_18, x_30);
 x_32 = lean_unsigned_to_nat(1u);
-x_33 = lean_nat_sub(x_19, x_32);
-lean_dec(x_19);
+x_33 = lean_nat_sub(x_18, x_32);
+lean_dec(x_18);
 x_34 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_1, x_31, x_33);
 x_35 = lean_unsigned_to_nat(0u);
-x_36 = lean_array_get_size(x_18);
-x_37 = l_Array_toSubarray___redArg(x_18, x_35, x_36);
+x_36 = lean_array_get_size(x_19);
+x_37 = l_Array_toSubarray___redArg(x_19, x_35, x_36);
 x_38 = lean_array_size(x_34);
 x_39 = 0;
 x_40 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__2(x_34, x_38, x_39, x_37, x_20, x_21, x_22, x_23, x_24, x_25, x_26, x_27, x_28);
@@ -40772,7 +43085,7 @@ x_33 = lean_ctor_get(x_4, 1);
 lean_dec(x_33);
 x_34 = lean_ctor_get(x_4, 0);
 lean_dec(x_34);
-x_35 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_35 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_36 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__0___redArg(x_35, x_5, x_12);
 if (lean_obj_tag(x_36) == 0)
 {
@@ -40834,14 +43147,14 @@ x_81 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_80);
 if (x_81 == 0)
 {
 lean_object* x_82; 
-x_82 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_82 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_69 = x_82;
 goto block_79;
 }
 else
 {
 lean_object* x_83; 
-x_83 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_83 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_69 = x_83;
 goto block_79;
 }
@@ -41038,14 +43351,14 @@ x_127 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_126);
 if (x_127 == 0)
 {
 lean_object* x_128; 
-x_128 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_128 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_115 = x_128;
 goto block_125;
 }
 else
 {
 lean_object* x_129; 
-x_129 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_129 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_115 = x_129;
 goto block_125;
 }
@@ -41225,7 +43538,7 @@ else
 {
 lean_object* x_133; lean_object* x_134; 
 lean_dec(x_4);
-x_133 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5));
+x_133 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3));
 x_134 = l_Lean_isTracingEnabledFor___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_collectSingletons_spec__0___redArg(x_133, x_5, x_12);
 if (lean_obj_tag(x_134) == 0)
 {
@@ -41301,14 +43614,14 @@ x_181 = l_Lean_Meta_Grind_NormalizePattern_PatternArgKind_isSupport(x_180);
 if (x_181 == 0)
 {
 lean_object* x_182; 
-x_182 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__12));
+x_182 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__10));
 x_169 = x_182;
 goto block_179;
 }
 else
 {
 lean_object* x_183; 
-x_183 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13));
+x_183 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11));
 x_169 = x_183;
 goto block_179;
 }
@@ -43910,7 +46223,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 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__2));
 x_2 = lean_unsigned_to_nat(13u);
-x_3 = lean_unsigned_to_nat(1373u);
+x_3 = lean_unsigned_to_nat(1520u);
 x_4 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchTheoremWithKind_x3f___lam__0___closed__5));
 x_5 = ((lean_object*)(l_Lean_Meta_Grind_isGenPattern_x3f___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -47350,7 +49663,7 @@ lean_inc(x_36);
 x_40 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_40, 0, x_36);
 lean_ctor_set(x_40, 1, x_39);
-x_41 = ((lean_object*)(l_Lean_Meta_Grind_ppPattern___closed__7));
+x_41 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8));
 lean_inc(x_36);
 x_42 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_42, 0, x_36);
@@ -47382,7 +49695,7 @@ lean_inc(x_51);
 x_55 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_55, 0, x_51);
 lean_ctor_set(x_55, 1, x_54);
-x_56 = ((lean_object*)(l_Lean_Meta_Grind_ppPattern___closed__7));
+x_56 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8));
 lean_inc(x_51);
 x_57 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_57, 0, x_51);
@@ -47417,7 +49730,7 @@ x_68 = lean_ctor_get(x_2, 5);
 x_69 = l_Lean_SourceInfo_fromRef(x_68, x_67);
 x_70 = ((lean_object*)(l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax___closed__3));
 x_71 = ((lean_object*)(l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax___closed__15));
-x_72 = ((lean_object*)(l_Lean_Meta_Grind_ppPattern___closed__7));
+x_72 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8));
 lean_inc(x_69);
 x_73 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_73, 0, x_69);
@@ -47450,7 +49763,7 @@ x_83 = 0;
 x_84 = l_Lean_SourceInfo_fromRef(x_82, x_83);
 x_85 = ((lean_object*)(l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax___closed__3));
 x_86 = ((lean_object*)(l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax___closed__15));
-x_87 = ((lean_object*)(l_Lean_Meta_Grind_ppPattern___closed__7));
+x_87 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__8));
 lean_inc(x_84);
 x_88 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_88, 0, x_84);
@@ -47886,7 +50199,7 @@ lean_inc(x_3);
 x_4 = lean_ctor_get(x_2, 1);
 lean_inc(x_4);
 lean_dec_ref(x_2);
-x_5 = ((lean_object*)(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__2));
+x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__2));
 x_6 = lean_string_append(x_1, x_5);
 x_7 = l_Std_Format_defWidth;
 x_8 = lean_unsigned_to_nat(0u);
@@ -48218,7 +50531,7 @@ block_112:
 lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
 x_47 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_save___closed__0));
 x_48 = lean_string_append(x_46, x_47);
-x_49 = l_List_toString___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_save_spec__2(x_42);
+x_49 = l_List_toString___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_save_spec__2(x_43);
 x_50 = lean_string_append(x_48, x_49);
 lean_dec_ref(x_49);
 if (x_3 == 0)
@@ -48227,8 +50540,8 @@ lean_dec(x_1);
 if (x_4 == 0)
 {
 lean_object* x_51; 
-x_51 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_41, x_8, x_9);
-lean_dec(x_41);
+x_51 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_45, x_8, x_9);
+lean_dec(x_45);
 if (lean_obj_tag(x_51) == 0)
 {
 lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
@@ -48251,7 +50564,7 @@ x_61 = l_Lean_Syntax_node2(x_54, x_57, x_58, x_60);
 x_62 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_62, 0, x_55);
 lean_ctor_set(x_62, 1, x_61);
-x_11 = x_43;
+x_11 = x_41;
 x_12 = x_50;
 x_13 = x_62;
 x_14 = x_44;
@@ -48263,7 +50576,7 @@ else
 uint8_t x_63; 
 lean_dec_ref(x_50);
 lean_dec_ref(x_44);
-lean_dec_ref(x_43);
+lean_dec_ref(x_41);
 lean_dec_ref(x_2);
 x_63 = !lean_is_exclusive(x_51);
 if (x_63 == 0)
@@ -48285,8 +50598,8 @@ return x_65;
 else
 {
 lean_object* x_66; 
-x_66 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_41, x_8, x_9);
-lean_dec(x_41);
+x_66 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_45, x_8, x_9);
+lean_dec(x_45);
 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; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
@@ -48309,7 +50622,7 @@ x_76 = l_Lean_Syntax_node2(x_69, x_72, x_73, x_75);
 x_77 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_77, 0, x_70);
 lean_ctor_set(x_77, 1, x_76);
-x_11 = x_43;
+x_11 = x_41;
 x_12 = x_50;
 x_13 = x_77;
 x_14 = x_44;
@@ -48321,7 +50634,7 @@ else
 uint8_t x_78; 
 lean_dec_ref(x_50);
 lean_dec_ref(x_44);
-lean_dec_ref(x_43);
+lean_dec_ref(x_41);
 lean_dec_ref(x_2);
 x_78 = !lean_is_exclusive(x_66);
 if (x_78 == 0)
@@ -48346,8 +50659,8 @@ else
 if (x_4 == 0)
 {
 lean_object* x_81; 
-x_81 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_41, x_8, x_9);
-lean_dec(x_41);
+x_81 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_45, x_8, x_9);
+lean_dec(x_45);
 if (lean_obj_tag(x_81) == 0)
 {
 lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
@@ -48367,7 +50680,7 @@ x_90 = l_Lean_Syntax_node1(x_84, x_85, x_89);
 x_91 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_91, 0, x_85);
 lean_ctor_set(x_91, 1, x_90);
-x_11 = x_43;
+x_11 = x_41;
 x_12 = x_50;
 x_13 = x_91;
 x_14 = x_44;
@@ -48379,7 +50692,7 @@ else
 uint8_t x_92; 
 lean_dec_ref(x_50);
 lean_dec_ref(x_44);
-lean_dec_ref(x_43);
+lean_dec_ref(x_41);
 lean_dec_ref(x_2);
 lean_dec(x_1);
 x_92 = !lean_is_exclusive(x_81);
@@ -48402,8 +50715,8 @@ return x_94;
 else
 {
 lean_object* x_95; 
-x_95 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_41, x_8, x_9);
-lean_dec(x_41);
+x_95 = l_Lean_Meta_Grind_EMatchTheoremKind_toSyntax(x_45, x_8, x_9);
+lean_dec(x_45);
 if (lean_obj_tag(x_95) == 0)
 {
 lean_object* x_96; lean_object* x_97; uint8_t x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
@@ -48429,7 +50742,7 @@ x_107 = l_Lean_Syntax_node1(x_99, x_100, x_106);
 x_108 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_108, 0, x_100);
 lean_ctor_set(x_108, 1, x_107);
-x_11 = x_43;
+x_11 = x_41;
 x_12 = x_50;
 x_13 = x_108;
 x_14 = x_44;
@@ -48441,7 +50754,7 @@ else
 uint8_t x_109; 
 lean_dec_ref(x_50);
 lean_dec_ref(x_44);
-lean_dec_ref(x_43);
+lean_dec_ref(x_41);
 lean_dec_ref(x_2);
 lean_dec(x_1);
 x_109 = !lean_is_exclusive(x_95);
@@ -48469,11 +50782,11 @@ if (x_3 == 0)
 {
 lean_object* x_118; 
 x_118 = ((lean_object*)(l_Lean_Meta_Grind_EMatchTheoremKind_toAttribute___closed__2));
-x_41 = x_113;
-x_42 = x_114;
-x_43 = x_117;
-x_44 = x_115;
-x_45 = lean_box(0);
+x_41 = x_117;
+x_42 = lean_box(0);
+x_43 = x_113;
+x_44 = x_116;
+x_45 = x_115;
 x_46 = x_118;
 goto block_112;
 }
@@ -48481,11 +50794,11 @@ else
 {
 lean_object* x_119; 
 x_119 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6___closed__1));
-x_41 = x_113;
-x_42 = x_114;
-x_43 = x_117;
-x_44 = x_115;
-x_45 = lean_box(0);
+x_41 = x_117;
+x_42 = lean_box(0);
+x_43 = x_113;
+x_44 = x_116;
+x_45 = x_115;
 x_46 = x_119;
 goto block_112;
 }
@@ -48514,10 +50827,10 @@ lean_inc(x_127);
 lean_dec(x_125);
 x_128 = ((lean_object*)(l_List_toString___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_save_spec__2___closed__1));
 lean_inc(x_122);
-x_113 = x_122;
-x_114 = x_126;
-x_115 = x_127;
-x_116 = lean_box(0);
+x_113 = x_126;
+x_114 = lean_box(0);
+x_115 = x_122;
+x_116 = x_127;
 x_117 = x_128;
 goto block_120;
 }
@@ -48531,10 +50844,10 @@ lean_inc(x_130);
 lean_dec(x_125);
 x_131 = ((lean_object*)(l_Lean_addTrace___at___00__private_Lean_ExtraModUses_0__Lean_recordExtraModUseCore___at___00Lean_recordExtraModUseFromDecl___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_detectGeneralizedPatterns_x3f_spec__2_spec__3_spec__6___closed__1));
 lean_inc(x_122);
-x_113 = x_122;
-x_114 = x_129;
-x_115 = x_130;
-x_116 = lean_box(0);
+x_113 = x_129;
+x_114 = lean_box(0);
+x_115 = x_122;
+x_116 = x_130;
 x_117 = x_131;
 goto block_120;
 }
@@ -49628,14 +51941,14 @@ if (lean_obj_tag(x_27) == 0)
 {
 lean_dec_ref(x_27);
 x_11 = x_17;
-x_12 = x_20;
+x_12 = x_19;
 x_13 = lean_box(0);
 goto block_16;
 }
 else
 {
 uint8_t x_28; 
-lean_dec_ref(x_20);
+lean_dec_ref(x_19);
 x_28 = !lean_is_exclusive(x_27);
 if (x_28 == 0)
 {
@@ -49667,14 +51980,14 @@ if (lean_obj_tag(x_36) == 0)
 {
 lean_dec_ref(x_36);
 x_11 = x_17;
-x_12 = x_20;
+x_12 = x_19;
 x_13 = lean_box(0);
 goto block_16;
 }
 else
 {
 uint8_t x_37; 
-lean_dec_ref(x_20);
+lean_dec_ref(x_19);
 x_37 = !lean_is_exclusive(x_36);
 if (x_37 == 0)
 {
@@ -49734,8 +52047,8 @@ if (x_5 == 0)
 {
 x_17 = x_46;
 x_18 = x_44;
-x_19 = lean_box(0);
-x_20 = x_45;
+x_19 = x_45;
+x_20 = lean_box(0);
 goto block_40;
 }
 else
@@ -49759,8 +52072,8 @@ else
 {
 x_17 = x_46;
 x_18 = x_44;
-x_19 = lean_box(0);
-x_20 = x_45;
+x_19 = x_45;
+x_20 = lean_box(0);
 goto block_40;
 }
 }
@@ -49987,6 +52300,7 @@ lean_object* initialize_Lean_Meta_Tactic_Grind_Util(uint8_t builtin);
 lean_object* initialize_Lean_Meta_Tactic_TryThis(uint8_t builtin);
 lean_object* initialize_Lean_Meta_Sym_Util(uint8_t builtin);
 lean_object* initialize_Lean_Meta_Sym_Eta(uint8_t builtin);
+lean_object* initialize_Init_Omega(uint8_t builtin);
 static bool _G_initialized = false;
 LEAN_EXPORT lean_object* initialize_Lean_Meta_Tactic_Grind_EMatchTheorem(uint8_t builtin) {
 lean_object * res;
@@ -50007,6 +52321,9 @@ lean_dec_ref(res);
 res = initialize_Lean_Meta_Sym_Eta(builtin);
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+res = initialize_Init_Omega(builtin);
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 l_Lean_PersistentHashMap_eraseAux___at___00Lean_PersistentHashMap_erase___at___00Lean_Meta_Grind_SymbolPriorities_erase_spec__0_spec__0___redArg___closed__0 = _init_l_Lean_PersistentHashMap_eraseAux___at___00Lean_PersistentHashMap_erase___at___00Lean_Meta_Grind_SymbolPriorities_erase_spec__0_spec__0___redArg___closed__0();
 l_Lean_PersistentHashMap_eraseAux___at___00Lean_PersistentHashMap_erase___at___00Lean_Meta_Grind_SymbolPriorities_erase_spec__0_spec__0___redArg___closed__1 = _init_l_Lean_PersistentHashMap_eraseAux___at___00Lean_PersistentHashMap_erase___at___00Lean_Meta_Grind_SymbolPriorities_erase_spec__0_spec__0___redArg___closed__1();
 l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_initFn___closed__21_00___x40_Lean_Meta_Tactic_Grind_EMatchTheorem_2275318982____hygCtx___hyg_2_ = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_initFn___closed__21_00___x40_Lean_Meta_Tactic_Grind_EMatchTheorem_2275318982____hygCtx___hyg_2_();
@@ -50115,24 +52432,40 @@ l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare___c
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare___closed__2);
 l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_dontCare);
+l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__1 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__1);
+l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__3);
+l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__5 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__5();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__5);
+l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__7 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__7();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__7);
+l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody___closed__13);
+l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1();
+lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe_fold___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_ppPattern_ppHOBody_spec__0___closed__1);
 l_Lean_Meta_Grind_ppPattern___closed__1 = _init_l_Lean_Meta_Grind_ppPattern___closed__1();
 lean_mark_persistent(l_Lean_Meta_Grind_ppPattern___closed__1);
 l_Lean_Meta_Grind_ppPattern___closed__2 = _init_l_Lean_Meta_Grind_ppPattern___closed__2();
 lean_mark_persistent(l_Lean_Meta_Grind_ppPattern___closed__2);
 l_Lean_Meta_Grind_ppPattern___closed__4 = _init_l_Lean_Meta_Grind_ppPattern___closed__4();
 lean_mark_persistent(l_Lean_Meta_Grind_ppPattern___closed__4);
-l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__1 = _init_l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__1();
-lean_mark_persistent(l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_Meta_Grind_ppPattern_spec__1___closed__1);
 l_Lean_Meta_Grind_ppPattern___closed__6 = _init_l_Lean_Meta_Grind_ppPattern___closed__6();
 lean_mark_persistent(l_Lean_Meta_Grind_ppPattern___closed__6);
-l_Lean_Meta_Grind_ppPattern___closed__8 = _init_l_Lean_Meta_Grind_ppPattern___closed__8();
-lean_mark_persistent(l_Lean_Meta_Grind_ppPattern___closed__8);
+l_Lean_Meta_Grind_ppPattern___closed__7 = _init_l_Lean_Meta_Grind_ppPattern___closed__7();
+lean_mark_persistent(l_Lean_Meta_Grind_ppPattern___closed__7);
+l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__1 = _init_l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__1();
+lean_mark_persistent(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__1);
+l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2 = _init_l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2();
+lean_mark_persistent(l_WellFounded_opaqueFix_u2083___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_checkMillerArgs_spec__0___redArg___closed__2);
+l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_MillerCheck_visit___closed__1);
 l_Lean_Meta_Grind_NormalizePattern_instReprPatternArgKind_repr___closed__10 = _init_l_Lean_Meta_Grind_NormalizePattern_instReprPatternArgKind_repr___closed__10();
 lean_mark_persistent(l_Lean_Meta_Grind_NormalizePattern_instReprPatternArgKind_repr___closed__10);
 l_Lean_Meta_Grind_NormalizePattern_instReprPatternArgKind_repr___closed__11 = _init_l_Lean_Meta_Grind_NormalizePattern_instReprPatternArgKind_repr___closed__11();
 lean_mark_persistent(l_Lean_Meta_Grind_NormalizePattern_instReprPatternArgKind_repr___closed__11);
-l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__0 = _init_l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__0();
-lean_mark_persistent(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__1___closed__0);
+l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__0 = _init_l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__0();
+lean_mark_persistent(l_panic___at___00__private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go_spec__2___closed__0);
 l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__2 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__2);
 l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__4 = _init_l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_NormalizePattern_go___closed__4();
@@ -50173,16 +52506,14 @@ l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_getProofFor_
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Grind_EMatchTheorem_0__Lean_Meta_Grind_getProofFor___closed__3);
 l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__1 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__1();
 lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__1);
-l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3();
-lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__3);
+l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5();
+lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__5);
 l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__7 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__7();
 lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__7);
 l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__9 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__9();
 lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__9);
-l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11();
-lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__11);
-l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__15 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__15();
-lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__15);
+l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13 = _init_l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13();
+lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqTheoremCore___lam__0___closed__13);
 l_Lean_Meta_Grind_mkEMatchEqBwdTheoremCore___lam__0___closed__1 = _init_l_Lean_Meta_Grind_mkEMatchEqBwdTheoremCore___lam__0___closed__1();
 lean_mark_persistent(l_Lean_Meta_Grind_mkEMatchEqBwdTheoremCore___lam__0___closed__1);
 l_Array_filterMapM___at___00Lean_Meta_Grind_Extension_getEMatchTheoremsForNamespace_spec__1___closed__0 = _init_l_Array_filterMapM___at___00Lean_Meta_Grind_Extension_getEMatchTheoremsForNamespace_spec__1___closed__0();
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheoremParam.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheoremParam.c
index f4901930c1..3f880e642f 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheoremParam.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/EMatchTheoremParam.c
@@ -3648,7 +3648,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getNumDigitsForLocalTheoremAnchors_spec__0_spec__0_spec__1_spec__2___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -3773,7 +3773,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getNumDigitsForLocalTheoremAnchors_spec__0_spec__0_spec__2___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -3806,7 +3806,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getNumDigitsForLocalTheoremAnchors_spec__0_spec__0_spec__1___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
@@ -4108,7 +4108,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getNumDigitsForLocalTheoremAnchors_spec__0_spec__0_spec__1(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 x_6 = lean_box(x_5);
@@ -4128,7 +4128,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getNumDigitsForLocalTheoremAnchors_spec__0_spec__0_spec__2(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -4146,7 +4146,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getNumDigitsForLocalTheoremAnchors_spec__0_spec__0_spec__1_spec__2(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/ForallProp.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/ForallProp.c
index 87eae645da..f2693556ff 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/ForallProp.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/ForallProp.c
@@ -2990,7 +2990,7 @@ _start:
 {
 uint64_t x_5; size_t x_6; size_t x_7; uint8_t x_8; lean_object* x_9; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_usize(x_4);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Internalize.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Internalize.c
index 098321527f..bfe4ca9d6d 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Internalize.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Internalize.c
@@ -343,6 +343,7 @@ lean_object* l_Lean_collectLevelParams(lean_object*, lean_object*);
 size_t lean_array_size(lean_object*);
 lean_object* l_Lean_Expr_instantiateLevelParamsArray(lean_object*, lean_object*, lean_object*);
 lean_object* lean_grind_internalize(lean_object*, lean_object*, 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_Grind_hoPattern_x3f(lean_object*);
 lean_object* l_Lean_Meta_Grind_groundPattern_x3f(lean_object*);
 lean_object* l_Lean_Meta_Grind_preprocessLight(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasLevelParam(lean_object*);
@@ -9121,19 +9122,19 @@ return x_2;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizePattern_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_20; lean_object* x_21; lean_object* x_34; lean_object* x_35; uint8_t x_42; uint8_t x_56; 
-x_56 = l_Lean_Expr_isBVar(x_3);
-if (x_56 == 0)
+lean_object* x_15; lean_object* x_16; lean_object* x_20; lean_object* x_21; lean_object* x_34; lean_object* x_35; lean_object* x_36; uint8_t x_42; uint8_t x_60; 
+x_60 = l_Lean_Expr_isBVar(x_3);
+if (x_60 == 0)
 {
-uint8_t x_57; 
-x_57 = l_Lean_Meta_Grind_isPatternDontCare(x_3);
-x_42 = x_57;
-goto block_55;
+uint8_t x_61; 
+x_61 = l_Lean_Meta_Grind_isPatternDontCare(x_3);
+x_42 = x_61;
+goto block_59;
 }
 else
 {
-x_42 = x_56;
-goto block_55;
+x_42 = x_60;
+goto block_59;
 }
 block_19:
 {
@@ -9196,10 +9197,9 @@ return x_32;
 }
 block_41:
 {
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_box(0);
+lean_object* x_37; 
 lean_inc_ref(x_34);
-x_37 = lean_grind_internalize(x_34, x_1, x_36, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+x_37 = lean_grind_internalize(x_34, x_1, x_35, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 if (lean_obj_tag(x_37) == 0)
 {
 lean_dec_ref(x_37);
@@ -9228,19 +9228,23 @@ return x_40;
 }
 }
 }
-block_55:
+block_59:
 {
 if (x_42 == 0)
 {
 lean_object* x_43; 
-x_43 = l_Lean_Meta_Grind_groundPattern_x3f(x_3);
-if (lean_obj_tag(x_43) == 1)
+x_43 = l_Lean_Meta_Grind_hoPattern_x3f(x_3);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_44; lean_object* x_45; 
+lean_object* x_44; 
+x_44 = l_Lean_Meta_Grind_groundPattern_x3f(x_3);
+if (lean_obj_tag(x_44) == 1)
+{
+lean_object* x_45; lean_object* x_46; 
 lean_dec_ref(x_3);
-x_44 = lean_ctor_get(x_43, 0);
-lean_inc(x_44);
-lean_dec_ref(x_43);
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+lean_dec_ref(x_44);
 lean_inc(x_13);
 lean_inc_ref(x_12);
 lean_inc(x_11);
@@ -9251,20 +9255,21 @@ lean_inc(x_7);
 lean_inc_ref(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_45 = l_Lean_Meta_Grind_preprocessLight(x_44, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_45) == 0)
+x_46 = l_Lean_Meta_Grind_preprocessLight(x_45, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_46) == 0)
 {
-lean_object* x_46; uint8_t x_47; 
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-lean_dec_ref(x_45);
-x_47 = l_Lean_Expr_hasLevelParam(x_46);
-if (x_47 == 0)
+lean_object* x_47; uint8_t x_48; 
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+lean_dec_ref(x_46);
+x_48 = l_Lean_Expr_hasLevelParam(x_47);
+if (x_48 == 0)
 {
-if (x_47 == 0)
+if (x_48 == 0)
 {
-x_34 = x_46;
-x_35 = lean_box(0);
+x_34 = x_47;
+x_35 = x_43;
+x_36 = lean_box(0);
 goto block_41;
 }
 else
@@ -9276,7 +9281,7 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_20 = x_46;
+x_20 = x_47;
 x_21 = lean_box(0);
 goto block_33;
 }
@@ -9292,14 +9297,15 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_20 = x_46;
+x_20 = x_47;
 x_21 = lean_box(0);
 goto block_33;
 }
 else
 {
-x_34 = x_46;
-x_35 = lean_box(0);
+x_34 = x_47;
+x_35 = x_43;
+x_36 = lean_box(0);
 goto block_41;
 }
 }
@@ -9317,27 +9323,27 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-return x_45;
+return x_46;
 }
 }
 else
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-lean_dec(x_43);
-x_48 = l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizePattern_go___closed__4;
-x_49 = l_Lean_Expr_getAppNumArgs(x_3);
-lean_inc(x_49);
-x_50 = lean_mk_array(x_49, x_48);
-x_51 = lean_unsigned_to_nat(1u);
-x_52 = lean_nat_sub(x_49, x_51);
-lean_dec(x_49);
-x_53 = l_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizePattern_go_spec__2(x_1, x_2, x_3, x_50, x_52, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_53;
+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_dec(x_44);
+x_49 = l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizePattern_go___closed__4;
+x_50 = l_Lean_Expr_getAppNumArgs(x_3);
+lean_inc(x_50);
+x_51 = lean_mk_array(x_50, x_49);
+x_52 = lean_unsigned_to_nat(1u);
+x_53 = lean_nat_sub(x_50, x_52);
+lean_dec(x_50);
+x_54 = l_Lean_Expr_withAppAux___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizePattern_go_spec__2(x_1, x_2, x_3, x_51, x_53, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+return x_54;
 }
 }
 else
 {
-lean_object* x_54; 
+uint8_t x_55; 
 lean_dec(x_13);
 lean_dec_ref(x_12);
 lean_dec(x_11);
@@ -9349,9 +9355,43 @@ lean_dec_ref(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_54 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_54, 0, x_3);
-return x_54;
+x_55 = !lean_is_exclusive(x_43);
+if (x_55 == 0)
+{
+lean_object* x_56; 
+x_56 = lean_ctor_get(x_43, 0);
+lean_dec(x_56);
+lean_ctor_set_tag(x_43, 0);
+lean_ctor_set(x_43, 0, x_3);
+return x_43;
+}
+else
+{
+lean_object* x_57; 
+lean_dec(x_43);
+x_57 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_57, 0, x_3);
+return x_57;
+}
+}
+}
+else
+{
+lean_object* x_58; 
+lean_dec(x_13);
+lean_dec_ref(x_12);
+lean_dec(x_11);
+lean_dec_ref(x_10);
+lean_dec(x_9);
+lean_dec_ref(x_8);
+lean_dec(x_7);
+lean_dec_ref(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_58 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_58, 0, x_3);
+return x_58;
 }
 }
 }
@@ -28921,12 +28961,12 @@ block_171:
 {
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_box(0);
-lean_inc(x_20);
+lean_inc(x_23);
 lean_inc(x_30);
 lean_inc_ref(x_6);
 lean_inc_ref(x_1);
 lean_inc_ref(x_5);
-x_32 = l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__0___redArg(x_5, x_1, x_6, x_4, x_2, x_30, x_31, x_20, x_19, x_29, x_18, x_25, x_22, x_21, x_27, x_24, x_26);
+x_32 = l_List_forIn_x27_loop___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__0___redArg(x_5, x_1, x_6, x_4, x_2, x_30, x_31, x_23, x_28, x_25, x_27, x_20, x_22, x_24, x_19, x_26, x_21);
 if (lean_obj_tag(x_32) == 0)
 {
 uint8_t x_33; 
@@ -28936,7 +28976,7 @@ if (x_33 == 0)
 lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
 x_34 = lean_ctor_get(x_32, 0);
 lean_dec(x_34);
-x_35 = lean_st_ref_take(x_20);
+x_35 = lean_st_ref_take(x_23);
 x_36 = lean_ctor_get(x_35, 0);
 lean_inc_ref(x_36);
 x_37 = lean_ctor_get(x_36, 15);
@@ -28965,10 +29005,10 @@ lean_ctor_set(x_44, 2, x_6);
 x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_30);
-x_46 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_43, x_28, x_45);
+x_46 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_43, x_29, x_45);
 lean_ctor_set(x_37, 7, x_46);
-x_47 = lean_st_ref_set(x_20, x_35);
-lean_dec(x_20);
+x_47 = lean_st_ref_set(x_23, x_35);
+lean_dec(x_23);
 lean_ctor_set(x_32, 0, x_31);
 return x_32;
 }
@@ -28999,7 +29039,7 @@ lean_ctor_set(x_56, 2, x_6);
 x_57 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_57, 0, x_56);
 lean_ctor_set(x_57, 1, x_30);
-x_58 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_55, x_28, x_57);
+x_58 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_55, x_29, x_57);
 x_59 = lean_alloc_ctor(0, 8, 0);
 lean_ctor_set(x_59, 0, x_48);
 lean_ctor_set(x_59, 1, x_49);
@@ -29010,8 +29050,8 @@ lean_ctor_set(x_59, 5, x_53);
 lean_ctor_set(x_59, 6, x_54);
 lean_ctor_set(x_59, 7, x_58);
 lean_ctor_set(x_36, 15, x_59);
-x_60 = lean_st_ref_set(x_20, x_35);
-lean_dec(x_20);
+x_60 = lean_st_ref_set(x_23, x_35);
+lean_dec(x_23);
 lean_ctor_set(x_32, 0, x_31);
 return x_32;
 }
@@ -29092,7 +29132,7 @@ lean_ctor_set(x_88, 2, x_6);
 x_89 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_89, 0, x_88);
 lean_ctor_set(x_89, 1, x_30);
-x_90 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_86, x_28, x_89);
+x_90 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_86, x_29, x_89);
 if (lean_is_scalar(x_87)) {
  x_91 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -29127,8 +29167,8 @@ lean_ctor_set(x_92, 16, x_77);
 lean_ctor_set(x_92, 17, x_78);
 lean_ctor_set_uint8(x_92, sizeof(void*)*18, x_70);
 lean_ctor_set(x_35, 0, x_92);
-x_93 = lean_st_ref_set(x_20, x_35);
-lean_dec(x_20);
+x_93 = lean_st_ref_set(x_23, x_35);
+lean_dec(x_23);
 lean_ctor_set(x_32, 0, x_31);
 return x_32;
 }
@@ -29235,7 +29275,7 @@ lean_ctor_set(x_123, 2, x_6);
 x_124 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_124, 0, x_123);
 lean_ctor_set(x_124, 1, x_30);
-x_125 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_121, x_28, x_124);
+x_125 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_121, x_29, x_124);
 if (lean_is_scalar(x_122)) {
  x_126 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -29276,8 +29316,8 @@ lean_ctor_set_uint8(x_127, sizeof(void*)*18, x_104);
 x_128 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_128, 0, x_127);
 lean_ctor_set(x_128, 1, x_94);
-x_129 = lean_st_ref_set(x_20, x_128);
-lean_dec(x_20);
+x_129 = lean_st_ref_set(x_23, x_128);
+lean_dec(x_23);
 lean_ctor_set(x_32, 0, x_31);
 return x_32;
 }
@@ -29286,7 +29326,7 @@ else
 {
 lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; uint8_t x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
 lean_dec(x_32);
-x_130 = lean_st_ref_take(x_20);
+x_130 = lean_st_ref_take(x_23);
 x_131 = lean_ctor_get(x_130, 0);
 lean_inc_ref(x_131);
 x_132 = lean_ctor_get(x_131, 15);
@@ -29397,7 +29437,7 @@ lean_ctor_set(x_163, 2, x_6);
 x_164 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_164, 0, x_163);
 lean_ctor_set(x_164, 1, x_30);
-x_165 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_161, x_28, x_164);
+x_165 = l_Lean_PersistentHashMap_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_found_spec__1___redArg(x_161, x_29, x_164);
 if (lean_is_scalar(x_162)) {
  x_166 = lean_alloc_ctor(0, 8, 0);
 } else {
@@ -29442,8 +29482,8 @@ if (lean_is_scalar(x_134)) {
 }
 lean_ctor_set(x_168, 0, x_167);
 lean_ctor_set(x_168, 1, x_133);
-x_169 = lean_st_ref_set(x_20, x_168);
-lean_dec(x_20);
+x_169 = lean_st_ref_set(x_23, x_168);
+lean_dec(x_23);
 x_170 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_170, 0, x_31);
 return x_170;
@@ -29452,8 +29492,8 @@ return x_170;
 else
 {
 lean_dec(x_30);
-lean_dec_ref(x_28);
-lean_dec(x_20);
+lean_dec_ref(x_29);
+lean_dec(x_23);
 lean_dec_ref(x_6);
 lean_dec_ref(x_5);
 lean_dec_ref(x_1);
@@ -29485,18 +29525,18 @@ if (lean_obj_tag(x_189) == 0)
 {
 lean_object* x_190; 
 x_190 = lean_box(0);
-x_18 = x_175;
-x_19 = x_173;
-x_20 = x_172;
-x_21 = x_178;
+x_18 = lean_box(0);
+x_19 = x_179;
+x_20 = x_176;
+x_21 = x_181;
 x_22 = x_177;
-x_23 = lean_box(0);
-x_24 = x_180;
-x_25 = x_176;
-x_26 = x_181;
-x_27 = x_179;
-x_28 = x_183;
-x_29 = x_174;
+x_23 = x_172;
+x_24 = x_178;
+x_25 = x_174;
+x_26 = x_180;
+x_27 = x_175;
+x_28 = x_173;
+x_29 = x_183;
 x_30 = x_190;
 goto block_171;
 }
@@ -29506,18 +29546,18 @@ lean_object* x_191;
 x_191 = lean_ctor_get(x_189, 0);
 lean_inc(x_191);
 lean_dec_ref(x_189);
-x_18 = x_175;
-x_19 = x_173;
-x_20 = x_172;
-x_21 = x_178;
+x_18 = lean_box(0);
+x_19 = x_179;
+x_20 = x_176;
+x_21 = x_181;
 x_22 = x_177;
-x_23 = lean_box(0);
-x_24 = x_180;
-x_25 = x_176;
-x_26 = x_181;
-x_27 = x_179;
-x_28 = x_183;
-x_29 = x_174;
+x_23 = x_172;
+x_24 = x_178;
+x_25 = x_174;
+x_26 = x_180;
+x_27 = x_175;
+x_28 = x_173;
+x_29 = x_183;
 x_30 = x_191;
 goto block_171;
 }
@@ -29543,18 +29583,18 @@ if (lean_obj_tag(x_196) == 0)
 {
 lean_object* x_197; 
 x_197 = lean_box(0);
-x_18 = x_175;
-x_19 = x_173;
-x_20 = x_172;
-x_21 = x_178;
+x_18 = lean_box(0);
+x_19 = x_179;
+x_20 = x_176;
+x_21 = x_181;
 x_22 = x_177;
-x_23 = lean_box(0);
-x_24 = x_180;
-x_25 = x_176;
-x_26 = x_181;
-x_27 = x_179;
-x_28 = x_195;
-x_29 = x_174;
+x_23 = x_172;
+x_24 = x_178;
+x_25 = x_174;
+x_26 = x_180;
+x_27 = x_175;
+x_28 = x_173;
+x_29 = x_195;
 x_30 = x_197;
 goto block_171;
 }
@@ -29564,18 +29604,18 @@ lean_object* x_198;
 x_198 = lean_ctor_get(x_196, 0);
 lean_inc(x_198);
 lean_dec_ref(x_196);
-x_18 = x_175;
-x_19 = x_173;
-x_20 = x_172;
-x_21 = x_178;
+x_18 = lean_box(0);
+x_19 = x_179;
+x_20 = x_176;
+x_21 = x_181;
 x_22 = x_177;
-x_23 = lean_box(0);
-x_24 = x_180;
-x_25 = x_176;
-x_26 = x_181;
-x_27 = x_179;
-x_28 = x_195;
-x_29 = x_174;
+x_23 = x_172;
+x_24 = x_178;
+x_25 = x_174;
+x_26 = x_180;
+x_27 = x_175;
+x_28 = x_173;
+x_29 = x_195;
 x_30 = x_198;
 goto block_171;
 }
@@ -30126,7 +30166,7 @@ lean_ctor_set(x_34, 1, x_16);
 x_35 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_35, 0, x_33);
 lean_ctor_set(x_35, 1, x_34);
-x_36 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_spec__0(x_1, x_2, x_19, x_29, x_16, x_17, x_35, x_21, x_28, x_26, x_25, x_23, x_30, x_31, x_27, x_22, x_24);
+x_36 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_spec__0(x_1, x_2, x_19, x_31, x_16, x_17, x_35, x_27, x_28, x_24, x_23, x_20, x_29, x_26, x_30, x_21, x_22);
 if (lean_obj_tag(x_36) == 0)
 {
 uint8_t x_37; 
@@ -30241,18 +30281,18 @@ if (x_17 == 0)
 {
 lean_free_object(x_65);
 lean_dec(x_67);
-x_20 = lean_box(0);
-x_21 = x_52;
-x_22 = x_60;
-x_23 = x_56;
-x_24 = x_61;
-x_25 = x_55;
-x_26 = x_54;
-x_27 = x_59;
+x_20 = x_56;
+x_21 = x_60;
+x_22 = x_61;
+x_23 = x_55;
+x_24 = x_54;
+x_25 = lean_box(0);
+x_26 = x_58;
+x_27 = x_52;
 x_28 = x_53;
-x_29 = x_64;
-x_30 = x_57;
-x_31 = x_58;
+x_29 = x_57;
+x_30 = x_59;
+x_31 = x_64;
 goto block_51;
 }
 else
@@ -30286,18 +30326,18 @@ return x_65;
 else
 {
 lean_free_object(x_65);
-x_20 = lean_box(0);
-x_21 = x_52;
-x_22 = x_60;
-x_23 = x_56;
-x_24 = x_61;
-x_25 = x_55;
-x_26 = x_54;
-x_27 = x_59;
+x_20 = x_56;
+x_21 = x_60;
+x_22 = x_61;
+x_23 = x_55;
+x_24 = x_54;
+x_25 = lean_box(0);
+x_26 = x_58;
+x_27 = x_52;
 x_28 = x_53;
-x_29 = x_64;
-x_30 = x_57;
-x_31 = x_58;
+x_29 = x_57;
+x_30 = x_59;
+x_31 = x_64;
 goto block_51;
 }
 }
@@ -30306,18 +30346,18 @@ else
 {
 lean_free_object(x_65);
 lean_dec(x_67);
-x_20 = lean_box(0);
-x_21 = x_52;
-x_22 = x_60;
-x_23 = x_56;
-x_24 = x_61;
-x_25 = x_55;
-x_26 = x_54;
-x_27 = x_59;
+x_20 = x_56;
+x_21 = x_60;
+x_22 = x_61;
+x_23 = x_55;
+x_24 = x_54;
+x_25 = lean_box(0);
+x_26 = x_58;
+x_27 = x_52;
 x_28 = x_53;
-x_29 = x_64;
-x_30 = x_57;
-x_31 = x_58;
+x_29 = x_57;
+x_30 = x_59;
+x_31 = x_64;
 goto block_51;
 }
 }
@@ -30334,18 +30374,18 @@ if (x_75 == 0)
 if (x_17 == 0)
 {
 lean_dec(x_73);
-x_20 = lean_box(0);
-x_21 = x_52;
-x_22 = x_60;
-x_23 = x_56;
-x_24 = x_61;
-x_25 = x_55;
-x_26 = x_54;
-x_27 = x_59;
+x_20 = x_56;
+x_21 = x_60;
+x_22 = x_61;
+x_23 = x_55;
+x_24 = x_54;
+x_25 = lean_box(0);
+x_26 = x_58;
+x_27 = x_52;
 x_28 = x_53;
-x_29 = x_64;
-x_30 = x_57;
-x_31 = x_58;
+x_29 = x_57;
+x_30 = x_59;
+x_31 = x_64;
 goto block_51;
 }
 else
@@ -30379,18 +30419,18 @@ return x_79;
 }
 else
 {
-x_20 = lean_box(0);
-x_21 = x_52;
-x_22 = x_60;
-x_23 = x_56;
-x_24 = x_61;
-x_25 = x_55;
-x_26 = x_54;
-x_27 = x_59;
+x_20 = x_56;
+x_21 = x_60;
+x_22 = x_61;
+x_23 = x_55;
+x_24 = x_54;
+x_25 = lean_box(0);
+x_26 = x_58;
+x_27 = x_52;
 x_28 = x_53;
-x_29 = x_64;
-x_30 = x_57;
-x_31 = x_58;
+x_29 = x_57;
+x_30 = x_59;
+x_31 = x_64;
 goto block_51;
 }
 }
@@ -30398,18 +30438,18 @@ goto block_51;
 else
 {
 lean_dec(x_73);
-x_20 = lean_box(0);
-x_21 = x_52;
-x_22 = x_60;
-x_23 = x_56;
-x_24 = x_61;
-x_25 = x_55;
-x_26 = x_54;
-x_27 = x_59;
+x_20 = x_56;
+x_21 = x_60;
+x_22 = x_61;
+x_23 = x_55;
+x_24 = x_54;
+x_25 = lean_box(0);
+x_26 = x_58;
+x_27 = x_52;
 x_28 = x_53;
-x_29 = x_64;
-x_30 = x_57;
-x_31 = x_58;
+x_29 = x_57;
+x_30 = x_59;
+x_31 = x_64;
 goto block_51;
 }
 }
@@ -30589,7 +30629,7 @@ lean_ctor_set(x_109, 1, x_90);
 x_110 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_110, 0, x_108);
 lean_ctor_set(x_110, 1, x_109);
-x_111 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_spec__0(x_1, x_2, x_94, x_104, x_90, x_91, x_110, x_96, x_103, x_101, x_100, x_98, x_105, x_106, x_102, x_97, x_99);
+x_111 = l___private_Init_While_0__Lean_Loop_forIn_loop___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_addSplitCandidatesForExt_spec__0(x_1, x_2, x_94, x_106, x_90, x_91, x_110, x_102, x_103, x_99, x_98, x_95, x_104, x_101, x_105, x_96, x_97);
 if (lean_obj_tag(x_111) == 0)
 {
 lean_object* x_112; lean_object* x_113; lean_object* x_114; 
@@ -30694,18 +30734,18 @@ if (x_91 == 0)
 {
 lean_dec(x_138);
 lean_dec(x_137);
-x_95 = lean_box(0);
-x_96 = x_123;
-x_97 = x_131;
-x_98 = x_127;
-x_99 = x_132;
-x_100 = x_126;
-x_101 = x_125;
-x_102 = x_130;
+x_95 = x_127;
+x_96 = x_131;
+x_97 = x_132;
+x_98 = x_126;
+x_99 = x_125;
+x_100 = lean_box(0);
+x_101 = x_129;
+x_102 = x_123;
 x_103 = x_124;
-x_104 = x_135;
-x_105 = x_128;
-x_106 = x_129;
+x_104 = x_128;
+x_105 = x_130;
+x_106 = x_135;
 goto block_122;
 }
 else
@@ -30744,18 +30784,18 @@ return x_144;
 else
 {
 lean_dec(x_138);
-x_95 = lean_box(0);
-x_96 = x_123;
-x_97 = x_131;
-x_98 = x_127;
-x_99 = x_132;
-x_100 = x_126;
-x_101 = x_125;
-x_102 = x_130;
+x_95 = x_127;
+x_96 = x_131;
+x_97 = x_132;
+x_98 = x_126;
+x_99 = x_125;
+x_100 = lean_box(0);
+x_101 = x_129;
+x_102 = x_123;
 x_103 = x_124;
-x_104 = x_135;
-x_105 = x_128;
-x_106 = x_129;
+x_104 = x_128;
+x_105 = x_130;
+x_106 = x_135;
 goto block_122;
 }
 }
@@ -30764,18 +30804,18 @@ else
 {
 lean_dec(x_138);
 lean_dec(x_137);
-x_95 = lean_box(0);
-x_96 = x_123;
-x_97 = x_131;
-x_98 = x_127;
-x_99 = x_132;
-x_100 = x_126;
-x_101 = x_125;
-x_102 = x_130;
+x_95 = x_127;
+x_96 = x_131;
+x_97 = x_132;
+x_98 = x_126;
+x_99 = x_125;
+x_100 = lean_box(0);
+x_101 = x_129;
+x_102 = x_123;
 x_103 = x_124;
-x_104 = x_135;
-x_105 = x_128;
-x_106 = x_129;
+x_104 = x_128;
+x_105 = x_130;
+x_106 = x_135;
 goto block_122;
 }
 }
@@ -35987,7 +36027,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 = ((lean_object*)(l_Lean_Meta_Grind_Theorems_insert___at___00Lean_Meta_Grind_TheoremsArray_insert___at___00__private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_activateTheoremPatterns_spec__0_spec__0___closed__2));
 x_2 = lean_unsigned_to_nat(18u);
-x_3 = lean_unsigned_to_nat(558u);
+x_3 = lean_unsigned_to_nat(561u);
 x_4 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizeImpl_go___closed__1));
 x_5 = ((lean_object*)(l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_internalizeImpl_go___closed__0));
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -38090,14 +38130,14 @@ if (x_38 == 0)
 lean_object* x_39; 
 lean_dec(x_34);
 lean_dec(x_33);
-lean_dec_ref(x_32);
+lean_dec(x_32);
 lean_dec(x_31);
-lean_dec_ref(x_30);
+lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec_ref(x_28);
 lean_dec(x_27);
-lean_dec(x_26);
-lean_dec(x_25);
+lean_dec_ref(x_26);
+lean_dec_ref(x_25);
 lean_dec_ref(x_1);
 x_39 = lean_box(0);
 lean_ctor_set(x_35, 0, x_39);
@@ -38107,37 +38147,37 @@ else
 {
 lean_object* x_40; 
 lean_free_object(x_35);
-lean_inc(x_33);
+lean_inc(x_30);
 lean_inc_ref(x_28);
-lean_inc(x_34);
-lean_inc_ref(x_29);
-lean_inc(x_25);
-lean_inc_ref(x_32);
-lean_inc(x_26);
-lean_inc_ref(x_30);
 lean_inc(x_27);
+lean_inc_ref(x_25);
 lean_inc(x_31);
+lean_inc_ref(x_29);
+lean_inc(x_33);
+lean_inc_ref(x_26);
+lean_inc(x_32);
+lean_inc(x_34);
 lean_inc_ref(x_1);
-x_40 = l_Lean_Meta_Grind_propagateUp(x_1, x_31, x_27, x_30, x_26, x_32, x_25, x_29, x_34, x_28, x_33);
+x_40 = l_Lean_Meta_Grind_propagateUp(x_1, x_34, x_32, x_26, x_33, x_29, x_31, x_25, x_27, x_28, x_30);
 if (lean_obj_tag(x_40) == 0)
 {
 lean_object* x_41; 
 lean_dec_ref(x_40);
-x_41 = l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_checkAndAddSplitCandidate(x_1, x_31, x_27, x_30, x_26, x_32, x_25, x_29, x_34, x_28, x_33);
+x_41 = l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_checkAndAddSplitCandidate(x_1, x_34, x_32, x_26, x_33, x_29, x_31, x_25, x_27, x_28, x_30);
 return x_41;
 }
 else
 {
 lean_dec(x_34);
 lean_dec(x_33);
-lean_dec_ref(x_32);
+lean_dec(x_32);
 lean_dec(x_31);
-lean_dec_ref(x_30);
+lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec_ref(x_28);
 lean_dec(x_27);
-lean_dec(x_26);
-lean_dec(x_25);
+lean_dec_ref(x_26);
+lean_dec_ref(x_25);
 lean_dec_ref(x_1);
 return x_40;
 }
@@ -38156,14 +38196,14 @@ if (x_43 == 0)
 lean_object* x_44; lean_object* x_45; 
 lean_dec(x_34);
 lean_dec(x_33);
-lean_dec_ref(x_32);
+lean_dec(x_32);
 lean_dec(x_31);
-lean_dec_ref(x_30);
+lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec_ref(x_28);
 lean_dec(x_27);
-lean_dec(x_26);
-lean_dec(x_25);
+lean_dec_ref(x_26);
+lean_dec_ref(x_25);
 lean_dec_ref(x_1);
 x_44 = lean_box(0);
 x_45 = lean_alloc_ctor(0, 1, 0);
@@ -38173,37 +38213,37 @@ return x_45;
 else
 {
 lean_object* x_46; 
-lean_inc(x_33);
+lean_inc(x_30);
 lean_inc_ref(x_28);
-lean_inc(x_34);
-lean_inc_ref(x_29);
-lean_inc(x_25);
-lean_inc_ref(x_32);
-lean_inc(x_26);
-lean_inc_ref(x_30);
 lean_inc(x_27);
+lean_inc_ref(x_25);
 lean_inc(x_31);
+lean_inc_ref(x_29);
+lean_inc(x_33);
+lean_inc_ref(x_26);
+lean_inc(x_32);
+lean_inc(x_34);
 lean_inc_ref(x_1);
-x_46 = l_Lean_Meta_Grind_propagateUp(x_1, x_31, x_27, x_30, x_26, x_32, x_25, x_29, x_34, x_28, x_33);
+x_46 = l_Lean_Meta_Grind_propagateUp(x_1, x_34, x_32, x_26, x_33, x_29, x_31, x_25, x_27, x_28, x_30);
 if (lean_obj_tag(x_46) == 0)
 {
 lean_object* x_47; 
 lean_dec_ref(x_46);
-x_47 = l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_checkAndAddSplitCandidate(x_1, x_31, x_27, x_30, x_26, x_32, x_25, x_29, x_34, x_28, x_33);
+x_47 = l___private_Lean_Meta_Tactic_Grind_Internalize_0__Lean_Meta_Grind_checkAndAddSplitCandidate(x_1, x_34, x_32, x_26, x_33, x_29, x_31, x_25, x_27, x_28, x_30);
 return x_47;
 }
 else
 {
 lean_dec(x_34);
 lean_dec(x_33);
-lean_dec_ref(x_32);
+lean_dec(x_32);
 lean_dec(x_31);
-lean_dec_ref(x_30);
+lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec_ref(x_28);
 lean_dec(x_27);
-lean_dec(x_26);
-lean_dec(x_25);
+lean_dec_ref(x_26);
+lean_dec_ref(x_25);
 lean_dec_ref(x_1);
 return x_46;
 }
@@ -38215,14 +38255,14 @@ else
 uint8_t x_48; 
 lean_dec(x_34);
 lean_dec(x_33);
-lean_dec_ref(x_32);
+lean_dec(x_32);
 lean_dec(x_31);
-lean_dec_ref(x_30);
+lean_dec(x_30);
 lean_dec_ref(x_29);
 lean_dec_ref(x_28);
 lean_dec(x_27);
-lean_dec(x_26);
-lean_dec(x_25);
+lean_dec_ref(x_26);
+lean_dec_ref(x_25);
 lean_dec_ref(x_1);
 x_48 = !lean_is_exclusive(x_35);
 if (x_48 == 0)
@@ -38258,16 +38298,16 @@ x_66 = lean_unbox(x_65);
 lean_dec(x_65);
 if (x_66 == 0)
 {
-x_25 = x_58;
-x_26 = x_56;
-x_27 = x_54;
+x_25 = x_59;
+x_26 = x_55;
+x_27 = x_60;
 x_28 = x_61;
-x_29 = x_59;
-x_30 = x_55;
-x_31 = x_53;
-x_32 = x_57;
-x_33 = x_62;
-x_34 = x_60;
+x_29 = x_57;
+x_30 = x_62;
+x_31 = x_58;
+x_32 = x_54;
+x_33 = x_56;
+x_34 = x_53;
 x_35 = x_64;
 goto block_51;
 }
@@ -38281,32 +38321,32 @@ lean_inc(x_60);
 lean_inc_ref(x_59);
 lean_inc_ref(x_1);
 x_67 = l_Lean_Meta_isProp(x_1, x_59, x_60, x_61, x_62);
-x_25 = x_58;
-x_26 = x_56;
-x_27 = x_54;
+x_25 = x_59;
+x_26 = x_55;
+x_27 = x_60;
 x_28 = x_61;
-x_29 = x_59;
-x_30 = x_55;
-x_31 = x_53;
-x_32 = x_57;
-x_33 = x_62;
-x_34 = x_60;
+x_29 = x_57;
+x_30 = x_62;
+x_31 = x_58;
+x_32 = x_54;
+x_33 = x_56;
+x_34 = x_53;
 x_35 = x_67;
 goto block_51;
 }
 }
 else
 {
-x_25 = x_58;
-x_26 = x_56;
-x_27 = x_54;
+x_25 = x_59;
+x_26 = x_55;
+x_27 = x_60;
 x_28 = x_61;
-x_29 = x_59;
-x_30 = x_55;
-x_31 = x_53;
-x_32 = x_57;
-x_33 = x_62;
-x_34 = x_60;
+x_29 = x_57;
+x_30 = x_62;
+x_31 = x_58;
+x_32 = x_54;
+x_33 = x_56;
+x_34 = x_53;
 x_35 = x_64;
 goto block_51;
 }
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Split.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Split.c
index 5a7f349d4d..4ad49a6ac9 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Split.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Split.c
@@ -8195,7 +8195,7 @@ _start:
 {
 uint64_t x_5; size_t x_6; size_t x_7; uint8_t x_8; lean_object* x_9; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_usize(x_4);
@@ -12211,7 +12211,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getSplitCandidateAnchors_spec__1_spec__2_spec__3_spec__4___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -12246,7 +12246,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getSplitCandidateAnchors_spec__1_spec__2_spec__3___redArg(x_1, x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
@@ -12488,7 +12488,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getSplitCandidateAnchors_spec__1_spec__2_spec__4___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -13209,7 +13209,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getSplitCandidateAnchors_spec__1_spec__2_spec__3(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 x_6 = lean_box(x_5);
@@ -13229,7 +13229,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_insertIfNew___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getSplitCandidateAnchors_spec__1_spec__2_spec__4(x_1, x_2, x_5, x_4);
 return x_6;
 }
@@ -13247,7 +13247,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_contains___at___00__private_Lean_Meta_Tactic_Grind_Anchor_0__Lean_Meta_Grind_getNumDigitsForAnchors_go___at___00Lean_Meta_Grind_getNumDigitsForAnchors___at___00Lean_Meta_Grind_getSplitCandidateAnchors_spec__1_spec__2_spec__3_spec__4(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Grind/Types.c b/stage0/stdlib/Lean/Meta/Tactic/Grind/Types.c
index 80315d94a1..5461005c3d 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Grind/Types.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Grind/Types.c
@@ -12749,7 +12749,7 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l___private_Lean_Meta_Tactic_Grind_Types_0__Lean_Meta_Grind_congrHash_go(x_1, x_2, x_4);
 lean_dec_ref(x_2);
 x_6 = lean_box_uint64(x_5);
@@ -13655,7 +13655,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Lean_Meta_Grind_instHashablePreInstance___lam__0(x_1, x_2, x_4);
 lean_dec_ref(x_1);
 return x_5;
@@ -20479,7 +20479,7 @@ lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_7 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_8 = l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00Lean_PersistentHashMap_contains___at___00Lean_Meta_Grind_markTheoremInstance_spec__0_spec__0(x_1, x_5, x_6, x_7);
 lean_dec_ref(x_1);
 x_9 = lean_box_uint64(x_8);
@@ -58661,7 +58661,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Meta_Grind_anchorPrefixToString(x_1, x_3);
 lean_dec(x_1);
 return x_4;
@@ -58686,7 +58686,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Meta_Grind_anchorToString(x_1, x_3);
 lean_dec(x_1);
 return x_4;
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Replace.c b/stage0/stdlib/Lean/Meta/Tactic/Replace.c
index a0327b8cff..3a6145f99e 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Replace.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Replace.c
@@ -250,7 +250,6 @@ LEAN_EXPORT lean_object* l_Lean_MVarId_withReverted(lean_object*, lean_object*,
 LEAN_EXPORT lean_object* l_Lean_MVarId_withReverted___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_pushInfoTree___at___00Lean_Elab_pushInfoLeaf___at___00Lean_MVarId_withReverted_spec__0_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_pushInfoTree___at___00Lean_Elab_pushInfoLeaf___at___00Lean_MVarId_withReverted_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1;
 lean_object* l_Lean_MVarId_revertFrom(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MVarId_withRevertedFrom___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MVarId_withRevertedFrom___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -5676,15 +5675,6 @@ lean_dec_ref(x_2);
 return x_7;
 }
 }
-static lean_object* _init_l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_MVarId_withRevertedFrom___redArg(lean_object* x_1, 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:
 {
@@ -5752,7 +5742,7 @@ x_29 = lean_array_get_size(x_26);
 x_30 = l_Array_toSubarray___redArg(x_26, x_28, x_29);
 x_31 = lean_array_size(x_17);
 x_32 = lean_box_usize(x_31);
-x_33 = l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1;
+x_33 = l_Lean_MVarId_withReverted___redArg___boxed__const__1;
 x_34 = lean_alloc_closure((void*)(l_Lean_MVarId_withReverted___redArg___lam__0___boxed), 9, 4);
 lean_closure_set(x_34, 0, x_17);
 lean_closure_set(x_34, 1, x_32);
@@ -5819,7 +5809,7 @@ x_45 = lean_array_get_size(x_42);
 x_46 = l_Array_toSubarray___redArg(x_42, x_44, x_45);
 x_47 = lean_array_size(x_17);
 x_48 = lean_box_usize(x_47);
-x_49 = l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1;
+x_49 = l_Lean_MVarId_withReverted___redArg___boxed__const__1;
 x_50 = lean_alloc_closure((void*)(l_Lean_MVarId_withReverted___redArg___lam__0___boxed), 9, 4);
 lean_closure_set(x_50, 0, x_17);
 lean_closure_set(x_50, 1, x_48);
@@ -7622,8 +7612,6 @@ l_Lean_Elab_pushInfoLeaf___at___00Lean_MVarId_withReverted_spec__0___closed__2 =
 lean_mark_persistent(l_Lean_Elab_pushInfoLeaf___at___00Lean_MVarId_withReverted_spec__0___closed__2);
 l_Lean_MVarId_withReverted___redArg___boxed__const__1 = _init_l_Lean_MVarId_withReverted___redArg___boxed__const__1();
 lean_mark_persistent(l_Lean_MVarId_withReverted___redArg___boxed__const__1);
-l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1 = _init_l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1();
-lean_mark_persistent(l_Lean_MVarId_withRevertedFrom___redArg___boxed__const__1);
 l_Lean_MVarId_changeLocalDecl___lam__2___closed__2 = _init_l_Lean_MVarId_changeLocalDecl___lam__2___closed__2();
 lean_mark_persistent(l_Lean_MVarId_changeLocalDecl___lam__2___closed__2);
 l_Lean_MVarId_changeLocalDecl___lam__2___closed__3 = _init_l_Lean_MVarId_changeLocalDecl___lam__2___closed__3();
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/Core.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/Core.c
index a18509805c..a942353afc 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/Core.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/Core.c
@@ -4408,7 +4408,7 @@ uint8_t x_13; uint8_t x_14; uint64_t x_15; lean_object* x_16;
 x_13 = lean_unbox(x_1);
 x_14 = lean_unbox(x_2);
 x_15 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_16 = l_reduceCtorEq___lam__2(x_13, x_14, x_15, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec(x_7);
 lean_dec_ref(x_6);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/SInt.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/SInt.c
index 758f6c79c2..2d13b84e8e 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/SInt.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/SInt.c
@@ -39352,7 +39352,7 @@ x_33 = l_Int8_reduceBin___redArg___closed__4_00___x40_Lean_Meta_Tactic_Simp_Buil
 x_34 = l_Int64_reduceBin___redArg___closed__1_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_35 = l_Int64_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_36 = lean_unbox_uint64(x_29);
-lean_dec(x_29);
+lean_dec_ref(x_29);
 x_37 = lean_int64_to_int_sint(x_36);
 x_38 = lean_int_neg(x_37);
 lean_dec(x_37);
@@ -39367,7 +39367,7 @@ else
 {
 uint64_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
 x_42 = lean_unbox_uint64(x_29);
-lean_dec(x_29);
+lean_dec_ref(x_29);
 x_43 = lean_int64_to_int_sint(x_42);
 x_44 = l_Int_toNat(x_43);
 lean_dec(x_43);
@@ -39494,7 +39494,7 @@ x_67 = l_Int8_reduceBin___redArg___closed__4_00___x40_Lean_Meta_Tactic_Simp_Buil
 x_68 = l_Int64_reduceBin___redArg___closed__1_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_69 = l_Int64_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_70 = lean_unbox_uint64(x_63);
-lean_dec(x_63);
+lean_dec_ref(x_63);
 x_71 = lean_int64_to_int_sint(x_70);
 x_72 = lean_int_neg(x_71);
 lean_dec(x_71);
@@ -39509,7 +39509,7 @@ else
 {
 uint64_t x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
 x_76 = lean_unbox_uint64(x_63);
-lean_dec(x_63);
+lean_dec_ref(x_63);
 x_77 = lean_int64_to_int_sint(x_76);
 x_78 = l_Int_toNat(x_77);
 lean_dec(x_77);
@@ -39708,7 +39708,7 @@ x_36 = l_Int8_reduceBin___redArg___closed__4_00___x40_Lean_Meta_Tactic_Simp_Buil
 x_37 = l_Int64_reduceBin___redArg___closed__1_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_38 = l_Int64_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_39 = lean_unbox_uint64(x_32);
-lean_dec(x_32);
+lean_dec_ref(x_32);
 x_40 = lean_int64_to_int_sint(x_39);
 x_41 = lean_int_neg(x_40);
 lean_dec(x_40);
@@ -39723,7 +39723,7 @@ else
 {
 uint64_t x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
 x_45 = lean_unbox_uint64(x_32);
-lean_dec(x_32);
+lean_dec_ref(x_32);
 x_46 = lean_int64_to_int_sint(x_45);
 x_47 = l_Int_toNat(x_46);
 lean_dec(x_46);
@@ -39850,7 +39850,7 @@ x_70 = l_Int8_reduceBin___redArg___closed__4_00___x40_Lean_Meta_Tactic_Simp_Buil
 x_71 = l_Int64_reduceBin___redArg___closed__1_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_72 = l_Int64_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_SInt_4041591762____hygCtx___hyg_3_;
 x_73 = lean_unbox_uint64(x_66);
-lean_dec(x_66);
+lean_dec_ref(x_66);
 x_74 = lean_int64_to_int_sint(x_73);
 x_75 = lean_int_neg(x_74);
 lean_dec(x_74);
@@ -39865,7 +39865,7 @@ else
 {
 uint64_t x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
 x_79 = lean_unbox_uint64(x_66);
-lean_dec(x_66);
+lean_dec_ref(x_66);
 x_80 = lean_int64_to_int_sint(x_79);
 x_81 = l_Int_toNat(x_80);
 lean_dec(x_80);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/UInt.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/UInt.c
index b1c3840961..c46917c7f3 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/UInt.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/BuiltinSimprocs/UInt.c
@@ -33992,7 +33992,7 @@ lean_object* x_24; lean_object* x_25; uint64_t x_26; lean_object* x_27; lean_obj
 x_24 = lean_ctor_get(x_22, 0);
 x_25 = lean_apply_2(x_3, x_18, x_24);
 x_26 = lean_unbox_uint64(x_25);
-lean_dec(x_25);
+lean_dec_ref(x_25);
 x_27 = lean_uint64_to_nat(x_26);
 x_28 = l_Lean_mkRawNatLit(x_27);
 x_29 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34013,7 +34013,7 @@ lean_inc(x_34);
 lean_dec(x_22);
 x_35 = lean_apply_2(x_3, x_18, x_34);
 x_36 = lean_unbox_uint64(x_35);
-lean_dec(x_35);
+lean_dec_ref(x_35);
 x_37 = lean_uint64_to_nat(x_36);
 x_38 = l_Lean_mkRawNatLit(x_37);
 x_39 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34059,7 +34059,7 @@ if (lean_is_exclusive(x_46)) {
 }
 x_49 = lean_apply_2(x_3, x_18, x_47);
 x_50 = lean_unbox_uint64(x_49);
-lean_dec(x_49);
+lean_dec_ref(x_49);
 x_51 = lean_uint64_to_nat(x_50);
 x_52 = l_Lean_mkRawNatLit(x_51);
 x_53 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34168,7 +34168,7 @@ if (lean_is_exclusive(x_70)) {
 }
 x_74 = lean_apply_2(x_3, x_67, x_72);
 x_75 = lean_unbox_uint64(x_74);
-lean_dec(x_74);
+lean_dec_ref(x_74);
 x_76 = lean_uint64_to_nat(x_75);
 x_77 = l_Lean_mkRawNatLit(x_76);
 x_78 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34348,7 +34348,7 @@ lean_object* x_27; lean_object* x_28; uint64_t x_29; lean_object* x_30; lean_obj
 x_27 = lean_ctor_get(x_25, 0);
 x_28 = lean_apply_2(x_3, x_21, x_27);
 x_29 = lean_unbox_uint64(x_28);
-lean_dec(x_28);
+lean_dec_ref(x_28);
 x_30 = lean_uint64_to_nat(x_29);
 x_31 = l_Lean_mkRawNatLit(x_30);
 x_32 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34369,7 +34369,7 @@ lean_inc(x_37);
 lean_dec(x_25);
 x_38 = lean_apply_2(x_3, x_21, x_37);
 x_39 = lean_unbox_uint64(x_38);
-lean_dec(x_38);
+lean_dec_ref(x_38);
 x_40 = lean_uint64_to_nat(x_39);
 x_41 = l_Lean_mkRawNatLit(x_40);
 x_42 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34415,7 +34415,7 @@ if (lean_is_exclusive(x_49)) {
 }
 x_52 = lean_apply_2(x_3, x_21, x_50);
 x_53 = lean_unbox_uint64(x_52);
-lean_dec(x_52);
+lean_dec_ref(x_52);
 x_54 = lean_uint64_to_nat(x_53);
 x_55 = l_Lean_mkRawNatLit(x_54);
 x_56 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
@@ -34524,7 +34524,7 @@ if (lean_is_exclusive(x_73)) {
 }
 x_77 = lean_apply_2(x_3, x_70, x_75);
 x_78 = lean_unbox_uint64(x_77);
-lean_dec(x_77);
+lean_dec_ref(x_77);
 x_79 = lean_uint64_to_nat(x_78);
 x_80 = l_Lean_mkRawNatLit(x_79);
 x_81 = l_UInt8_reduceBin___redArg___closed__3_00___x40_Lean_Meta_Tactic_Simp_BuiltinSimprocs_UInt_781669616____hygCtx___hyg_3_;
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Split.c b/stage0/stdlib/Lean/Meta/Tactic/Split.c
index 4288e60a80..f023c4f66a 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Split.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Split.c
@@ -660,7 +660,6 @@ lean_object* l_Lean_Meta_substCore_x3f(lean_object*, lean_object*, uint8_t, lean
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_forIn_x27Unsafe_loop___at___00__private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___lam__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static const lean_string_object l_List_foldlM___at___00Lean_Meta_Split_applyMatchSplitter_spec__2___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 16, .m_capacity = 16, .m_length = 15, .m_data = "after unifyEqs\n"};
@@ -15972,15 +15971,6 @@ lean_dec_ref(x_1);
 return x_12;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed__const__1() {
-_start:
-{
-size_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_usize(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs(lean_object* x_1, 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:
 {
@@ -15991,7 +15981,7 @@ lean_ctor_set(x_9, 0, x_2);
 lean_ctor_set(x_9, 1, x_1);
 x_10 = lean_array_size(x_3);
 x_11 = lean_box_usize(x_10);
-x_12 = l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed__const__1;
+x_12 = l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_generalizeMatchPropDiscrs___boxed__const__1;
 x_13 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___lam__0___boxed), 9, 4);
 lean_closure_set(x_13, 0, x_3);
 lean_closure_set(x_13, 1, x_11);
@@ -23609,8 +23599,6 @@ l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_generalizeMatchDiscrs___la
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_generalizeMatchDiscrs___lam__3___closed__6);
 l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_generalizeMatchDiscrs___lam__3___closed__8 = _init_l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_generalizeMatchDiscrs___lam__3___closed__8();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_generalizeMatchDiscrs___lam__3___closed__8);
-l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed__const__1 = _init_l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Split_0__Lean_Meta_Split_substDiscrEqs___boxed__const__1);
 l_List_foldlM___at___00Lean_Meta_Split_applyMatchSplitter_spec__2___closed__1 = _init_l_List_foldlM___at___00Lean_Meta_Split_applyMatchSplitter_spec__2___closed__1();
 lean_mark_persistent(l_List_foldlM___at___00Lean_Meta_Split_applyMatchSplitter_spec__2___closed__1);
 l_List_foldlM___at___00Lean_Meta_Split_applyMatchSplitter_spec__2___closed__3 = _init_l_List_foldlM___at___00Lean_Meta_Split_applyMatchSplitter_spec__2___closed__3();
diff --git a/stage0/stdlib/Lean/Meta/Transform.c b/stage0/stdlib/Lean/Meta/Transform.c
index 17d4532036..2526c72e77 100644
--- a/stage0/stdlib/Lean/Meta/Transform.c
+++ b/stage0/stdlib/Lean/Meta/Transform.c
@@ -96,7 +96,6 @@ static const lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit_visitPost___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4(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_Transform_0__Lean_Core_transform_visit___redArg___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_array_size(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_0__Array_mapMUnsafe_map(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
@@ -126,10 +125,8 @@ lean_object* l_Lean_Expr_sort___override(lean_object*);
 static lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__17___closed__0;
 lean_object* l_Lean_Expr_mdata___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_proj___override(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgs(lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
@@ -141,6 +138,9 @@ lean_object* l_instMonadControlTOfMonadControl___redArg___lam__3(lean_object*, l
 lean_object* l_instMonadControlTOfMonadControl___redArg___lam__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ST_Prim_Ref_get___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit_visitPost___redArg___lam__0(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_Transform_0__Lean_Core_transform_visit___redArg___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit(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_Transform_0__Lean_Core_transform_visit_visitPost(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Core_transform___redArg___lam__0(lean_object*);
@@ -1008,15 +1008,6 @@ x_11 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit_visitPost___
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec_ref(x_9);
-return x_10;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__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:
 {
@@ -1027,7 +1018,7 @@ lean_inc(x_4);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_12 = lean_alloc_closure((void*)(l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4___boxed), 9, 8);
+x_12 = lean_alloc_closure((void*)(l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4), 9, 8);
 lean_closure_set(x_12, 0, x_11);
 lean_closure_set(x_12, 1, x_1);
 lean_closure_set(x_12, 2, x_2);
@@ -1482,15 +1473,6 @@ return x_17;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_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_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-lean_dec_ref(x_1);
-return x_12;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -1517,15 +1499,6 @@ return x_18;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16___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_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16(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_ref(x_1);
-return x_13;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__17(lean_object* x_1, lean_object* x_2, 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:
 {
@@ -1758,7 +1731,7 @@ lean_inc(x_4);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_47);
-x_48 = lean_alloc_closure((void*)(l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15___boxed), 11, 10);
+x_48 = lean_alloc_closure((void*)(l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15), 11, 10);
 lean_closure_set(x_48, 0, x_47);
 lean_closure_set(x_48, 1, x_46);
 lean_closure_set(x_48, 2, x_2);
@@ -1790,7 +1763,7 @@ lean_inc(x_4);
 lean_inc_ref(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_53);
-x_54 = lean_alloc_closure((void*)(l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16___boxed), 12, 11);
+x_54 = lean_alloc_closure((void*)(l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16), 12, 11);
 lean_closure_set(x_54, 0, x_53);
 lean_closure_set(x_54, 1, x_51);
 lean_closure_set(x_54, 2, x_52);
@@ -2027,6 +2000,33 @@ x_9 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit_visitPost___r
 return x_9;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__4(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec_ref(x_9);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_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_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__15(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+lean_dec_ref(x_1);
+return x_12;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16___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_Meta_Transform_0__Lean_Core_transform_visit___redArg___lam__16(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_ref(x_1);
+return x_13;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Transform_0__Lean_Core_transform_visit(lean_object* x_1, lean_object* x_2, 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/PrettyPrinter/Delaborator/SubExpr.c b/stage0/stdlib/Lean/PrettyPrinter/Delaborator/SubExpr.c
index a59291b1b8..315537244b 100644
--- a/stage0/stdlib/Lean/PrettyPrinter/Delaborator/SubExpr.c
+++ b/stage0/stdlib/Lean/PrettyPrinter/Delaborator/SubExpr.c
@@ -1869,15 +1869,6 @@ return x_12;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec_ref(x_8);
-return x_9;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1896,7 +1887,7 @@ lean_closure_set(x_7, 3, x_3);
 lean_inc(x_6);
 lean_inc(x_2);
 lean_inc_ref(x_1);
-x_8 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg___lam__1___boxed), 8, 7);
+x_8 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg___lam__1), 8, 7);
 lean_closure_set(x_8, 0, x_4);
 lean_closure_set(x_8, 1, x_1);
 lean_closure_set(x_8, 2, x_2);
@@ -1909,6 +1900,15 @@ x_10 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_9, x_8);
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec_ref(x_8);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withAppFnArgs(lean_object* x_1, 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:
 {
@@ -1970,16 +1970,6 @@ return x_5;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec_ref(x_9);
-lean_dec(x_1);
-return x_10;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg(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:
 {
@@ -1998,7 +1988,7 @@ lean_closure_set(x_8, 3, x_3);
 lean_inc(x_7);
 lean_inc(x_2);
 lean_inc_ref(x_1);
-x_9 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg___lam__1___boxed), 9, 8);
+x_9 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg___lam__1), 9, 8);
 lean_closure_set(x_9, 0, x_4);
 lean_closure_set(x_9, 1, x_1);
 lean_closure_set(x_9, 2, x_2);
@@ -2012,6 +2002,16 @@ x_11 = lean_apply_4(x_7, lean_box(0), lean_box(0), x_10, x_9);
 return x_11;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg___lam__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs___redArg___lam__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec_ref(x_9);
+lean_dec(x_1);
+return x_10;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_PrettyPrinter_Delaborator_SubExpr_withBoundedAppFnArgs(lean_object* x_1, lean_object* x_2, 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:
 {
diff --git a/stage0/stdlib/Lean/Server/FileWorker.c b/stage0/stdlib/Lean/Server/FileWorker.c
index f8df1848a3..3bceb8589d 100644
--- a/stage0/stdlib/Lean/Server/FileWorker.c
+++ b/stage0/stdlib/Lean/Server/FileWorker.c
@@ -13472,7 +13472,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00Lean_Server_FileWorker_handleRpcRelease_spec__0___redArg(x_1, x_3);
 lean_dec(x_1);
 return x_4;
@@ -13688,7 +13688,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00Lean_Server_FileWorker_handleRpcRelease_spec__0(x_1, x_2, x_4);
 lean_dec(x_2);
 return x_5;
@@ -14765,7 +14765,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DTreeMap_Internal_Impl_insert___at___00Lean_Server_FileWorker_handleRpcConnect_spec__0___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -14943,7 +14943,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Std_DTreeMap_Internal_Impl_insert___at___00Lean_Server_FileWorker_handleRpcConnect_spec__0(x_1, x_6, x_3, x_4, x_5);
 return x_7;
 }
@@ -24344,7 +24344,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_erase___at___00Lean_Server_FileWorker_mainLoop_spec__0___redArg(x_3, x_2);
 return x_4;
 }
@@ -25253,7 +25253,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DTreeMap_Internal_Impl_erase___at___00Lean_Server_FileWorker_mainLoop_spec__0(x_1, x_5, x_3, x_4);
 return x_6;
 }
diff --git a/stage0/stdlib/Lean/Server/FileWorker/WidgetRequests.c b/stage0/stdlib/Lean/Server/FileWorker/WidgetRequests.c
index 7853bd2a35..4af8c5c5dc 100644
--- a/stage0/stdlib/Lean/Server/FileWorker/WidgetRequests.c
+++ b/stage0/stdlib/Lean/Server/FileWorker/WidgetRequests.c
@@ -1529,7 +1529,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_1264552272____hygCtx___hyg_2__spec__0_spec__1_spec__3___redArg(x_1, x_3);
 lean_dec(x_1);
 return x_4;
@@ -2248,7 +2248,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_1264552272____hygCtx___hyg_2__spec__0_spec__1___lam__3(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
@@ -3118,7 +3118,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_1264552272____hygCtx___hyg_2__spec__0_spec__1_spec__3(x_1, x_2, x_4);
 lean_dec(x_2);
 return x_5;
@@ -6070,7 +6070,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_1454953308____hygCtx___hyg_2__spec__0_spec__0___lam__0(x_1, x_2, x_3, x_4, x_9, x_6, x_7);
 return x_10;
 }
@@ -6551,7 +6551,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_616148837____hygCtx___hyg_2__spec__0_spec__0___lam__0(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
@@ -7030,7 +7030,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_3220324137____hygCtx___hyg_2__spec__0_spec__0___lam__0(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
@@ -8654,7 +8654,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_4152489880____hygCtx___hyg_2__spec__1_spec__1___lam__0(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
@@ -9339,7 +9339,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_2425369468____hygCtx___hyg_2__spec__0_spec__0___lam__0(x_1, x_2, x_3, x_4, x_9, x_6, x_7);
 return x_10;
 }
@@ -18587,7 +18587,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Server_FileWorker_WidgetRequests_0__Lean_Widget_initFn_00___x40_Lean_Server_FileWorker_WidgetRequests_2782638367____hygCtx___hyg_2__spec__0_spec__0___lam__0(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
diff --git a/stage0/stdlib/Lean/Server/InfoUtils.c b/stage0/stdlib/Lean/Server/InfoUtils.c
index bb41ce25a6..7a1c9746e8 100644
--- a/stage0/stdlib/Lean/Server/InfoUtils.c
+++ b/stage0/stdlib/Lean/Server/InfoUtils.c
@@ -157,10 +157,10 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_Basic_0__Array_foldlMUnsafe
 LEAN_EXPORT lean_object* l_Lean_Elab_InfoTree_foldInfo___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_InfoTree_foldInfo(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentArray_foldlM___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_InfoTree_foldInfoM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_InfoTree_foldInfoM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2173,15 +2173,6 @@ x_3 = lean_apply_1(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0___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_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec_ref(x_2);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2215,7 +2206,7 @@ lean_dec_ref(x_5);
 lean_inc(x_2);
 lean_inc_ref(x_13);
 lean_inc(x_3);
-x_15 = lean_alloc_closure((void*)(l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0___boxed), 6, 5);
+x_15 = lean_alloc_closure((void*)(l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0), 6, 5);
 lean_closure_set(x_15, 0, x_3);
 lean_closure_set(x_15, 1, x_13);
 lean_closure_set(x_15, 2, x_1);
@@ -2279,6 +2270,15 @@ x_10 = l_Lean_PersistentArray_foldlM___redArg(x_3, x_5, x_8, x_6, x_9);
 return x_10;
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0___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_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec_ref(x_2);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Server_InfoUtils_0__Lean_Elab_InfoTree_foldInfoM_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Server/Rpc/RequestHandling.c b/stage0/stdlib/Lean/Server/Rpc/RequestHandling.c
index 897bf9155c..cc8e9912c6 100644
--- a/stage0/stdlib/Lean/Server/Rpc/RequestHandling.c
+++ b/stage0/stdlib/Lean/Server/Rpc/RequestHandling.c
@@ -468,7 +468,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = l_Lean_Server_instInhabitedRpcProcedure_default___lam__0(x_5, x_2, x_3);
 lean_dec_ref(x_3);
 lean_dec(x_2);
@@ -1082,7 +1082,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Lean_Server_handleRpcCall___lam__0(x_1, x_6, x_3, x_4);
 return x_7;
 }
@@ -1268,7 +1268,7 @@ _start:
 uint8_t x_11; uint64_t x_12; lean_object* x_13; 
 x_11 = lean_unbox(x_4);
 x_12 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_13 = l_Lean_Server_handleRpcCall___lam__3(x_1, x_2, x_3, x_11, x_12, x_6, x_7, x_8, x_9);
 lean_dec_ref(x_8);
 return x_13;
@@ -2983,9 +2983,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lean_Server_wrapRpcProcedure___redArg___lam__0(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -3254,7 +3254,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_11 = l_Lean_Server_wrapRpcProcedure___redArg___lam__3(x_1, x_2, x_3, x_4, x_5, x_10, x_7, x_8);
 return x_11;
 }
diff --git a/stage0/stdlib/Lean/Shell.c b/stage0/stdlib/Lean/Shell.c
index 110254446a..0d61828090 100644
--- a/stage0/stdlib/Lean/Shell.c
+++ b/stage0/stdlib/Lean/Shell.c
@@ -325,21 +325,18 @@ LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_lif
 lean_object* lean_io_error_to_string(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed(lean_object*, lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 47, .m_capacity = 47, .m_length = 46, .m_data = "error: expected numeric argument for option '-"};
 static const lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___closed__0 = (const lean_object*)&l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___closed__0_value;
 static const lean_string_object l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 3, .m_capacity = 3, .m_length = 2, .m_data = "'\n"};
 static const lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___closed__1 = (const lean_object*)&l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___closed__1_value;
-LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed(lean_object*, lean_object*);
 static const lean_string_object l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___closed__0_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 29, .m_capacity = 29, .m_length = 28, .m_data = "error: argument value for '-"};
 static const lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___closed__0 = (const lean_object*)&l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___closed__0_value;
 static const lean_string_object l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___closed__1_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 16, .m_capacity = 16, .m_length = 15, .m_data = "' is too large\n"};
 static const lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___closed__1 = (const lean_object*)&l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___closed__1_value;
-LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed__const__1;
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_IO_eprint___at___00__private_Lean_Shell_0__Lean_ShellOptions_process_spec__0(lean_object*);
@@ -427,7 +424,6 @@ static const lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process___
 static const lean_string_object l___private_Lean_Shell_0__Lean_ShellOptions_process___closed__34_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 50, .m_capacity = 50, .m_length = 49, .m_data = "error: expected numeric argument for option '-j'\n"};
 static const lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process___closed__34 = (const lean_object*)&l___private_Lean_Shell_0__Lean_ShellOptions_process___closed__34_value;
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
-LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
 lean_object* l_String_toName(lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_load_dynlib(lean_object*);
@@ -488,8 +484,6 @@ static const lean_string_object l___private_Lean_Shell_0__Lean_shellMain___close
 static const lean_object* l___private_Lean_Shell_0__Lean_shellMain___closed__10 = (const lean_object*)&l___private_Lean_Shell_0__Lean_shellMain___closed__10_value;
 static const lean_string_object l___private_Lean_Shell_0__Lean_shellMain___closed__11_value = {.m_header = {.m_rc = 0, .m_cs_sz = 0, .m_other = 0, .m_tag = 249}, .m_size = 8, .m_capacity = 8, .m_length = 7, .m_data = "<stdin>"};
 static const lean_object* l___private_Lean_Shell_0__Lean_shellMain___closed__11 = (const lean_object*)&l___private_Lean_Shell_0__Lean_shellMain___closed__11_value;
-LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
-LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
 lean_object* lean_io_exit(uint8_t);
 lean_object* l_Lean_printImportsJson(lean_object*);
 lean_object* l_Lean_profileitIOUnsafe___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2801,15 +2795,6 @@ x_3 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg(x_1);
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -2860,7 +2845,7 @@ goto block_12;
 block_7:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed__const__1;
+x_5 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_6 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_6, 0, x_5);
 return x_6;
@@ -2885,15 +2870,6 @@ x_4 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO(x_1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric(lean_object* x_1) {
 _start:
 {
@@ -2910,7 +2886,7 @@ goto block_6;
 block_6:
 {
 lean_object* x_4; lean_object* x_5; 
-x_4 = l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed__const__1;
+x_4 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_5 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_5, 0, x_4);
 return x_5;
@@ -2926,15 +2902,6 @@ lean_dec_ref(x_1);
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge(lean_object* x_1) {
 _start:
 {
@@ -2951,7 +2918,7 @@ goto block_6;
 block_6:
 {
 lean_object* x_4; lean_object* x_5; 
-x_4 = l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed__const__1;
+x_4 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_5 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_5, 0, x_4);
 return x_5;
@@ -3209,15 +3176,6 @@ static lean_object* _init_l___private_Lean_Shell_0__Lean_ShellOptions_process___
 _start:
 {
 uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
 x_1 = 0;
 x_2 = lean_box_uint32(x_1);
 return x_2;
@@ -7800,7 +7758,7 @@ if (x_1770 == 0)
 lean_object* x_1771; lean_object* x_1772; 
 x_1771 = lean_ctor_get(x_1769, 0);
 lean_dec(x_1771);
-x_1772 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1772 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set_tag(x_1769, 1);
 lean_ctor_set(x_1769, 0, x_1772);
 return x_1769;
@@ -7809,7 +7767,7 @@ else
 {
 lean_object* x_1773; lean_object* x_1774; 
 lean_dec(x_1769);
-x_1773 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1773 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_1774 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_1774, 0, x_1773);
 return x_1774;
@@ -7853,7 +7811,7 @@ if (x_1783 == 0)
 lean_object* x_1784; lean_object* x_1785; 
 x_1784 = lean_ctor_get(x_1782, 0);
 lean_dec(x_1784);
-x_1785 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1785 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set_tag(x_1782, 1);
 lean_ctor_set(x_1782, 0, x_1785);
 return x_1782;
@@ -7862,7 +7820,7 @@ else
 {
 lean_object* x_1786; lean_object* x_1787; 
 lean_dec(x_1782);
-x_1786 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1786 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_1787 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_1787, 0, x_1786);
 return x_1787;
@@ -7907,7 +7865,7 @@ if (x_1797 == 0)
 lean_object* x_1798; lean_object* x_1799; 
 x_1798 = lean_ctor_get(x_1796, 0);
 lean_dec(x_1798);
-x_1799 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1799 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set_tag(x_1796, 1);
 lean_ctor_set(x_1796, 0, x_1799);
 return x_1796;
@@ -7916,7 +7874,7 @@ else
 {
 lean_object* x_1800; lean_object* x_1801; 
 lean_dec(x_1796);
-x_1800 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1800 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_1801 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_1801, 0, x_1800);
 return x_1801;
@@ -7961,7 +7919,7 @@ if (x_1811 == 0)
 lean_object* x_1812; lean_object* x_1813; 
 x_1812 = lean_ctor_get(x_1810, 0);
 lean_dec(x_1812);
-x_1813 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1813 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set_tag(x_1810, 1);
 lean_ctor_set(x_1810, 0, x_1813);
 return x_1810;
@@ -7970,7 +7928,7 @@ else
 {
 lean_object* x_1814; lean_object* x_1815; 
 lean_dec(x_1810);
-x_1814 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1814 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_1815 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_1815, 0, x_1814);
 return x_1815;
@@ -8015,7 +7973,7 @@ if (x_1825 == 0)
 lean_object* x_1826; lean_object* x_1827; 
 x_1826 = lean_ctor_get(x_1824, 0);
 lean_dec(x_1826);
-x_1827 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1827 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set_tag(x_1824, 1);
 lean_ctor_set(x_1824, 0, x_1827);
 return x_1824;
@@ -8024,7 +7982,7 @@ else
 {
 lean_object* x_1828; lean_object* x_1829; 
 lean_dec(x_1824);
-x_1828 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2;
+x_1828 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_1829 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_1829, 0, x_1828);
 return x_1829;
@@ -8371,7 +8329,7 @@ return x_1932;
 block_8:
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_6 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_7 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_7, 0, x_6);
 return x_7;
@@ -8388,7 +8346,7 @@ goto block_8;
 block_16:
 {
 lean_object* x_14; lean_object* x_15; 
-x_14 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_14 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_15 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_15, 0, x_14);
 return x_15;
@@ -8396,7 +8354,7 @@ return x_15;
 block_20:
 {
 lean_object* x_18; lean_object* x_19; 
-x_18 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_18 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_19 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_19, 0, x_18);
 return x_19;
@@ -8404,7 +8362,7 @@ return x_19;
 block_24:
 {
 lean_object* x_22; lean_object* x_23; 
-x_22 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_22 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_23 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_23, 0, x_22);
 return x_23;
@@ -8421,7 +8379,7 @@ goto block_24;
 block_32:
 {
 lean_object* x_30; lean_object* x_31; 
-x_30 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_30 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_31 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_31, 0, x_30);
 return x_31;
@@ -8438,7 +8396,7 @@ goto block_32;
 block_40:
 {
 lean_object* x_38; lean_object* x_39; 
-x_38 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_38 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_39 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_39, 0, x_38);
 return x_39;
@@ -8455,7 +8413,7 @@ goto block_40;
 block_48:
 {
 lean_object* x_46; lean_object* x_47; 
-x_46 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_46 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_47 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_47, 0, x_46);
 return x_47;
@@ -8472,7 +8430,7 @@ goto block_48;
 block_56:
 {
 lean_object* x_54; lean_object* x_55; 
-x_54 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_54 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_55 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_55, 0, x_54);
 return x_55;
@@ -8480,7 +8438,7 @@ return x_55;
 block_60:
 {
 lean_object* x_58; lean_object* x_59; 
-x_58 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_58 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_59 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_59, 0, x_58);
 return x_59;
@@ -8488,7 +8446,7 @@ return x_59;
 block_64:
 {
 lean_object* x_62; lean_object* x_63; 
-x_62 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_62 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_63 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_63, 0, x_62);
 return x_63;
@@ -8505,7 +8463,7 @@ goto block_64;
 block_72:
 {
 lean_object* x_70; lean_object* x_71; 
-x_70 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_70 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_71 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_71, 0, x_70);
 return x_71;
@@ -8522,7 +8480,7 @@ goto block_72;
 block_80:
 {
 lean_object* x_78; lean_object* x_79; 
-x_78 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_78 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_79 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_79, 0, x_78);
 return x_79;
@@ -8530,7 +8488,7 @@ return x_79;
 block_84:
 {
 lean_object* x_82; lean_object* x_83; 
-x_82 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_82 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_83 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_83, 0, x_82);
 return x_83;
@@ -8547,7 +8505,7 @@ goto block_84;
 block_92:
 {
 lean_object* x_90; lean_object* x_91; 
-x_90 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_90 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_91 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_91, 0, x_90);
 return x_91;
@@ -8555,7 +8513,7 @@ return x_91;
 block_96:
 {
 lean_object* x_94; lean_object* x_95; 
-x_94 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_94 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_95 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_95, 0, x_94);
 return x_95;
@@ -8563,7 +8521,7 @@ return x_95;
 block_100:
 {
 lean_object* x_98; lean_object* x_99; 
-x_98 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_98 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_99 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_99, 0, x_98);
 return x_99;
@@ -8580,7 +8538,7 @@ goto block_100;
 block_108:
 {
 lean_object* x_106; lean_object* x_107; 
-x_106 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_106 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_107 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_107, 0, x_106);
 return x_107;
@@ -8597,7 +8555,7 @@ goto block_108;
 block_116:
 {
 lean_object* x_114; lean_object* x_115; 
-x_114 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_114 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_115 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_115, 0, x_114);
 return x_115;
@@ -8614,7 +8572,7 @@ goto block_116;
 block_124:
 {
 lean_object* x_122; lean_object* x_123; 
-x_122 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_122 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_123 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_123, 0, x_122);
 return x_123;
@@ -8631,7 +8589,7 @@ goto block_124;
 block_132:
 {
 lean_object* x_130; lean_object* x_131; 
-x_130 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_130 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_131 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_131, 0, x_130);
 return x_131;
@@ -8668,7 +8626,7 @@ if (x_145 == 0)
 lean_object* x_146; lean_object* x_147; 
 x_146 = lean_ctor_get(x_144, 0);
 lean_dec(x_146);
-x_147 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_147 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 lean_ctor_set_tag(x_144, 1);
 lean_ctor_set(x_144, 0, x_147);
 return x_144;
@@ -8677,7 +8635,7 @@ else
 {
 lean_object* x_148; lean_object* x_149; 
 lean_dec(x_144);
-x_148 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_148 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_149 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_149, 0, x_148);
 return x_149;
@@ -8709,7 +8667,7 @@ goto block_153;
 block_161:
 {
 lean_object* x_159; lean_object* x_160; 
-x_159 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_159 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_160 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_160, 0, x_159);
 return x_160;
@@ -8726,7 +8684,7 @@ goto block_161;
 block_169:
 {
 lean_object* x_167; lean_object* x_168; 
-x_167 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_167 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_168 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_168, 0, x_167);
 return x_168;
@@ -8743,7 +8701,7 @@ goto block_169;
 block_177:
 {
 lean_object* x_175; lean_object* x_176; 
-x_175 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_175 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_176 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_176, 0, x_175);
 return x_176;
@@ -8760,7 +8718,7 @@ goto block_177;
 block_185:
 {
 lean_object* x_183; lean_object* x_184; 
-x_183 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_183 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_184 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_184, 0, x_183);
 return x_184;
@@ -8777,7 +8735,7 @@ goto block_185;
 block_193:
 {
 lean_object* x_191; lean_object* x_192; 
-x_191 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_191 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_192 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_192, 0, x_191);
 return x_192;
@@ -8794,7 +8752,7 @@ goto block_193;
 block_201:
 {
 lean_object* x_199; lean_object* x_200; 
-x_199 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_199 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_200 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_200, 0, x_199);
 return x_200;
@@ -8802,7 +8760,7 @@ return x_200;
 block_205:
 {
 lean_object* x_203; lean_object* x_204; 
-x_203 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_203 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_204 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_204, 0, x_203);
 return x_204;
@@ -8819,7 +8777,7 @@ goto block_205;
 block_213:
 {
 lean_object* x_211; lean_object* x_212; 
-x_211 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_211 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_212 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_212, 0, x_211);
 return x_212;
@@ -8836,7 +8794,7 @@ goto block_213;
 block_221:
 {
 lean_object* x_219; lean_object* x_220; 
-x_219 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_219 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_220 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_220, 0, x_219);
 return x_220;
@@ -8853,7 +8811,7 @@ goto block_221;
 block_229:
 {
 lean_object* x_227; lean_object* x_228; 
-x_227 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_227 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_228 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_228, 0, x_227);
 return x_228;
@@ -8870,7 +8828,7 @@ goto block_229;
 block_237:
 {
 lean_object* x_235; lean_object* x_236; 
-x_235 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_235 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_236 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_236, 0, x_235);
 return x_236;
@@ -8887,7 +8845,7 @@ goto block_237;
 block_245:
 {
 lean_object* x_243; lean_object* x_244; 
-x_243 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_243 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_244 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_244, 0, x_243);
 return x_244;
@@ -8904,7 +8862,7 @@ goto block_245;
 block_253:
 {
 lean_object* x_251; lean_object* x_252; 
-x_251 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
+x_251 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_252 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_252, 0, x_251);
 return x_252;
@@ -9294,24 +9252,6 @@ lean_ctor_set(x_4, 2, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 1;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2() {
-_start:
-{
-uint32_t x_1; lean_object* x_2; 
-x_1 = 0;
-x_2 = lean_box_uint32(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* lean_shell_main(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -9411,7 +9351,7 @@ if (x_345 == 0)
 lean_object* x_346; lean_object* x_347; 
 x_346 = lean_ctor_get(x_344, 0);
 lean_dec(x_346);
-x_347 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_347 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set(x_344, 0, x_347);
 return x_344;
 }
@@ -9419,7 +9359,7 @@ else
 {
 lean_object* x_348; lean_object* x_349; 
 lean_dec(x_344);
-x_348 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_348 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_349 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_349, 0, x_348);
 return x_349;
@@ -9516,7 +9456,7 @@ if (x_362 == 0)
 lean_object* x_363; lean_object* x_364; 
 x_363 = lean_ctor_get(x_361, 0);
 lean_dec(x_363);
-x_364 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_364 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set(x_361, 0, x_364);
 return x_361;
 }
@@ -9524,7 +9464,7 @@ else
 {
 lean_object* x_365; lean_object* x_366; 
 lean_dec(x_361);
-x_365 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_365 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_366 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_366, 0, x_365);
 return x_366;
@@ -9573,7 +9513,7 @@ return x_372;
 block_7:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_5 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_6 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_6, 0, x_5);
 return x_6;
@@ -9626,7 +9566,7 @@ goto block_7;
 else
 {
 lean_object* x_18; 
-x_18 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_18 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set_tag(x_8, 0);
 lean_ctor_set(x_8, 0, x_18);
 return x_8;
@@ -9643,7 +9583,7 @@ goto block_7;
 else
 {
 lean_object* x_19; lean_object* x_20; 
-x_19 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_19 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_20 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_20, 0, x_19);
 return x_20;
@@ -9665,7 +9605,7 @@ if (x_25 == 0)
 lean_object* x_26; lean_object* x_27; 
 x_26 = lean_ctor_get(x_24, 0);
 lean_dec(x_26);
-x_27 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_27 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set(x_24, 0, x_27);
 return x_24;
 }
@@ -9673,7 +9613,7 @@ else
 {
 lean_object* x_28; lean_object* x_29; 
 lean_dec(x_24);
-x_28 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_28 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_29 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_29, 0, x_28);
 return x_29;
@@ -9891,7 +9831,7 @@ if (x_99 == 0)
 lean_object* x_100; lean_object* x_101; 
 x_100 = lean_ctor_get(x_98, 0);
 lean_dec(x_100);
-x_101 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_101 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 lean_ctor_set(x_98, 0, x_101);
 return x_98;
 }
@@ -9899,7 +9839,7 @@ else
 {
 lean_object* x_102; lean_object* x_103; 
 lean_dec(x_98);
-x_102 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_102 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_103 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_103, 0, x_102);
 return x_103;
@@ -10067,7 +10007,7 @@ if (lean_is_exclusive(x_129)) {
  lean_dec_ref(x_129);
  x_130 = lean_box(0);
 }
-x_131 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_131 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 if (lean_is_scalar(x_130)) {
  x_132 = lean_alloc_ctor(0, 1, 0);
 } else {
@@ -10455,7 +10395,7 @@ if (x_201 == 0)
 lean_object* x_202; lean_object* x_203; 
 x_202 = lean_ctor_get(x_200, 0);
 lean_dec(x_202);
-x_203 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_203 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 lean_ctor_set(x_200, 0, x_203);
 return x_200;
 }
@@ -10463,7 +10403,7 @@ else
 {
 lean_object* x_204; lean_object* x_205; 
 lean_dec(x_200);
-x_204 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_204 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_205 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_205, 0, x_204);
 return x_205;
@@ -10613,7 +10553,7 @@ if (x_232 == 0)
 lean_object* x_233; lean_object* x_234; 
 x_233 = lean_ctor_get(x_231, 0);
 lean_dec(x_233);
-x_234 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_234 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set(x_231, 0, x_234);
 return x_231;
 }
@@ -10621,7 +10561,7 @@ else
 {
 lean_object* x_235; lean_object* x_236; 
 lean_dec(x_231);
-x_235 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_235 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_236 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_236, 0, x_235);
 return x_236;
@@ -10673,7 +10613,7 @@ if (x_242 == 0)
 lean_object* x_243; lean_object* x_244; 
 x_243 = lean_ctor_get(x_241, 0);
 lean_dec(x_243);
-x_244 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_244 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 lean_ctor_set(x_241, 0, x_244);
 return x_241;
 }
@@ -10681,7 +10621,7 @@ else
 {
 lean_object* x_245; lean_object* x_246; 
 lean_dec(x_241);
-x_245 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2;
+x_245 = l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1;
 x_246 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_246, 0, x_245);
 return x_246;
@@ -10808,7 +10748,7 @@ if (x_270 == 0)
 lean_object* x_271; lean_object* x_272; 
 x_271 = lean_ctor_get(x_269, 0);
 lean_dec(x_271);
-x_272 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_272 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 lean_ctor_set(x_269, 0, x_272);
 return x_269;
 }
@@ -10816,7 +10756,7 @@ else
 {
 lean_object* x_273; lean_object* x_274; 
 lean_dec(x_269);
-x_273 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_273 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_274 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_274, 0, x_273);
 return x_274;
@@ -10910,7 +10850,7 @@ if (x_291 == 0)
 lean_object* x_292; lean_object* x_293; 
 x_292 = lean_ctor_get(x_290, 0);
 lean_dec(x_292);
-x_293 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_293 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 lean_ctor_set(x_290, 0, x_293);
 return x_290;
 }
@@ -10918,7 +10858,7 @@ else
 {
 lean_object* x_294; lean_object* x_295; 
 lean_dec(x_290);
-x_294 = l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1;
+x_294 = l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1;
 x_295 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_295, 0, x_294);
 return x_295;
@@ -11259,18 +11199,10 @@ l___private_Lean_Shell_0__Lean_mkShellOptions___closed__2 = _init_l___private_Le
 lean_mark_persistent(l___private_Lean_Shell_0__Lean_mkShellOptions___closed__2);
 l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___redArg___boxed__const__1);
-l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed__const__1 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process_liftIO___boxed__const__1);
-l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed__const__1 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process_throwExpectedNumeric___boxed__const__1);
-l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed__const__1 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process_throwTooLarge___boxed__const__1);
 l___private_Lean_Shell_0__Lean_ShellOptions_process___closed__25 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process___closed__25();
 lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process___closed__25);
 l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__1);
-l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2 = _init_l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2();
-lean_mark_persistent(l___private_Lean_Shell_0__Lean_ShellOptions_process___boxed__const__2);
 l_String_dropPrefix_x3f___at___00__private_Lean_Shell_0__Lean_shellMain_spec__2___redArg___closed__1 = _init_l_String_dropPrefix_x3f___at___00__private_Lean_Shell_0__Lean_shellMain_spec__2___redArg___closed__1();
 lean_mark_persistent(l_String_dropPrefix_x3f___at___00__private_Lean_Shell_0__Lean_shellMain_spec__2___redArg___closed__1);
 l___private_Lean_Shell_0__Lean_shellMain___closed__0 = _init_l___private_Lean_Shell_0__Lean_shellMain___closed__0();
@@ -11278,10 +11210,6 @@ l___private_Lean_Shell_0__Lean_shellMain___closed__7 = _init_l___private_Lean_Sh
 lean_mark_persistent(l___private_Lean_Shell_0__Lean_shellMain___closed__7);
 l___private_Lean_Shell_0__Lean_shellMain___closed__8 = _init_l___private_Lean_Shell_0__Lean_shellMain___closed__8();
 lean_mark_persistent(l___private_Lean_Shell_0__Lean_shellMain___closed__8);
-l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1 = _init_l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1();
-lean_mark_persistent(l___private_Lean_Shell_0__Lean_shellMain___boxed__const__1);
-l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2 = _init_l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2();
-lean_mark_persistent(l___private_Lean_Shell_0__Lean_shellMain___boxed__const__2);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/SubExpr.c b/stage0/stdlib/Lean/SubExpr.c
index 8d6805a26a..ab7814303f 100644
--- a/stage0/stdlib/Lean/SubExpr.c
+++ b/stage0/stdlib/Lean/SubExpr.c
@@ -735,15 +735,6 @@ lean_dec(x_2);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_SubExpr_Pos_foldrM___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_SubExpr_Pos_foldrM___redArg(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_SubExpr_Pos_foldrM___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -758,7 +749,7 @@ x_7 = l_Lean_SubExpr_Pos_head(x_3);
 lean_inc(x_2);
 x_8 = lean_apply_2(x_2, x_7, x_4);
 x_9 = l_Lean_SubExpr_Pos_tail(x_3);
-x_10 = lean_alloc_closure((void*)(l_Lean_SubExpr_Pos_foldrM___redArg___boxed), 4, 3);
+x_10 = lean_alloc_closure((void*)(l_Lean_SubExpr_Pos_foldrM___redArg), 4, 3);
 lean_closure_set(x_10, 0, x_1);
 lean_closure_set(x_10, 1, x_2);
 lean_closure_set(x_10, 2, x_9);
@@ -780,6 +771,15 @@ return x_14;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_SubExpr_Pos_foldrM___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l_Lean_SubExpr_Pos_foldrM___redArg(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_SubExpr_Pos_foldrM(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:
 {
diff --git a/stage0/stdlib/Lean/ToExpr.c b/stage0/stdlib/Lean/ToExpr.c
index 7faab092b2..4a4295f1a3 100644
--- a/stage0/stdlib/Lean/ToExpr.c
+++ b/stage0/stdlib/Lean/ToExpr.c
@@ -1382,7 +1382,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_instToExprUInt64___lam__0(x_2);
 return x_3;
 }
@@ -1931,7 +1931,7 @@ _start:
 {
 uint64_t x_2; lean_object* x_3; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Lean_instToExprInt64___lam__0(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Lean/Util/Profiler.c b/stage0/stdlib/Lean/Util/Profiler.c
index ce9e3982d1..2e8c84abf9 100644
--- a/stage0/stdlib/Lean/Util/Profiler.c
+++ b/stage0/stdlib/Lean/Util/Profiler.c
@@ -16961,7 +16961,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0_spec__2___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -17108,7 +17108,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_Const_alter___at___00Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0_spec__4___redArg(x_1, x_4, x_3);
 return x_5;
 }
@@ -17350,7 +17350,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0___redArg(x_1, x_2, x_4);
 return x_5;
 }
@@ -17373,7 +17373,7 @@ lean_inc_ref(x_1);
 lean_inc(x_7);
 x_8 = lean_apply_1(x_1, x_7);
 x_9 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_10 = l_Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0___redArg(x_7, x_5, x_9);
 x_11 = 1;
 x_12 = lean_usize_add(x_4, x_11);
@@ -17963,7 +17963,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_6 = l_Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0(x_1, x_2, x_3, x_5);
 return x_6;
 }
@@ -18002,7 +18002,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DHashMap_Internal_AssocList_contains___at___00Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0_spec__2(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -18030,7 +18030,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DHashMap_Internal_AssocList_Const_alter___at___00Std_DHashMap_Internal_Raw_u2080_Const_alter___at___00Array_groupByKey___at___00Lean_Firefox_Profile_export_spec__0_spec__0_spec__4(x_1, x_2, x_5, x_4);
 return x_6;
 }
diff --git a/stage0/stdlib/Lean/Util/ShareCommon.c b/stage0/stdlib/Lean/Util/ShareCommon.c
index 329a1c626e..818b1a9a3f 100644
--- a/stage0/stdlib/Lean/Util/ShareCommon.c
+++ b/stage0/stdlib/Lean/Util/ShareCommon.c
@@ -382,7 +382,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -417,7 +417,7 @@ x_30 = 32;
 x_31 = lean_unbox_uint64(x_29);
 x_32 = lean_uint64_shift_right(x_31, x_30);
 x_33 = lean_unbox_uint64(x_29);
-lean_dec(x_29);
+lean_dec_ref(x_29);
 x_34 = lean_uint64_xor(x_33, x_32);
 x_35 = 16;
 x_36 = lean_uint64_shift_right(x_34, x_35);
@@ -499,7 +499,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -726,7 +726,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -805,7 +805,7 @@ x_45 = 32;
 x_46 = lean_unbox_uint64(x_44);
 x_47 = lean_uint64_shift_right(x_46, x_45);
 x_48 = lean_unbox_uint64(x_44);
-lean_dec(x_44);
+lean_dec_ref(x_44);
 x_49 = lean_uint64_xor(x_48, x_47);
 x_50 = 16;
 x_51 = lean_uint64_shift_right(x_49, x_50);
@@ -938,7 +938,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -1035,7 +1035,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -1491,7 +1491,7 @@ lean_object* x_5; uint64_t x_6; size_t x_7; lean_object* x_8;
 lean_inc(x_4);
 x_5 = lean_apply_1(x_2, x_4);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_to_usize(x_6);
 x_8 = l_Lean_PersistentHashMap_findAux___at___00Lean_PersistentHashMap_find_x3f___at___00Lean_ShareCommon_persistentObjectFactory___elam__1_spec__2_spec__3___redArg(x_1, x_3, x_7, x_4);
 return x_8;
@@ -1783,7 +1783,7 @@ lean_object* x_5; uint64_t x_6; size_t x_7; lean_object* x_8;
 lean_inc(x_4);
 x_5 = lean_apply_1(x_2, x_4);
 x_6 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_7 = lean_uint64_to_usize(x_6);
 x_8 = l_Lean_PersistentHashMap_findEntryAux___at___00Lean_PersistentHashMap_findEntry_x3f___at___00Lean_ShareCommon_persistentObjectFactory___elam__4_spec__7_spec__10___redArg(x_1, x_3, x_7, x_4);
 return x_8;
@@ -2337,7 +2337,7 @@ lean_inc_ref(x_2);
 lean_inc(x_10);
 x_12 = lean_apply_1(x_2, x_10);
 x_13 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_14 = lean_uint64_to_usize(x_13);
 x_15 = 5;
 x_16 = lean_unsigned_to_nat(1u);
@@ -2390,7 +2390,7 @@ lean_inc_ref(x_2);
 lean_inc(x_4);
 x_6 = lean_apply_1(x_2, x_4);
 x_7 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = 1;
 x_10 = l_Lean_PersistentHashMap_insertAux___at___00Lean_PersistentHashMap_insert___at___00Lean_ShareCommon_persistentObjectFactory___elam__2_spec__4_spec__6___redArg(x_1, x_2, x_3, x_8, x_9, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Widget/Commands.c b/stage0/stdlib/Lean/Widget/Commands.c
index 969daf4e04..acbcf08fd8 100644
--- a/stage0/stdlib/Lean/Widget/Commands.c
+++ b/stage0/stdlib/Lean/Widget/Commands.c
@@ -3813,7 +3813,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_erase___at___00Lean_Widget_erasePanelWidget___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__7_spec__20___redArg(x_3, x_2);
 return x_4;
 }
@@ -3831,7 +3831,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Lean_Widget_erasePanelWidget___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__7___redArg___lam__0(x_3, x_2);
 return x_4;
 }
@@ -4023,7 +4023,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = l_Lean_Widget_erasePanelWidget___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__7___redArg(x_5, x_2, x_3);
 lean_dec(x_3);
 lean_dec(x_2);
@@ -4076,7 +4076,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DTreeMap_Internal_Impl_Const_getD___at___00Lean_Widget_addPanelWidgetLocal___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__2_spec__10___redArg(x_1, x_4, x_3);
 lean_dec(x_3);
 lean_dec(x_1);
@@ -5069,7 +5069,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DTreeMap_Internal_Impl_insert___at___00Lean_Widget_addPanelWidgetLocal___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__2_spec__11___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -5399,7 +5399,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = l_Lean_Widget_addPanelWidgetScoped___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__5(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -5428,7 +5428,7 @@ _start:
 {
 uint64_t x_10; lean_object* x_11; 
 x_10 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_11 = l_Lean_Widget_addPanelWidgetGlobal___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__4(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -8997,7 +8997,7 @@ _start:
 {
 uint64_t x_9; lean_object* x_10; 
 x_9 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_10 = l_Lean_Widget_erasePanelWidget___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__7(x_9, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_7);
 lean_dec_ref(x_6);
@@ -9087,7 +9087,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DTreeMap_Internal_Impl_Const_getD___at___00Lean_Widget_addPanelWidgetLocal___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__2_spec__10(x_1, x_2, x_5, x_4);
 lean_dec(x_4);
 lean_dec(x_2);
@@ -9107,7 +9107,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Std_DTreeMap_Internal_Impl_insert___at___00Lean_Widget_addPanelWidgetLocal___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__2_spec__11(x_1, x_6, x_3, x_4, x_5);
 return x_7;
 }
@@ -9147,7 +9147,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DTreeMap_Internal_Impl_erase___at___00Lean_Widget_erasePanelWidget___at___00Lean_Widget_elabShowPanelWidgetsCmd_spec__7_spec__20(x_1, x_5, x_3, x_4);
 return x_6;
 }
diff --git a/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c b/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c
index 3265326ab8..75ac820ad7 100644
--- a/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c
+++ b/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c
@@ -464,8 +464,8 @@ extern lean_object* l_Std_Format_defWidth;
 lean_object* l_Std_Format_pretty(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt___lam__0(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt___lam__0___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Widget_TaggedText_rewrite___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Widget_InteractiveDiagnostic_toDiagnostic(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_mkPPContext(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_mkPPContext___boxed(lean_object*, lean_object*);
@@ -11316,6 +11316,16 @@ return x_24;
 }
 }
 }
+LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt___lam__0), 2, 0);
+x_3 = l_Lean_Widget_TaggedText_rewrite___redArg(x_2, x_1);
+x_4 = l_Lean_Widget_TaggedText_stripTags___redArg(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt___lam__0___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -11325,16 +11335,6 @@ lean_dec_ref(x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_InteractiveDiagnostic_toDiagnostic_prettyTt___lam__0___boxed), 2, 0);
-x_3 = l_Lean_Widget_TaggedText_rewrite___redArg(x_2, x_1);
-x_4 = l_Lean_Widget_TaggedText_stripTags___redArg(x_3);
-return x_4;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Widget_InteractiveDiagnostic_toDiagnostic(lean_object* x_1) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Widget/TaggedText.c b/stage0/stdlib/Lean/Widget/TaggedText.c
index fa02bd89fe..fa7da1ebcd 100644
--- a/stage0/stdlib/Lean/Widget/TaggedText.c
+++ b/stage0/stdlib/Lean/Widget/TaggedText.c
@@ -64,12 +64,12 @@ static const lean_ctor_object l_Lean_Widget_instReprTaggedText_repr___redArg___c
 static const lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg___closed__9 = (const lean_object*)&l_Lean_Widget_instReprTaggedText_repr___redArg___closed__9_value;
 static const lean_ctor_object l_Lean_Widget_instReprTaggedText_repr___redArg___closed__10_value = {.m_header = {.m_rc = 0, .m_cs_sz = sizeof(lean_ctor_object) + sizeof(void*)*2 + 0, .m_other = 2, .m_tag = 5}, .m_objs = {((lean_object*)&l_Lean_Widget_instReprTaggedText_repr___redArg___closed__9_value),((lean_object*)(((size_t)(1) << 1) | 1))}};
 static const lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg___closed__10 = (const lean_object*)&l_Lean_Widget_instReprTaggedText_repr___redArg___closed__10_value;
-LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_quote(lean_object*);
 lean_object* l_Repr_addAppParen(lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_repr___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText___redArg(lean_object*);
@@ -672,15 +672,6 @@ x_2 = lean_nat_to_int(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Widget_instReprTaggedText_repr___redArg(x_1, x_2, x_3);
-lean_dec(x_3);
-return x_4;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -746,7 +737,7 @@ lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_31; uint
 x_20 = lean_ctor_get(x_2, 0);
 lean_inc_ref(x_20);
 lean_dec_ref(x_2);
-x_21 = lean_alloc_closure((void*)(l_Lean_Widget_instReprTaggedText_repr___redArg___boxed), 3, 1);
+x_21 = lean_alloc_closure((void*)(l_Lean_Widget_instReprTaggedText_repr___redArg), 3, 1);
 lean_closure_set(x_21, 0, x_1);
 x_31 = lean_unsigned_to_nat(1024u);
 x_32 = lean_nat_dec_le(x_31, x_3);
@@ -850,6 +841,15 @@ return x_50;
 }
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Widget_instReprTaggedText_repr___redArg(x_1, x_2, x_3);
+lean_dec(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Widget_instReprTaggedText_repr(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Widget/UserWidget.c b/stage0/stdlib/Lean/Widget/UserWidget.c
index 2506785e5d..a26d650168 100644
--- a/stage0/stdlib/Lean/Widget/UserWidget.c
+++ b/stage0/stdlib/Lean/Widget/UserWidget.c
@@ -1799,7 +1799,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DTreeMap_Internal_Impl_insert___at___00Lean_Widget_addBuiltinModule_spec__0___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -1842,7 +1842,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Std_DTreeMap_Internal_Impl_insert___at___00Lean_Widget_addBuiltinModule_spec__0(x_1, x_6, x_3, x_4, x_5);
 return x_7;
 }
@@ -3407,7 +3407,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00Lean_Widget_initFn_00___x40_Lean_Widget_UserWidget_3570059497____hygCtx___hyg_2__spec__2___redArg(x_1, x_3);
 lean_dec(x_1);
 return x_4;
@@ -4742,7 +4742,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00Lean_Widget_initFn_00___x40_Lean_Widget_UserWidget_3570059497____hygCtx___hyg_2__spec__2(x_1, x_2, x_4);
 lean_dec(x_2);
 return x_5;
@@ -5400,7 +5400,7 @@ _start:
 {
 uint64_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_contains___at___00Lean_Widget_getWidgetSource_spec__1___redArg(x_3, x_2);
 lean_dec(x_2);
 x_5 = lean_box(x_4);
@@ -5443,7 +5443,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lean_Widget_getWidgetSource___lam__0(x_1, x_4, x_3);
 lean_dec_ref(x_3);
 lean_dec(x_1);
@@ -5587,7 +5587,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_7 = l_Lean_Widget_getWidgetSource___lam__3(x_6, x_2, x_3, x_4);
 return x_7;
 }
@@ -5706,7 +5706,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DTreeMap_Internal_Impl_contains___at___00Lean_Widget_getWidgetSource_spec__1(x_1, x_4, x_3);
 lean_dec(x_3);
 x_6 = lean_box(x_5);
@@ -6619,7 +6619,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Widget_UserWidget_0__Lean_Widget_initFn_00___x40_Lean_Widget_UserWidget_2369312278____hygCtx___hyg_2__spec__0_spec__1___lam__3(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
@@ -7113,7 +7113,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_DTreeMap_Internal_Impl_Const_getD___at___00__private_Lean_Widget_UserWidget_0__Lean_Widget_initFn_00___x40_Lean_Widget_UserWidget_1015473889____hygCtx___hyg_2__spec__0___redArg(x_1, x_4, x_3);
 lean_dec(x_3);
 lean_dec(x_1);
@@ -7230,7 +7230,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_DTreeMap_Internal_Impl_Const_getD___at___00__private_Lean_Widget_UserWidget_0__Lean_Widget_initFn_00___x40_Lean_Widget_UserWidget_1015473889____hygCtx___hyg_2__spec__0(x_1, x_2, x_5, x_4);
 lean_dec(x_4);
 lean_dec(x_2);
@@ -7559,7 +7559,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_7 = l_Lean_Widget_addPanelWidgetGlobal___redArg(x_1, x_2, x_3, x_6, x_5);
 return x_7;
 }
@@ -7577,7 +7577,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_8 = l_Lean_Widget_addPanelWidgetGlobal(x_1, x_2, x_3, x_4, x_7, x_6);
 return x_8;
 }
@@ -7601,7 +7601,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_7 = l_Lean_Widget_addPanelWidgetScoped___redArg(x_1, x_2, x_3, x_6, x_5);
 return x_7;
 }
@@ -7619,7 +7619,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_8 = l_Lean_Widget_addPanelWidgetScoped(x_1, x_2, x_3, x_4, x_7, x_6);
 return x_8;
 }
@@ -7659,9 +7659,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lean_Widget_addPanelWidgetLocal___redArg___lam__0(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -7744,7 +7744,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Lean_Widget_erasePanelWidget___redArg___lam__1(x_1, x_4, x_3);
 return x_5;
 }
@@ -7772,7 +7772,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Lean_Widget_erasePanelWidget___redArg(x_1, x_3);
 return x_4;
 }
@@ -7790,7 +7790,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_6 = l_Lean_Widget_erasePanelWidget(x_1, x_2, x_3, x_5);
 lean_dec_ref(x_2);
 return x_6;
@@ -7884,7 +7884,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_7 = l_Lean_Widget_WidgetInstance_ofHash(x_6, x_2, x_3, x_4);
 lean_dec(x_4);
 lean_dec_ref(x_3);
@@ -8156,7 +8156,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_8 = l_Lean_Widget_savePanelWidgetInfo(x_7, x_2, x_3, x_4, x_5);
 lean_dec(x_5);
 lean_dec_ref(x_4);
@@ -11023,7 +11023,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_4);
-lean_dec(x_4);
+lean_dec_ref(x_4);
 x_9 = l_Lean_Server_wrapRpcProcedure___at___00Lean_Server_registerBuiltinRpcProcedure___at___00__private_Lean_Widget_UserWidget_0__Lean_Widget_initFn_00___x40_Lean_Widget_UserWidget_915949662____hygCtx___hyg_2__spec__0_spec__0___lam__0(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
diff --git a/stage0/stdlib/Std/Data/ByteSlice.c b/stage0/stdlib/Std/Data/ByteSlice.c
index 24866ced16..c959f3af38 100644
--- a/stage0/stdlib/Std/Data/ByteSlice.c
+++ b/stage0/stdlib/Std/Data/ByteSlice.c
@@ -54,14 +54,14 @@ static const lean_closure_object l_ByteSlice_instBEq___closed__0_value = {.m_hea
 static const lean_object* l_ByteSlice_instBEq___closed__0 = (const lean_object*)&l_ByteSlice_instBEq___closed__0_value;
 LEAN_EXPORT const lean_object* l_ByteSlice_instBEq = (const lean_object*)&l_ByteSlice_instBEq___closed__0_value;
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteSlice_foldrM___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteSlice_foldrM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteSlice_forM___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ByteSlice_forM(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -464,16 +464,6 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0___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_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -505,7 +495,7 @@ x_12 = lean_unsigned_to_nat(1u);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_4);
-x_13 = lean_alloc_closure((void*)(l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0___boxed), 6, 5);
+x_13 = lean_alloc_closure((void*)(l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0), 6, 5);
 lean_closure_set(x_13, 0, x_4);
 lean_closure_set(x_13, 1, x_12);
 lean_closure_set(x_13, 2, x_1);
@@ -535,6 +525,16 @@ x_8 = l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg(x_3, x_4,
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0___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_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop(lean_object* x_1, 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:
 {
@@ -561,15 +561,6 @@ x_8 = l___private_Std_Data_ByteSlice_0__ByteSlice_foldrM_loop___redArg(x_3, x_4,
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0___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___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_1);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -601,7 +592,7 @@ lean_inc(x_11);
 lean_inc_ref(x_3);
 lean_inc(x_2);
 lean_inc(x_4);
-x_12 = lean_alloc_closure((void*)(l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0___boxed), 5, 4);
+x_12 = lean_alloc_closure((void*)(l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0), 5, 4);
 lean_closure_set(x_12, 0, x_4);
 lean_closure_set(x_12, 1, x_1);
 lean_closure_set(x_12, 2, x_2);
@@ -626,6 +617,15 @@ x_8 = l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg(x_2, x_3, x
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0___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___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop___redArg___lam__0(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_1);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Std_Data_ByteSlice_0__ByteSlice_forM_loop(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
diff --git a/stage0/stdlib/Std/Data/DHashMap/Basic.c b/stage0/stdlib/Std/Data/DHashMap/Basic.c
index d4cc151036..b8400b1c37 100644
--- a/stage0/stdlib/Std/Data/DHashMap/Basic.c
+++ b/stage0/stdlib/Std/Data/DHashMap/Basic.c
@@ -908,7 +908,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -1000,7 +1000,7 @@ x_51 = 32;
 x_52 = lean_unbox_uint64(x_50);
 x_53 = lean_uint64_shift_right(x_52, x_51);
 x_54 = lean_unbox_uint64(x_50);
-lean_dec(x_50);
+lean_dec_ref(x_50);
 x_55 = lean_uint64_xor(x_54, x_53);
 x_56 = 16;
 x_57 = lean_uint64_shift_right(x_55, x_56);
@@ -1100,7 +1100,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -1192,7 +1192,7 @@ x_53 = 32;
 x_54 = lean_unbox_uint64(x_52);
 x_55 = lean_uint64_shift_right(x_54, x_53);
 x_56 = lean_unbox_uint64(x_52);
-lean_dec(x_52);
+lean_dec_ref(x_52);
 x_57 = lean_uint64_xor(x_56, x_55);
 x_58 = 16;
 x_59 = lean_uint64_shift_right(x_57, x_58);
@@ -1288,7 +1288,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1433,7 +1433,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
@@ -1578,7 +1578,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1718,7 +1718,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -2240,7 +2240,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -2380,7 +2380,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
diff --git a/stage0/stdlib/Std/Data/DHashMap/Internal/Defs.c b/stage0/stdlib/Std/Data/DHashMap/Internal/Defs.c
index e859319504..e3d8162e6c 100644
--- a/stage0/stdlib/Std/Data/DHashMap/Internal/Defs.c
+++ b/stage0/stdlib/Std/Data/DHashMap/Internal/Defs.c
@@ -548,7 +548,7 @@ x_7 = 32;
 x_8 = lean_unbox_uint64(x_6);
 x_9 = lean_uint64_shift_right(x_8, x_7);
 x_10 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_11 = lean_uint64_xor(x_10, x_9);
 x_12 = 16;
 x_13 = lean_uint64_shift_right(x_11, x_12);
@@ -578,7 +578,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -608,7 +608,7 @@ x_7 = 32;
 x_8 = lean_unbox_uint64(x_6);
 x_9 = lean_uint64_shift_right(x_8, x_7);
 x_10 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_11 = lean_uint64_xor(x_10, x_9);
 x_12 = 16;
 x_13 = lean_uint64_shift_right(x_11, x_12);
@@ -816,7 +816,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -895,7 +895,7 @@ x_45 = 32;
 x_46 = lean_unbox_uint64(x_44);
 x_47 = lean_uint64_shift_right(x_46, x_45);
 x_48 = lean_unbox_uint64(x_44);
-lean_dec(x_44);
+lean_dec_ref(x_44);
 x_49 = lean_uint64_xor(x_48, x_47);
 x_50 = 16;
 x_51 = lean_uint64_shift_right(x_49, x_50);
@@ -986,7 +986,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1066,7 +1066,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1147,7 +1147,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1340,7 +1340,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1537,7 +1537,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -1629,7 +1629,7 @@ x_51 = 32;
 x_52 = lean_unbox_uint64(x_50);
 x_53 = lean_uint64_shift_right(x_52, x_51);
 x_54 = lean_unbox_uint64(x_50);
-lean_dec(x_50);
+lean_dec_ref(x_50);
 x_55 = lean_uint64_xor(x_54, x_53);
 x_56 = 16;
 x_57 = lean_uint64_shift_right(x_55, x_56);
@@ -1729,7 +1729,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -1821,7 +1821,7 @@ x_53 = 32;
 x_54 = lean_unbox_uint64(x_52);
 x_55 = lean_uint64_shift_right(x_54, x_53);
 x_56 = lean_unbox_uint64(x_52);
-lean_dec(x_52);
+lean_dec_ref(x_52);
 x_57 = lean_uint64_xor(x_56, x_55);
 x_58 = 16;
 x_59 = lean_uint64_shift_right(x_57, x_58);
@@ -1917,7 +1917,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -2062,7 +2062,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
@@ -2207,7 +2207,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -2338,7 +2338,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -2478,7 +2478,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -2616,7 +2616,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -2669,7 +2669,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -2724,7 +2724,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -2777,7 +2777,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -2830,7 +2830,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -2883,7 +2883,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -2938,7 +2938,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -2993,7 +2993,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -3048,7 +3048,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -3102,7 +3102,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -4210,7 +4210,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -4394,7 +4394,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -4447,7 +4447,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -4502,7 +4502,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -4557,7 +4557,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -4697,7 +4697,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
@@ -4899,7 +4899,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -4952,7 +4952,7 @@ x_8 = 32;
 x_9 = lean_unbox_uint64(x_7);
 x_10 = lean_uint64_shift_right(x_9, x_8);
 x_11 = lean_unbox_uint64(x_7);
-lean_dec(x_7);
+lean_dec_ref(x_7);
 x_12 = lean_uint64_xor(x_11, x_10);
 x_13 = 16;
 x_14 = lean_uint64_shift_right(x_12, x_13);
@@ -5005,7 +5005,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -5060,7 +5060,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
diff --git a/stage0/stdlib/Std/Data/DHashMap/Internal/Index.c b/stage0/stdlib/Std/Data/DHashMap/Internal/Index.c
index b5687a33b7..ac30971f3a 100644
--- a/stage0/stdlib/Std/Data/DHashMap/Internal/Index.c
+++ b/stage0/stdlib/Std/Data/DHashMap/Internal/Index.c
@@ -43,7 +43,7 @@ _start:
 {
 uint64_t x_2; uint64_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_3 = l_Std_DHashMap_Internal_scrambleHash(x_2);
 x_4 = lean_box_uint64(x_3);
 return x_4;
@@ -72,7 +72,7 @@ _start:
 {
 uint64_t x_3; size_t x_4; lean_object* x_5; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DHashMap_Internal_mkIdx___redArg(x_1, x_3);
 lean_dec(x_1);
 x_5 = lean_box_usize(x_4);
@@ -102,7 +102,7 @@ _start:
 {
 uint64_t x_4; size_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DHashMap_Internal_mkIdx(x_1, x_2, x_4);
 lean_dec(x_1);
 x_6 = lean_box_usize(x_5);
diff --git a/stage0/stdlib/Std/Data/DHashMap/Internal/Model.c b/stage0/stdlib/Std/Data/DHashMap/Internal/Model.c
index 230045a216..aac69876c5 100644
--- a/stage0/stdlib/Std/Data/DHashMap/Internal/Model.c
+++ b/stage0/stdlib/Std/Data/DHashMap/Internal/Model.c
@@ -278,7 +278,7 @@ x_6 = 32;
 x_7 = lean_unbox_uint64(x_5);
 x_8 = lean_uint64_shift_right(x_7, x_6);
 x_9 = lean_unbox_uint64(x_5);
-lean_dec(x_5);
+lean_dec_ref(x_5);
 x_10 = lean_uint64_xor(x_9, x_8);
 x_11 = 16;
 x_12 = lean_uint64_shift_right(x_10, x_11);
@@ -328,7 +328,7 @@ x_7 = 32;
 x_8 = lean_unbox_uint64(x_6);
 x_9 = lean_uint64_shift_right(x_8, x_7);
 x_10 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_11 = lean_uint64_xor(x_10, x_9);
 x_12 = 16;
 x_13 = lean_uint64_shift_right(x_11, x_12);
diff --git a/stage0/stdlib/Std/Data/DHashMap/Raw.c b/stage0/stdlib/Std/Data/DHashMap/Raw.c
index d6d4b680f4..ffe0ae3d76 100644
--- a/stage0/stdlib/Std/Data/DHashMap/Raw.c
+++ b/stage0/stdlib/Std/Data/DHashMap/Raw.c
@@ -984,7 +984,7 @@ x_17 = 32;
 x_18 = lean_unbox_uint64(x_16);
 x_19 = lean_uint64_shift_right(x_18, x_17);
 x_20 = lean_unbox_uint64(x_16);
-lean_dec(x_16);
+lean_dec_ref(x_16);
 x_21 = lean_uint64_xor(x_20, x_19);
 x_22 = 16;
 x_23 = lean_uint64_shift_right(x_21, x_22);
@@ -1071,7 +1071,7 @@ x_54 = 32;
 x_55 = lean_unbox_uint64(x_53);
 x_56 = lean_uint64_shift_right(x_55, x_54);
 x_57 = lean_unbox_uint64(x_53);
-lean_dec(x_53);
+lean_dec_ref(x_53);
 x_58 = lean_uint64_xor(x_57, x_56);
 x_59 = 16;
 x_60 = lean_uint64_shift_right(x_58, x_59);
@@ -1196,7 +1196,7 @@ x_19 = 32;
 x_20 = lean_unbox_uint64(x_18);
 x_21 = lean_uint64_shift_right(x_20, x_19);
 x_22 = lean_unbox_uint64(x_18);
-lean_dec(x_18);
+lean_dec_ref(x_18);
 x_23 = lean_uint64_xor(x_22, x_21);
 x_24 = 16;
 x_25 = lean_uint64_shift_right(x_23, x_24);
@@ -1283,7 +1283,7 @@ x_56 = 32;
 x_57 = lean_unbox_uint64(x_55);
 x_58 = lean_uint64_shift_right(x_57, x_56);
 x_59 = lean_unbox_uint64(x_55);
-lean_dec(x_55);
+lean_dec_ref(x_55);
 x_60 = lean_uint64_xor(x_59, x_58);
 x_61 = 16;
 x_62 = lean_uint64_shift_right(x_60, x_61);
@@ -1398,7 +1398,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -1557,7 +1557,7 @@ x_17 = 32;
 x_18 = lean_unbox_uint64(x_16);
 x_19 = lean_uint64_shift_right(x_18, x_17);
 x_20 = lean_unbox_uint64(x_16);
-lean_dec(x_16);
+lean_dec_ref(x_16);
 x_21 = lean_uint64_xor(x_20, x_19);
 x_22 = 16;
 x_23 = lean_uint64_shift_right(x_21, x_22);
@@ -1716,7 +1716,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -1880,7 +1880,7 @@ x_16 = 32;
 x_17 = lean_unbox_uint64(x_15);
 x_18 = lean_uint64_shift_right(x_17, x_16);
 x_19 = lean_unbox_uint64(x_15);
-lean_dec(x_15);
+lean_dec_ref(x_15);
 x_20 = lean_uint64_xor(x_19, x_18);
 x_21 = 16;
 x_22 = lean_uint64_shift_right(x_20, x_21);
@@ -2693,7 +2693,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -2852,7 +2852,7 @@ x_16 = 32;
 x_17 = lean_unbox_uint64(x_15);
 x_18 = lean_uint64_shift_right(x_17, x_16);
 x_19 = lean_unbox_uint64(x_15);
-lean_dec(x_15);
+lean_dec_ref(x_15);
 x_20 = lean_uint64_xor(x_19, x_18);
 x_21 = 16;
 x_22 = lean_uint64_shift_right(x_20, x_21);
diff --git a/stage0/stdlib/Std/Data/ExtDHashMap/Basic.c b/stage0/stdlib/Std/Data/ExtDHashMap/Basic.c
index 27fe813561..62e760e79f 100644
--- a/stage0/stdlib/Std/Data/ExtDHashMap/Basic.c
+++ b/stage0/stdlib/Std/Data/ExtDHashMap/Basic.c
@@ -626,7 +626,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -718,7 +718,7 @@ x_51 = 32;
 x_52 = lean_unbox_uint64(x_50);
 x_53 = lean_uint64_shift_right(x_52, x_51);
 x_54 = lean_unbox_uint64(x_50);
-lean_dec(x_50);
+lean_dec_ref(x_50);
 x_55 = lean_uint64_xor(x_54, x_53);
 x_56 = 16;
 x_57 = lean_uint64_shift_right(x_55, x_56);
@@ -818,7 +818,7 @@ x_15 = 32;
 x_16 = lean_unbox_uint64(x_14);
 x_17 = lean_uint64_shift_right(x_16, x_15);
 x_18 = lean_unbox_uint64(x_14);
-lean_dec(x_14);
+lean_dec_ref(x_14);
 x_19 = lean_uint64_xor(x_18, x_17);
 x_20 = 16;
 x_21 = lean_uint64_shift_right(x_19, x_20);
@@ -910,7 +910,7 @@ x_55 = 32;
 x_56 = lean_unbox_uint64(x_54);
 x_57 = lean_uint64_shift_right(x_56, x_55);
 x_58 = lean_unbox_uint64(x_54);
-lean_dec(x_54);
+lean_dec_ref(x_54);
 x_59 = lean_uint64_xor(x_58, x_57);
 x_60 = 16;
 x_61 = lean_uint64_shift_right(x_59, x_60);
@@ -1006,7 +1006,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1151,7 +1151,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -1296,7 +1296,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1436,7 +1436,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -1958,7 +1958,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -2098,7 +2098,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
diff --git a/stage0/stdlib/Std/Data/ExtHashMap/Basic.c b/stage0/stdlib/Std/Data/ExtHashMap/Basic.c
index 2a9bb8f684..7700af12a6 100644
--- a/stage0/stdlib/Std/Data/ExtHashMap/Basic.c
+++ b/stage0/stdlib/Std/Data/ExtHashMap/Basic.c
@@ -470,7 +470,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -562,7 +562,7 @@ x_51 = 32;
 x_52 = lean_unbox_uint64(x_50);
 x_53 = lean_uint64_shift_right(x_52, x_51);
 x_54 = lean_unbox_uint64(x_50);
-lean_dec(x_50);
+lean_dec_ref(x_50);
 x_55 = lean_uint64_xor(x_54, x_53);
 x_56 = 16;
 x_57 = lean_uint64_shift_right(x_55, x_56);
@@ -662,7 +662,7 @@ x_15 = 32;
 x_16 = lean_unbox_uint64(x_14);
 x_17 = lean_uint64_shift_right(x_16, x_15);
 x_18 = lean_unbox_uint64(x_14);
-lean_dec(x_14);
+lean_dec_ref(x_14);
 x_19 = lean_uint64_xor(x_18, x_17);
 x_20 = 16;
 x_21 = lean_uint64_shift_right(x_19, x_20);
@@ -754,7 +754,7 @@ x_55 = 32;
 x_56 = lean_unbox_uint64(x_54);
 x_57 = lean_uint64_shift_right(x_56, x_55);
 x_58 = lean_unbox_uint64(x_54);
-lean_dec(x_54);
+lean_dec_ref(x_54);
 x_59 = lean_uint64_xor(x_58, x_57);
 x_60 = 16;
 x_61 = lean_uint64_shift_right(x_59, x_60);
@@ -850,7 +850,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -995,7 +995,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -1140,7 +1140,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1280,7 +1280,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
diff --git a/stage0/stdlib/Std/Data/ExtHashSet/Basic.c b/stage0/stdlib/Std/Data/ExtHashSet/Basic.c
index 8f7d3af063..4e7fff5c6d 100644
--- a/stage0/stdlib/Std/Data/ExtHashSet/Basic.c
+++ b/stage0/stdlib/Std/Data/ExtHashSet/Basic.c
@@ -392,7 +392,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -538,7 +538,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
diff --git a/stage0/stdlib/Std/Data/HashMap/Basic.c b/stage0/stdlib/Std/Data/HashMap/Basic.c
index a2d8c65574..ddf13c8a14 100644
--- a/stage0/stdlib/Std/Data/HashMap/Basic.c
+++ b/stage0/stdlib/Std/Data/HashMap/Basic.c
@@ -842,7 +842,7 @@ x_11 = 32;
 x_12 = lean_unbox_uint64(x_10);
 x_13 = lean_uint64_shift_right(x_12, x_11);
 x_14 = lean_unbox_uint64(x_10);
-lean_dec(x_10);
+lean_dec_ref(x_10);
 x_15 = lean_uint64_xor(x_14, x_13);
 x_16 = 16;
 x_17 = lean_uint64_shift_right(x_15, x_16);
@@ -934,7 +934,7 @@ x_51 = 32;
 x_52 = lean_unbox_uint64(x_50);
 x_53 = lean_uint64_shift_right(x_52, x_51);
 x_54 = lean_unbox_uint64(x_50);
-lean_dec(x_50);
+lean_dec_ref(x_50);
 x_55 = lean_uint64_xor(x_54, x_53);
 x_56 = 16;
 x_57 = lean_uint64_shift_right(x_55, x_56);
@@ -1034,7 +1034,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -1126,7 +1126,7 @@ x_53 = 32;
 x_54 = lean_unbox_uint64(x_52);
 x_55 = lean_uint64_shift_right(x_54, x_53);
 x_56 = lean_unbox_uint64(x_52);
-lean_dec(x_52);
+lean_dec_ref(x_52);
 x_57 = lean_uint64_xor(x_56, x_55);
 x_58 = 16;
 x_59 = lean_uint64_shift_right(x_57, x_58);
@@ -1222,7 +1222,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1367,7 +1367,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
@@ -1512,7 +1512,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
@@ -1652,7 +1652,7 @@ x_12 = 32;
 x_13 = lean_unbox_uint64(x_11);
 x_14 = lean_uint64_shift_right(x_13, x_12);
 x_15 = lean_unbox_uint64(x_11);
-lean_dec(x_11);
+lean_dec_ref(x_11);
 x_16 = lean_uint64_xor(x_15, x_14);
 x_17 = 16;
 x_18 = lean_uint64_shift_right(x_16, x_17);
diff --git a/stage0/stdlib/Std/Data/HashMap/Raw.c b/stage0/stdlib/Std/Data/HashMap/Raw.c
index e7e0999a01..5ff27081b7 100644
--- a/stage0/stdlib/Std/Data/HashMap/Raw.c
+++ b/stage0/stdlib/Std/Data/HashMap/Raw.c
@@ -936,7 +936,7 @@ x_17 = 32;
 x_18 = lean_unbox_uint64(x_16);
 x_19 = lean_uint64_shift_right(x_18, x_17);
 x_20 = lean_unbox_uint64(x_16);
-lean_dec(x_16);
+lean_dec_ref(x_16);
 x_21 = lean_uint64_xor(x_20, x_19);
 x_22 = 16;
 x_23 = lean_uint64_shift_right(x_21, x_22);
@@ -1023,7 +1023,7 @@ x_54 = 32;
 x_55 = lean_unbox_uint64(x_53);
 x_56 = lean_uint64_shift_right(x_55, x_54);
 x_57 = lean_unbox_uint64(x_53);
-lean_dec(x_53);
+lean_dec_ref(x_53);
 x_58 = lean_uint64_xor(x_57, x_56);
 x_59 = 16;
 x_60 = lean_uint64_shift_right(x_58, x_59);
@@ -1148,7 +1148,7 @@ x_19 = 32;
 x_20 = lean_unbox_uint64(x_18);
 x_21 = lean_uint64_shift_right(x_20, x_19);
 x_22 = lean_unbox_uint64(x_18);
-lean_dec(x_18);
+lean_dec_ref(x_18);
 x_23 = lean_uint64_xor(x_22, x_21);
 x_24 = 16;
 x_25 = lean_uint64_shift_right(x_23, x_24);
@@ -1235,7 +1235,7 @@ x_56 = 32;
 x_57 = lean_unbox_uint64(x_55);
 x_58 = lean_uint64_shift_right(x_57, x_56);
 x_59 = lean_unbox_uint64(x_55);
-lean_dec(x_55);
+lean_dec_ref(x_55);
 x_60 = lean_uint64_xor(x_59, x_58);
 x_61 = 16;
 x_62 = lean_uint64_shift_right(x_60, x_61);
@@ -1350,7 +1350,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -1514,7 +1514,7 @@ x_16 = 32;
 x_17 = lean_unbox_uint64(x_15);
 x_18 = lean_uint64_shift_right(x_17, x_16);
 x_19 = lean_unbox_uint64(x_15);
-lean_dec(x_15);
+lean_dec_ref(x_15);
 x_20 = lean_uint64_xor(x_19, x_18);
 x_21 = 16;
 x_22 = lean_uint64_shift_right(x_20, x_21);
@@ -1678,7 +1678,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
@@ -1837,7 +1837,7 @@ x_16 = 32;
 x_17 = lean_unbox_uint64(x_15);
 x_18 = lean_uint64_shift_right(x_17, x_16);
 x_19 = lean_unbox_uint64(x_15);
-lean_dec(x_15);
+lean_dec_ref(x_15);
 x_20 = lean_uint64_xor(x_19, x_18);
 x_21 = 16;
 x_22 = lean_uint64_shift_right(x_20, x_21);
diff --git a/stage0/stdlib/Std/Data/HashSet/Basic.c b/stage0/stdlib/Std/Data/HashSet/Basic.c
index 110bdac40f..b0b8ade1f3 100644
--- a/stage0/stdlib/Std/Data/HashSet/Basic.c
+++ b/stage0/stdlib/Std/Data/HashSet/Basic.c
@@ -720,7 +720,7 @@ x_9 = 32;
 x_10 = lean_unbox_uint64(x_8);
 x_11 = lean_uint64_shift_right(x_10, x_9);
 x_12 = lean_unbox_uint64(x_8);
-lean_dec(x_8);
+lean_dec_ref(x_8);
 x_13 = lean_uint64_xor(x_12, x_11);
 x_14 = 16;
 x_15 = lean_uint64_shift_right(x_13, x_14);
@@ -866,7 +866,7 @@ x_10 = 32;
 x_11 = lean_unbox_uint64(x_9);
 x_12 = lean_uint64_shift_right(x_11, x_10);
 x_13 = lean_unbox_uint64(x_9);
-lean_dec(x_9);
+lean_dec_ref(x_9);
 x_14 = lean_uint64_xor(x_13, x_12);
 x_15 = 16;
 x_16 = lean_uint64_shift_right(x_14, x_15);
diff --git a/stage0/stdlib/Std/Data/HashSet/Raw.c b/stage0/stdlib/Std/Data/HashSet/Raw.c
index c75db6f935..276fa4d326 100644
--- a/stage0/stdlib/Std/Data/HashSet/Raw.c
+++ b/stage0/stdlib/Std/Data/HashSet/Raw.c
@@ -780,7 +780,7 @@ x_13 = 32;
 x_14 = lean_unbox_uint64(x_12);
 x_15 = lean_uint64_shift_right(x_14, x_13);
 x_16 = lean_unbox_uint64(x_12);
-lean_dec(x_12);
+lean_dec_ref(x_12);
 x_17 = lean_uint64_xor(x_16, x_15);
 x_18 = 16;
 x_19 = lean_uint64_shift_right(x_17, x_18);
@@ -944,7 +944,7 @@ x_14 = 32;
 x_15 = lean_unbox_uint64(x_13);
 x_16 = lean_uint64_shift_right(x_15, x_14);
 x_17 = lean_unbox_uint64(x_13);
-lean_dec(x_13);
+lean_dec_ref(x_13);
 x_18 = lean_uint64_xor(x_17, x_16);
 x_19 = 16;
 x_20 = lean_uint64_shift_right(x_18, x_19);
diff --git a/stage0/stdlib/Std/Do/SPred/SPred.c b/stage0/stdlib/Std/Do/SPred/SPred.c
index 39f8755193..51ffe4995a 100644
--- a/stage0/stdlib/Std/Do/SPred/SPred.c
+++ b/stage0/stdlib/Std/Do/SPred/SPred.c
@@ -14,8 +14,8 @@
 extern "C" {
 #endif
 LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg___lam__0(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg(lean_object*);
+LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Do_SPred_pure(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Do_SPred_and___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Do_SPred_and(lean_object*, lean_object*, lean_object*);
@@ -38,15 +38,6 @@ LEAN_EXPORT lean_object* l_Std_Do_SPred_conjunction(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Do_SPred_SPred_0__Std_Do_SPred_conjunction_match__1_splitter___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Do_SPred_SPred_0__Std_Do_SPred_conjunction_match__1_splitter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Do_SPred_SPred_0__Std_Do_SPred_conjunction_match__1_splitter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; 
-x_3 = l_Std_Do_SPred_pure___redArg___lam__0(x_1, x_2);
-lean_dec(x_2);
-return x_3;
-}
-}
 LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg(lean_object* x_1) {
 _start:
 {
@@ -60,7 +51,7 @@ lean_object* x_2; lean_object* x_3;
 x_2 = lean_ctor_get(x_1, 1);
 lean_inc(x_2);
 lean_dec_ref(x_1);
-x_3 = lean_alloc_closure((void*)(l_Std_Do_SPred_pure___redArg___lam__0___boxed), 2, 1);
+x_3 = lean_alloc_closure((void*)(l_Std_Do_SPred_pure___redArg___lam__0), 2, 1);
 lean_closure_set(x_3, 0, x_2);
 return x_3;
 }
@@ -74,6 +65,15 @@ x_3 = l_Std_Do_SPred_pure___redArg(x_1);
 return x_3;
 }
 }
+LEAN_EXPORT lean_object* l_Std_Do_SPred_pure___redArg___lam__0___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Std_Do_SPred_pure___redArg___lam__0(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Std_Do_SPred_pure(lean_object* x_1, lean_object* x_2) {
 _start:
 {
diff --git a/stage0/stdlib/Std/Internal/Async/Process.c b/stage0/stdlib/Std/Internal/Async/Process.c
index c3115e0fe4..52077d4430 100644
--- a/stage0/stdlib/Std/Internal/Async/Process.c
+++ b/stage0/stdlib/Std/Internal/Async/Process.c
@@ -887,9 +887,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_Internal_IO_Process_instDecidableEqPId_decEq(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -908,9 +908,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_Internal_IO_Process_instDecidableEqPId(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -951,9 +951,9 @@ _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_Internal_IO_Process_instOrdPId_ord(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
@@ -980,7 +980,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_Internal_IO_Process_instReprPId___lam__0(x_3, x_2);
 lean_dec(x_2);
 return x_4;
@@ -1208,7 +1208,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_Internal_IO_Process_getPriority(x_3);
 return x_4;
 }
@@ -1226,9 +1226,9 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_Internal_IO_Process_setPriority(x_4, x_5);
 return x_6;
 }
diff --git a/stage0/stdlib/Std/Internal/Async/TCP.c b/stage0/stdlib/Std/Internal/Async/TCP.c
index 8a038ff47f..5b2d3dbe70 100644
--- a/stage0/stdlib/Std/Internal/Async/TCP.c
+++ b/stage0/stdlib/Std/Internal/Async/TCP.c
@@ -2274,7 +2274,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_Internal_IO_Async_TCP_Socket_Client_recv_x3f(x_1, x_4);
 lean_dec(x_1);
 return x_5;
@@ -2464,7 +2464,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_Internal_IO_Async_Waiter_race___at___00Std_Internal_IO_Async_TCP_Socket_Client_recvSelector_spec__0___lam__1(x_1, x_2, x_5);
 lean_dec(x_2);
 return x_6;
@@ -2613,7 +2613,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_8 = l_Std_Internal_IO_Async_Waiter_race___at___00Std_Internal_IO_Async_TCP_Socket_Client_recvSelector_spec__0(x_1, x_2, x_7, x_4, x_5);
 lean_dec_ref(x_4);
 return x_8;
@@ -2867,7 +2867,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Std_Internal_IO_Async_TCP_Socket_Client_recvSelector___lam__4(x_1, x_6, x_3, x_4);
 lean_dec_ref(x_3);
 return x_7;
@@ -3005,7 +3005,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_Internal_IO_Async_TCP_Socket_Client_recvSelector___lam__5(x_1, x_5, x_3);
 return x_6;
 }
@@ -3195,7 +3195,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_9 = l_Std_Internal_IO_Async_TCP_Socket_Client_recvSelector___lam__9(x_1, x_2, x_8, x_4, x_5, x_6);
 return x_9;
 }
@@ -3390,7 +3390,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_Internal_IO_Async_TCP_Socket_Client_recvSelector(x_1, x_3);
 return x_4;
 }
diff --git a/stage0/stdlib/Std/Internal/Async/UDP.c b/stage0/stdlib/Std/Internal/Async/UDP.c
index b7df6af36b..c84cf24a46 100644
--- a/stage0/stdlib/Std/Internal/Async/UDP.c
+++ b/stage0/stdlib/Std/Internal/Async/UDP.c
@@ -858,7 +858,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = l_Std_Internal_IO_Async_UDP_Socket_recv(x_1, x_4);
 lean_dec(x_1);
 return x_5;
@@ -1124,7 +1124,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_6 = l_Std_Internal_IO_Async_Waiter_race___at___00Std_Internal_IO_Async_UDP_Socket_recvSelector_spec__1___lam__1(x_1, x_2, x_5);
 lean_dec(x_2);
 return x_6;
@@ -1251,7 +1251,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_8 = l_Std_Internal_IO_Async_Waiter_race___at___00Std_Internal_IO_Async_UDP_Socket_recvSelector_spec__1(x_1, x_7, x_3, x_4, x_5);
 lean_dec_ref(x_4);
 return x_8;
@@ -1522,7 +1522,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Std_Internal_IO_Async_UDP_Socket_recvSelector___lam__4(x_1, x_6, x_3, x_4);
 lean_dec_ref(x_3);
 return x_7;
@@ -1660,7 +1660,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_Internal_IO_Async_UDP_Socket_recvSelector___lam__6(x_1, x_5, x_3);
 return x_6;
 }
@@ -1850,7 +1850,7 @@ _start:
 {
 uint64_t x_8; lean_object* x_9; 
 x_8 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_9 = l_Std_Internal_IO_Async_UDP_Socket_recvSelector___lam__10(x_1, x_2, x_8, x_4, x_5, x_6);
 return x_9;
 }
@@ -2045,7 +2045,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_Internal_IO_Async_UDP_Socket_recvSelector(x_1, x_3);
 return x_4;
 }
diff --git a/stage0/stdlib/Std/Internal/UV/System.c b/stage0/stdlib/Std/Internal/UV/System.c
index 1808523e85..905e51dd03 100644
--- a/stage0/stdlib/Std/Internal/UV/System.c
+++ b/stage0/stdlib/Std/Internal/UV/System.c
@@ -2276,7 +2276,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_uv_os_get_group(x_3);
 return x_4;
 }
@@ -2326,7 +2326,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_uv_os_getpriority(x_3);
 return x_4;
 }
@@ -2336,9 +2336,9 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = lean_uv_os_setpriority(x_4, x_5);
 return x_6;
 }
@@ -2364,7 +2364,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_uv_random(x_3);
 return x_4;
 }
diff --git a/stage0/stdlib/Std/Internal/UV/TCP.c b/stage0/stdlib/Std/Internal/UV/TCP.c
index e5b1271501..9bcf8b1c4f 100644
--- a/stage0/stdlib/Std/Internal/UV/TCP.c
+++ b/stage0/stdlib/Std/Internal/UV/TCP.c
@@ -84,7 +84,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uv_tcp_recv(x_1, x_4);
 lean_dec(x_1);
 return x_5;
diff --git a/stage0/stdlib/Std/Internal/UV/Timer.c b/stage0/stdlib/Std/Internal/UV/Timer.c
index 3ab3cdbde6..a5cf3b8813 100644
--- a/stage0/stdlib/Std/Internal/UV/Timer.c
+++ b/stage0/stdlib/Std/Internal/UV/Timer.c
@@ -35,7 +35,7 @@ _start:
 {
 uint64_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = lean_unbox(x_2);
 x_6 = lean_uv_timer_mk(x_4, x_5);
 return x_6;
diff --git a/stage0/stdlib/Std/Internal/UV/UDP.c b/stage0/stdlib/Std/Internal/UV/UDP.c
index 1e5a34116f..3b3e4130e9 100644
--- a/stage0/stdlib/Std/Internal/UV/UDP.c
+++ b/stage0/stdlib/Std/Internal/UV/UDP.c
@@ -93,7 +93,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_5 = lean_uv_udp_recv(x_1, x_4);
 lean_dec(x_1);
 return x_5;
diff --git a/stage0/stdlib/Std/Sat/AIG/Basic.c b/stage0/stdlib/Std/Sat/AIG/Basic.c
index a24916da2d..bfe4a5fee6 100644
--- a/stage0/stdlib/Std/Sat/AIG/Basic.c
+++ b/stage0/stdlib/Std/Sat/AIG/Basic.c
@@ -956,7 +956,7 @@ lean_dec_ref(x_2);
 x_5 = 1;
 x_6 = lean_apply_1(x_1, x_4);
 x_7 = lean_unbox_uint64(x_6);
-lean_dec(x_6);
+lean_dec_ref(x_6);
 x_8 = lean_uint64_mix_hash(x_5, x_7);
 return x_8;
 }
diff --git a/stage0/stdlib/Std/Sat/AIG/CNF.c b/stage0/stdlib/Std/Sat/AIG/CNF.c
index daa90ee1a3..4834591c33 100644
--- a/stage0/stdlib/Std/Sat/AIG/CNF.c
+++ b/stage0/stdlib/Std/Sat/AIG/CNF.c
@@ -14,80 +14,72 @@
 extern "C" {
 #endif
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
-static lean_object* l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
+static lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
 lean_object* lean_array_push(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_falseToCNF___redArg(lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_falseToCNF(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_atomToCNF___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_atomToCNF(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF___redArg(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_mixAssigns___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_mixAssigns___redArg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_mixAssigns(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_mixAssigns___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectLeftAssign___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectLeftAssign___redArg___boxed(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectLeftAssign(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectLeftAssign___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectRightAssign___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectRightAssign___redArg___boxed(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectRightAssign(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectRightAssign___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Std_Sat_AIG_denote_go___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_denote___at___00Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_denote___at___00Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0___boxed(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_cnfSatAssignment(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_cnfSatAssignment___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg(lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+lean_object* lean_nat_sub(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_nat_add(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectLeftAssign(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectLeftAssign___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectRightAssign(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectRightAssign___boxed(lean_object*, lean_object*);
+uint8_t l_Std_Sat_AIG_denote_go___redArg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Std_Sat_AIG_denote___at___00__private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_Sat_AIG_denote___at___00__private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0___boxed(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_init(lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_init___boxed(lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_init(lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_init___boxed(lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate___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_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate(lean_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_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___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_nat_mul(lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_empty(lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_empty(lean_object*);
 lean_object* l_Array_append___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addFalse___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addFalse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addFalse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addAtom___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addAtom(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addAtom___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_shiftr(lean_object*, lean_object*);
 lean_object* lean_nat_land(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate___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_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate(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_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Std_Sat_CNF_eval___redArg(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_State_eval___redArg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_eval___redArg___boxed(lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_State_eval(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_eval___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* lean_nat_add(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj___boxed(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___redArg(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___redArg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget_borrowed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_go___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_go___redArg___boxed(lean_object*, lean_object*, lean_object*);
@@ -104,9 +96,8 @@ LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_match_
 LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_match__16_splitter___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_match__16_splitter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_match__16_splitter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_Sat_CNF_relabel___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF(lean_object*);
-static lean_object* _init_l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0() {
+static lean_object* _init_l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -115,7 +106,7 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_falseToCNF___redArg(lean_object* x_1) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
@@ -128,20 +119,20 @@ x_5 = lean_box(0);
 x_6 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_6, 0, x_4);
 lean_ctor_set(x_6, 1, x_5);
-x_7 = l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
 x_8 = lean_array_push(x_7, x_6);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_falseToCNF(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_Sat_AIG_Decl_falseToCNF___redArg(x_2);
+x_3 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg(x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_atomToCNF___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
@@ -178,21 +169,21 @@ lean_ctor_set(x_16, 1, x_9);
 x_17 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_17, 0, x_13);
 lean_ctor_set(x_17, 1, x_16);
-x_18 = l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
+x_18 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
 x_19 = lean_array_push(x_18, x_17);
 x_20 = lean_array_push(x_19, x_11);
 return x_20;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_atomToCNF(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Std_Sat_AIG_Decl_atomToCNF___redArg(x_2, x_3);
+x_4 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF___redArg(x_2, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, uint8_t x_5) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, uint8_t x_5) {
 _start:
 {
 uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; uint8_t x_31; 
@@ -250,7 +241,7 @@ lean_ctor_set(x_24, 1, x_13);
 x_25 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_25, 0, x_19);
 lean_ctor_set(x_25, 1, x_24);
-x_26 = l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
+x_26 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0;
 x_27 = lean_array_push(x_26, x_25);
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_16);
@@ -285,165 +276,113 @@ goto block_30;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 uint8_t x_6; uint8_t x_7; lean_object* x_8; 
 x_6 = lean_unbox(x_4);
 x_7 = lean_unbox(x_5);
-x_8 = l_Std_Sat_AIG_Decl_gateToCNF___redArg(x_1, x_2, x_3, x_6, x_7);
+x_8 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg(x_1, x_2, x_3, x_6, x_7);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, uint8_t x_6) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, uint8_t x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Std_Sat_AIG_Decl_gateToCNF___redArg(x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg(x_2, x_3, x_4, x_5, x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_Decl_gateToCNF___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; uint8_t x_8; lean_object* x_9; 
 x_7 = lean_unbox(x_5);
 x_8 = lean_unbox(x_6);
-x_9 = l_Std_Sat_AIG_Decl_gateToCNF(x_1, x_2, x_3, x_4, x_7, x_8);
+x_9 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF(x_1, x_2, x_3, x_4, x_7, x_8);
 return x_9;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_mixAssigns___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-if (lean_obj_tag(x_3) == 0)
+lean_object* x_5; lean_object* x_6; uint8_t x_7; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_array_get_size(x_5);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+if (x_7 == 0)
 {
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-lean_dec_ref(x_2);
-x_4 = lean_ctor_get(x_3, 0);
-lean_inc(x_4);
+lean_object* x_8; lean_object* x_9; uint8_t x_10; 
 lean_dec_ref(x_3);
-x_5 = lean_apply_1(x_1, x_4);
-x_6 = lean_unbox(x_5);
-return x_6;
+x_8 = lean_nat_sub(x_4, x_6);
+lean_dec(x_4);
+x_9 = lean_apply_1(x_2, x_8);
+x_10 = lean_unbox(x_9);
+return x_10;
 }
 else
 {
-lean_object* x_7; lean_object* x_8; uint8_t x_9; 
-lean_dec_ref(x_1);
-x_7 = lean_ctor_get(x_3, 0);
-lean_inc(x_7);
-lean_dec_ref(x_3);
-x_8 = lean_apply_1(x_2, x_7);
-x_9 = lean_unbox(x_8);
-return x_9;
+lean_object* x_11; uint8_t x_12; 
+lean_dec_ref(x_2);
+x_11 = lean_apply_1(x_3, x_4);
+x_12 = lean_unbox(x_11);
+return x_12;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_mixAssigns___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; lean_object* x_5; 
-x_4 = l_Std_Sat_AIG_toCNF_mixAssigns___redArg(x_1, x_2, x_3);
-x_5 = lean_box(x_4);
-return x_5;
-}
-}
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_mixAssigns(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-uint8_t x_5; 
-x_5 = l_Std_Sat_AIG_toCNF_mixAssigns___redArg(x_2, x_3, x_4);
-return x_5;
-}
-}
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_mixAssigns___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; lean_object* x_6; 
-x_5 = l_Std_Sat_AIG_toCNF_mixAssigns(x_1, x_2, x_3, x_4);
+x_5 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns(x_1, x_2, x_3, x_4);
 lean_dec_ref(x_1);
 x_6 = lean_box(x_5);
 return x_6;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectLeftAssign___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectLeftAssign(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; uint8_t x_5; 
-x_3 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_3, 0, x_2);
-x_4 = lean_apply_1(x_1, x_3);
-x_5 = lean_unbox(x_4);
-return x_5;
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_4 = lean_ctor_get(x_1, 0);
+x_5 = lean_array_get_size(x_4);
+x_6 = lean_nat_add(x_3, x_5);
+x_7 = lean_apply_1(x_2, x_6);
+x_8 = lean_unbox(x_7);
+return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectLeftAssign___redArg___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_Sat_AIG_toCNF_projectLeftAssign___redArg(x_1, x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectLeftAssign(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = l_Std_Sat_AIG_toCNF_projectLeftAssign___redArg(x_2, x_3);
-return x_4;
-}
-}
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectLeftAssign___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectLeftAssign___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; 
-x_4 = l_Std_Sat_AIG_toCNF_projectLeftAssign(x_1, x_2, x_3);
+x_4 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectLeftAssign(x_1, x_2, x_3);
+lean_dec(x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
 return x_5;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectRightAssign___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectRightAssign(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; uint8_t x_5; 
-x_3 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_3, 0, x_2);
-x_4 = lean_apply_1(x_1, x_3);
-x_5 = lean_unbox(x_4);
-return x_5;
+lean_object* x_3; uint8_t x_4; 
+x_3 = lean_apply_1(x_1, x_2);
+x_4 = lean_unbox(x_3);
+return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectRightAssign___redArg___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectRightAssign___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_Sat_AIG_toCNF_projectRightAssign___redArg(x_1, x_2);
+x_3 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_projectRightAssign(x_1, x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_projectRightAssign(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-uint8_t x_5; 
-x_5 = l_Std_Sat_AIG_toCNF_projectRightAssign___redArg(x_2, x_3);
-return x_5;
-}
-}
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_projectRightAssign___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-uint8_t x_5; lean_object* x_6; 
-x_5 = l_Std_Sat_AIG_toCNF_projectRightAssign(x_1, x_2, x_3, x_4);
-lean_dec_ref(x_1);
-x_6 = lean_box(x_5);
-return x_6;
-}
-}
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_denote___at___00Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT uint8_t l_Std_Sat_AIG_denote___at___00__private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_11; uint8_t x_12; 
@@ -487,17 +426,17 @@ return x_5;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_denote___at___00Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Std_Sat_AIG_denote___at___00__private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_Sat_AIG_denote___at___00Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(x_1, x_2);
+x_3 = l_Std_Sat_AIG_denote___at___00__private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(x_1, x_2);
 lean_dec_ref(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
@@ -508,84 +447,44 @@ lean_ctor_set_uint8(x_5, sizeof(void*)*1, x_4);
 x_6 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_6, 0, x_1);
 lean_ctor_set(x_6, 1, x_5);
-x_7 = l_Std_Sat_AIG_denote___at___00Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(x_2, x_6);
+x_7 = l_Std_Sat_AIG_denote___at___00__private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment_spec__0(x_2, x_6);
 lean_dec_ref(x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; 
-x_4 = l_Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0(x_1, x_2, x_3);
+x_4 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0(x_1, x_2, x_3);
 x_5 = lean_box(x_4);
 return x_5;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_cnfSatAssignment(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
 lean_inc_ref(x_2);
-x_4 = lean_alloc_closure((void*)(l_Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0___boxed), 3, 2);
+lean_inc_ref(x_1);
+x_4 = lean_alloc_closure((void*)(l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___lam__0___boxed), 3, 2);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
-x_5 = l_Std_Sat_AIG_toCNF_mixAssigns___redArg(x_2, x_4, x_3);
+x_5 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns(x_1, x_2, x_4, x_3);
+lean_dec_ref(x_1);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_cnfSatAssignment___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; 
-x_4 = l_Std_Sat_AIG_toCNF_cnfSatAssignment(x_1, x_2, x_3);
+x_4 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_cnfSatAssignment(x_1, x_2, x_3);
 x_5 = lean_box(x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-lean_object* x_4; lean_object* x_5; 
-lean_dec(x_3);
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
-lean_dec_ref(x_1);
-x_5 = lean_apply_1(x_2, x_4);
-return x_5;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; 
-lean_dec(x_2);
-x_6 = lean_ctor_get(x_1, 0);
-lean_inc(x_6);
-lean_dec_ref(x_1);
-x_7 = lean_apply_1(x_3, x_6);
-return x_7;
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-lean_object* x_6; 
-x_6 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter___redArg(x_3, x_4, x_5);
-return x_6;
-}
-}
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter___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___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_mixAssigns_match__1_splitter(x_1, x_2, x_3, x_4, x_5);
-lean_dec_ref(x_1);
-return x_6;
-}
-}
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_init(lean_object* x_1) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_init(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; lean_object* x_5; lean_object* x_6; 
@@ -597,16 +496,16 @@ x_6 = lean_mk_array(x_3, x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_init___boxed(lean_object* x_1) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_init___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Std_Sat_AIG_toCNF_Cache_init(x_1);
+x_2 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_init(x_1);
 lean_dec_ref(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; lean_object* x_5; 
@@ -616,35 +515,35 @@ x_5 = lean_array_fset(x_1, x_2, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_1, x_2);
+x_3 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_3, x_4);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_3, x_4);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addFalse___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Std_Sat_AIG_toCNF_Cache_addFalse(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_4);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; lean_object* x_5; 
@@ -654,28 +553,28 @@ x_5 = lean_array_fset(x_1, x_2, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_1, x_2);
+x_3 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_4, x_5);
+x_8 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_4, x_5);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addAtom___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Std_Sat_AIG_toCNF_Cache_addAtom(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec_ref(x_2);
@@ -683,7 +582,7 @@ lean_dec_ref(x_1);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; lean_object* x_6; lean_object* x_7; 
@@ -693,30 +592,30 @@ x_7 = lean_array_fset(x_3, x_4, x_6);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Std_Sat_AIG_toCNF_Cache_addGate___redArg(x_1, x_2, x_3, x_4);
+x_5 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg(x_1, x_2, x_3, x_4);
 lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; 
-x_13 = l_Std_Sat_AIG_toCNF_Cache_addGate___redArg(x_3, x_4, x_5, x_8);
+x_13 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg(x_3, x_4, x_5, x_8);
 return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_Cache_addGate___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; 
-x_13 = l_Std_Sat_AIG_toCNF_Cache_addGate(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+x_13 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate(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_8);
 lean_dec(x_4);
 lean_dec(x_3);
@@ -725,7 +624,7 @@ lean_dec_ref(x_1);
 return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_empty(lean_object* x_1) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_empty(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; uint8_t x_8; 
@@ -735,7 +634,7 @@ x_4 = lean_unsigned_to_nat(2u);
 x_5 = lean_nat_mul(x_3, x_4);
 x_6 = lean_mk_empty_array_with_capacity(x_5);
 lean_dec(x_5);
-x_7 = l_Std_Sat_AIG_toCNF_Cache_init(x_1);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_init(x_1);
 x_8 = !lean_is_exclusive(x_1);
 if (x_8 == 0)
 {
@@ -759,130 +658,135 @@ return x_11;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addFalse___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; 
 x_3 = !lean_is_exclusive(x_1);
 if (x_3 == 0)
 {
-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_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_4 = lean_ctor_get(x_1, 0);
 x_5 = lean_ctor_get(x_1, 1);
-x_6 = l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_5, x_2);
-x_7 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_7, 0, x_2);
-x_8 = l_Std_Sat_AIG_Decl_falseToCNF___redArg(x_7);
-x_9 = l_Array_append___redArg(x_4, x_8);
-lean_dec_ref(x_8);
+x_6 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_5, x_2);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg(x_2);
+x_8 = l_Array_append___redArg(x_4, x_7);
+lean_dec_ref(x_7);
 lean_ctor_set(x_1, 1, x_6);
-lean_ctor_set(x_1, 0, x_9);
+lean_ctor_set(x_1, 0, x_8);
 return x_1;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_10 = lean_ctor_get(x_1, 0);
-x_11 = lean_ctor_get(x_1, 1);
-lean_inc(x_11);
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_9 = lean_ctor_get(x_1, 0);
+x_10 = lean_ctor_get(x_1, 1);
 lean_inc(x_10);
+lean_inc(x_9);
 lean_dec(x_1);
-x_12 = l_Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_11, x_2);
-x_13 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_13, 0, x_2);
-x_14 = l_Std_Sat_AIG_Decl_falseToCNF___redArg(x_13);
-x_15 = l_Array_append___redArg(x_10, x_14);
-lean_dec_ref(x_14);
-x_16 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_12);
-return x_16;
+x_11 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addFalse___redArg(x_10, x_2);
+x_12 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg(x_2);
+x_13 = l_Array_append___redArg(x_9, x_12);
+lean_dec_ref(x_12);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_11);
+return x_14;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addFalse(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l_Std_Sat_AIG_toCNF_State_addFalse___redArg(x_2, x_3);
+x_6 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse___redArg(x_2, x_3);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addFalse___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l_Std_Sat_AIG_toCNF_State_addFalse(x_1, x_2, x_3, x_4, x_5);
+x_6 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse(x_1, x_2, x_3, x_4, x_5);
 lean_dec_ref(x_1);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addAtom___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_2);
-if (x_4 == 0)
+uint8_t x_5; 
+x_5 = !lean_is_exclusive(x_3);
+if (x_5 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_5 = lean_ctor_get(x_2, 0);
-x_6 = lean_ctor_get(x_2, 1);
-x_7 = l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_6, x_3);
-x_8 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_8, 0, x_3);
-x_9 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_9, 0, x_1);
-x_10 = l_Std_Sat_AIG_Decl_atomToCNF___redArg(x_8, x_9);
-x_11 = l_Array_append___redArg(x_5, x_10);
-lean_dec_ref(x_10);
-lean_ctor_set(x_2, 1, x_7);
-lean_ctor_set(x_2, 0, x_11);
-return x_2;
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_6 = lean_ctor_get(x_3, 0);
+x_7 = lean_ctor_get(x_3, 1);
+x_8 = lean_ctor_get(x_1, 0);
+x_9 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_7, x_4);
+x_10 = lean_array_get_size(x_8);
+x_11 = lean_nat_add(x_2, x_10);
+x_12 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF___redArg(x_4, x_11);
+x_13 = l_Array_append___redArg(x_6, x_12);
+lean_dec_ref(x_12);
+lean_ctor_set(x_3, 1, x_9);
+lean_ctor_set(x_3, 0, x_13);
+return x_3;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_12 = lean_ctor_get(x_2, 0);
-x_13 = lean_ctor_get(x_2, 1);
-lean_inc(x_13);
-lean_inc(x_12);
+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; 
+x_14 = lean_ctor_get(x_3, 0);
+x_15 = lean_ctor_get(x_3, 1);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_dec(x_3);
+x_16 = lean_ctor_get(x_1, 0);
+x_17 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_15, x_4);
+x_18 = lean_array_get_size(x_16);
+x_19 = lean_nat_add(x_2, x_18);
+x_20 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_atomToCNF___redArg(x_4, x_19);
+x_21 = l_Array_append___redArg(x_14, x_20);
+lean_dec_ref(x_20);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_17);
+return x_22;
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
-x_14 = l_Std_Sat_AIG_toCNF_Cache_addAtom___redArg(x_13, x_3);
-x_15 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_15, 0, x_3);
-x_16 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_16, 0, x_1);
-x_17 = l_Std_Sat_AIG_Decl_atomToCNF___redArg(x_15, x_16);
-x_18 = l_Array_append___redArg(x_12, x_17);
-lean_dec_ref(x_17);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_14);
-return x_19;
+lean_dec_ref(x_1);
+return x_5;
 }
 }
-}
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addAtom(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Std_Sat_AIG_toCNF_State_addAtom___redArg(x_2, x_3, x_4);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg(x_1, x_2, x_3, x_4);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addAtom___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Std_Sat_AIG_toCNF_State_addAtom(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_2);
 lean_dec_ref(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; uint8_t x_15; uint8_t x_21; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; uint8_t x_12; uint8_t x_18; lean_object* x_25; lean_object* x_26; uint8_t x_27; 
 x_5 = lean_ctor_get(x_3, 0);
 lean_inc_ref(x_5);
 x_6 = lean_ctor_get(x_3, 1);
@@ -895,107 +799,99 @@ if (lean_is_exclusive(x_3)) {
  lean_dec_ref(x_3);
  x_7 = lean_box(0);
 }
-lean_inc(x_4);
-x_8 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_8, 0, x_4);
-x_9 = lean_unsigned_to_nat(1u);
-x_10 = lean_nat_shiftr(x_1, x_9);
-x_11 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_11, 0, x_10);
-x_12 = lean_nat_shiftr(x_2, x_9);
-x_13 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_13, 0, x_12);
-x_28 = lean_nat_land(x_9, x_1);
-x_29 = lean_unsigned_to_nat(0u);
-x_30 = lean_nat_dec_eq(x_28, x_29);
-lean_dec(x_28);
-if (x_30 == 0)
+x_8 = lean_unsigned_to_nat(1u);
+x_9 = lean_nat_shiftr(x_1, x_8);
+x_10 = lean_nat_shiftr(x_2, x_8);
+x_25 = lean_nat_land(x_8, x_1);
+x_26 = lean_unsigned_to_nat(0u);
+x_27 = lean_nat_dec_eq(x_25, x_26);
+lean_dec(x_25);
+if (x_27 == 0)
 {
-uint8_t x_31; 
-x_31 = 1;
-x_21 = x_31;
-goto block_27;
+uint8_t x_28; 
+x_28 = 1;
+x_18 = x_28;
+goto block_24;
 }
 else
 {
-uint8_t x_32; 
-x_32 = 0;
-x_21 = x_32;
-goto block_27;
+uint8_t x_29; 
+x_29 = 0;
+x_18 = x_29;
+goto block_24;
 }
-block_20:
+block_17:
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_16 = l_Std_Sat_AIG_toCNF_Cache_addGate___redArg(x_1, x_2, x_6, x_4);
-lean_dec(x_4);
-x_17 = l_Std_Sat_AIG_Decl_gateToCNF___redArg(x_8, x_11, x_13, x_14, x_15);
-x_18 = l_Array_append___redArg(x_5, x_17);
-lean_dec_ref(x_17);
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_13 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_Cache_addGate___redArg(x_1, x_2, x_6, x_4);
+x_14 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_gateToCNF___redArg(x_4, x_9, x_10, x_11, x_12);
+x_15 = l_Array_append___redArg(x_5, x_14);
+lean_dec_ref(x_14);
 if (lean_is_scalar(x_7)) {
- x_19 = lean_alloc_ctor(0, 2, 0);
+ x_16 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_19 = x_7;
+ x_16 = x_7;
 }
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_16);
-return x_19;
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_13);
+return x_16;
 }
-block_27:
+block_24:
 {
-lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_22 = lean_nat_land(x_9, x_2);
-x_23 = lean_unsigned_to_nat(0u);
-x_24 = lean_nat_dec_eq(x_22, x_23);
-lean_dec(x_22);
-if (x_24 == 0)
+lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_19 = lean_nat_land(x_8, x_2);
+x_20 = lean_unsigned_to_nat(0u);
+x_21 = lean_nat_dec_eq(x_19, x_20);
+lean_dec(x_19);
+if (x_21 == 0)
 {
-uint8_t x_25; 
-x_25 = 1;
-x_14 = x_21;
-x_15 = x_25;
-goto block_20;
+uint8_t x_22; 
+x_22 = 1;
+x_11 = x_18;
+x_12 = x_22;
+goto block_17;
 }
 else
 {
-uint8_t x_26; 
-x_26 = 0;
-x_14 = x_21;
-x_15 = x_26;
-goto block_20;
+uint8_t x_23; 
+x_23 = 0;
+x_11 = x_18;
+x_12 = x_23;
+goto block_17;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Std_Sat_AIG_toCNF_State_addGate___redArg(x_1, x_2, x_3, x_4);
+x_5 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg(x_1, x_2, x_3, x_4);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate(lean_object* x_1, lean_object* x_2, 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_Std_Sat_AIG_toCNF_State_addGate___redArg(x_2, x_3, x_4, x_7);
+x_12 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg(x_2, x_3, x_4, x_7);
 return x_12;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_addGate___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___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_Std_Sat_AIG_toCNF_State_addGate(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_12 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate(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_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
 return x_12;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_State_eval___redArg(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___redArg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
@@ -1004,66 +900,35 @@ x_4 = l_Std_Sat_CNF_eval___redArg(x_1, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_eval___redArg___boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___redArg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_Sat_AIG_toCNF_State_eval___redArg(x_1, x_2);
+x_3 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___redArg(x_1, x_2);
 lean_dec_ref(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT uint8_t l_Std_Sat_AIG_toCNF_State_eval(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT uint8_t l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; 
-x_4 = l_Std_Sat_AIG_toCNF_State_eval___redArg(x_2, x_3);
+x_4 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___redArg(x_2, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF_State_eval___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; 
-x_4 = l_Std_Sat_AIG_toCNF_State_eval(x_1, x_2, x_3);
+x_4 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_eval(x_1, x_2, x_3);
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
 x_5 = lean_box(x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_3 = lean_ctor_get(x_2, 0);
-x_4 = lean_ctor_get(x_1, 0);
-x_5 = lean_array_get_size(x_4);
-x_6 = lean_nat_add(x_5, x_3);
-return x_6;
-}
-else
-{
-lean_object* x_7; 
-x_7 = lean_ctor_get(x_2, 0);
-lean_inc(x_7);
-return x_7;
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; 
-x_3 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj(x_1, x_2);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-return x_3;
-}
-}
 LEAN_EXPORT lean_object* l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_go___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -1080,15 +945,14 @@ switch (lean_obj_tag(x_8)) {
 case 0:
 {
 lean_object* x_9; 
-x_9 = l_Std_Sat_AIG_toCNF_State_addFalse___redArg(x_3, x_2);
+x_9 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addFalse___redArg(x_3, x_2);
 return x_9;
 }
 case 1:
 {
 lean_object* x_10; lean_object* x_11; 
 x_10 = lean_ctor_get(x_8, 0);
-lean_inc(x_10);
-x_11 = l_Std_Sat_AIG_toCNF_State_addAtom___redArg(x_10, x_3, x_2);
+x_11 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addAtom___redArg(x_1, x_10, x_3, x_2);
 return x_11;
 }
 default: 
@@ -1101,7 +965,7 @@ x_15 = lean_nat_shiftr(x_12, x_14);
 x_16 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_go___redArg(x_1, x_15, x_3);
 x_17 = lean_nat_shiftr(x_13, x_14);
 x_18 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_go___redArg(x_1, x_17, x_16);
-x_19 = l_Std_Sat_AIG_toCNF_State_addGate___redArg(x_12, x_13, x_18, x_2);
+x_19 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_addGate___redArg(x_12, x_13, x_18, x_2);
 return x_19;
 }
 }
@@ -1274,7 +1138,7 @@ return x_8;
 LEAN_EXPORT lean_object* l_Std_Sat_AIG_toCNF(lean_object* x_1) {
 _start:
 {
-lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
 x_2 = lean_ctor_get(x_1, 1);
 lean_inc_ref(x_2);
 x_3 = lean_ctor_get(x_1, 0);
@@ -1292,77 +1156,70 @@ lean_inc(x_5);
 x_6 = lean_ctor_get_uint8(x_2, sizeof(void*)*1);
 lean_dec_ref(x_2);
 lean_inc_ref(x_3);
-x_7 = l_Std_Sat_AIG_toCNF_State_empty(x_3);
+x_7 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_State_empty(x_3);
 lean_inc(x_5);
 x_8 = l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_go___redArg(x_3, x_5, x_7);
-x_9 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_9, 0, x_5);
+lean_dec_ref(x_3);
 if (x_6 == 0)
 {
-uint8_t x_29; 
-x_29 = 1;
-x_10 = x_29;
-goto block_28;
+uint8_t x_24; 
+x_24 = 1;
+x_9 = x_24;
+goto block_23;
 }
 else
 {
-uint8_t x_30; 
-x_30 = 0;
-x_10 = x_30;
-goto block_28;
+uint8_t x_25; 
+x_25 = 0;
+x_9 = x_25;
+goto block_23;
 }
-block_28:
+block_23:
 {
-uint8_t x_11; 
-x_11 = !lean_is_exclusive(x_8);
-if (x_11 == 0)
+uint8_t x_10; 
+x_10 = !lean_is_exclusive(x_8);
+if (x_10 == 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; 
-x_12 = lean_ctor_get(x_8, 0);
-x_13 = lean_ctor_get(x_8, 1);
-lean_dec(x_13);
-x_14 = lean_box(x_10);
-lean_ctor_set(x_8, 1, x_14);
-lean_ctor_set(x_8, 0, x_9);
-x_15 = lean_box(0);
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_11 = lean_ctor_get(x_8, 0);
+x_12 = lean_ctor_get(x_8, 1);
+lean_dec(x_12);
+x_13 = lean_box(x_9);
+lean_ctor_set(x_8, 1, x_13);
+lean_ctor_set(x_8, 0, x_5);
+x_14 = lean_box(0);
 if (lean_is_scalar(x_4)) {
- x_16 = lean_alloc_ctor(1, 2, 0);
+ x_15 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_16 = x_4;
- lean_ctor_set_tag(x_16, 1);
+ x_15 = x_4;
+ lean_ctor_set_tag(x_15, 1);
 }
-lean_ctor_set(x_16, 0, x_8);
-lean_ctor_set(x_16, 1, x_15);
-x_17 = lean_array_push(x_12, x_16);
-x_18 = lean_alloc_closure((void*)(l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj___boxed), 2, 1);
-lean_closure_set(x_18, 0, x_3);
-x_19 = l_Std_Sat_CNF_relabel___redArg(x_18, x_17);
-return x_19;
+lean_ctor_set(x_15, 0, x_8);
+lean_ctor_set(x_15, 1, x_14);
+x_16 = lean_array_push(x_11, x_15);
+return x_16;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_20 = lean_ctor_get(x_8, 0);
-lean_inc(x_20);
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_17 = lean_ctor_get(x_8, 0);
+lean_inc(x_17);
 lean_dec(x_8);
-x_21 = lean_box(x_10);
-x_22 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_22, 0, x_9);
-lean_ctor_set(x_22, 1, x_21);
-x_23 = lean_box(0);
+x_18 = lean_box(x_9);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_5);
+lean_ctor_set(x_19, 1, x_18);
+x_20 = lean_box(0);
 if (lean_is_scalar(x_4)) {
- x_24 = lean_alloc_ctor(1, 2, 0);
+ x_21 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_24 = x_4;
- lean_ctor_set_tag(x_24, 1);
+ x_21 = x_4;
+ lean_ctor_set_tag(x_21, 1);
 }
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-x_25 = lean_array_push(x_20, x_24);
-x_26 = lean_alloc_closure((void*)(l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_toCNF_inj___boxed), 2, 1);
-lean_closure_set(x_26, 0, x_3);
-x_27 = l_Std_Sat_CNF_relabel___redArg(x_26, x_25);
-return x_27;
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+x_22 = lean_array_push(x_17, x_21);
+return x_22;
 }
 }
 }
@@ -1388,8 +1245,8 @@ lean_dec_ref(res);
 res = initialize_Init_Omega(builtin);
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0 = _init_l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0();
-lean_mark_persistent(l_Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0);
+l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0 = _init_l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0();
+lean_mark_persistent(l___private_Std_Sat_AIG_CNF_0__Std_Sat_AIG_Decl_falseToCNF___redArg___closed__0);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Std/Sync/CancellationContext.c b/stage0/stdlib/Std/Sync/CancellationContext.c
index 0ac55f7796..2e9c1e2898 100644
--- a/stage0/stdlib/Std/Sync/CancellationContext.c
+++ b/stage0/stdlib/Std/Sync/CancellationContext.c
@@ -1083,7 +1083,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_DTreeMap_Internal_Impl_insert___at___00Std_CancellationContext_new_spec__0___redArg(x_4, x_2, x_3);
 return x_5;
 }
@@ -1143,7 +1143,7 @@ _start:
 {
 uint64_t x_6; lean_object* x_7; 
 x_6 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_7 = l_Std_DTreeMap_Internal_Impl_insert___at___00Std_CancellationContext_new_spec__0(x_1, x_6, x_3, x_4, x_5);
 return x_7;
 }
@@ -1218,7 +1218,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_Const_modify___at___00Std_CancellationContext_fork_spec__0___lam__1(x_3, x_2);
 return x_4;
 }
@@ -1351,9 +1351,9 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DTreeMap_Internal_Impl_Const_modify___at___00Std_CancellationContext_fork_spec__0(x_4, x_5, x_3);
 return x_6;
 }
@@ -1432,7 +1432,7 @@ _start:
 {
 uint64_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_8 = l_Std_CancellationContext_fork___lam__0(x_1, x_7, x_3, x_4, x_5);
 lean_dec(x_5);
 lean_dec_ref(x_4);
@@ -3962,7 +3962,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = l_Std_DTreeMap_Internal_Impl_erase___at___00__private_Std_Sync_CancellationContext_0__Std_CancellationContext_cancelChildren_spec__2___redArg(x_3, x_2);
 return x_4;
 }
@@ -4017,7 +4017,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00__private_Std_Sync_CancellationContext_0__Std_CancellationContext_cancelChildren_spec__0___redArg(x_1, x_3);
 lean_dec(x_1);
 return x_4;
@@ -4121,7 +4121,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l___private_Std_Sync_CancellationContext_0__Std_CancellationContext_cancelChildren(x_1, x_5, x_3);
 return x_6;
 }
@@ -4139,7 +4139,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_3);
-lean_dec(x_3);
+lean_dec_ref(x_3);
 x_5 = l_Std_DTreeMap_Internal_Impl_Const_get_x3f___at___00__private_Std_Sync_CancellationContext_0__Std_CancellationContext_cancelChildren_spec__0(x_1, x_2, x_4);
 lean_dec(x_2);
 return x_5;
@@ -4158,7 +4158,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l_Std_DTreeMap_Internal_Impl_erase___at___00__private_Std_Sync_CancellationContext_0__Std_CancellationContext_cancelChildren_spec__2(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -4178,7 +4178,7 @@ _start:
 {
 uint64_t x_5; lean_object* x_6; 
 x_5 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_6 = l_Std_CancellationContext_cancel___lam__0(x_5, x_2, x_3);
 lean_dec(x_3);
 return x_6;
@@ -4408,7 +4408,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l___private_Std_Sync_CancellationContext_0__Std_CancellationContext_countAliveTokensRec(x_1, x_3);
 lean_dec_ref(x_1);
 return x_4;
@@ -4429,7 +4429,7 @@ _start:
 {
 uint64_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = l_Std_CancellationContext_countAliveTokens___lam__0(x_4, x_2);
 lean_dec(x_2);
 return x_5;
diff --git a/stage0/stdlib/Std/Tactic/BVDecide/LRAT/Parser.c b/stage0/stdlib/Std/Tactic/BVDecide/LRAT/Parser.c
index 7be824dd6c..b5d33e9503 100644
--- a/stage0/stdlib/Std/Tactic/BVDecide/LRAT/Parser.c
+++ b/stage0/stdlib/Std/Tactic/BVDecide/LRAT/Parser.c
@@ -7253,9 +7253,9 @@ _start:
 {
 uint64_t x_4; uint64_t x_5; lean_object* x_6; 
 x_4 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = l___private_Std_Tactic_BVDecide_LRAT_Parser_0__Std_Tactic_BVDecide_LRAT_Parser_Binary_parseLit_go(x_4, x_5, x_3);
 return x_6;
 }
@@ -10998,7 +10998,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_4 = l___private_Std_Tactic_BVDecide_LRAT_Parser_0__Std_Tactic_BVDecide_LRAT_lratProofToBinary_variableLengthEncode(x_1, x_3);
 return x_4;
 }
diff --git a/stage0/stdlib/Std/Time/Zoned/Database/Windows.c b/stage0/stdlib/Std/Time/Zoned/Database/Windows.c
index 1479af339d..20b7c99940 100644
--- a/stage0/stdlib/Std/Time/Zoned/Database/Windows.c
+++ b/stage0/stdlib/Std/Time/Zoned/Database/Windows.c
@@ -61,7 +61,7 @@ _start:
 {
 uint64_t x_5; uint8_t x_6; lean_object* x_7; 
 x_5 = lean_unbox_uint64(x_2);
-lean_dec(x_2);
+lean_dec_ref(x_2);
 x_6 = lean_unbox(x_3);
 x_7 = lean_windows_get_next_transition(x_1, x_5, x_6);
 lean_dec_ref(x_1);
@@ -73,7 +73,7 @@ _start:
 {
 uint64_t x_3; lean_object* x_4; 
 x_3 = lean_unbox_uint64(x_1);
-lean_dec(x_1);
+lean_dec_ref(x_1);
 x_4 = lean_get_windows_local_timezone_id_at(x_3);
 return x_4;
 }