diff --git a/src/stage0/init/data/hashmap/basic.c b/src/stage0/init/data/hashmap/basic.c
index 5b7af85775..cbf905c509 100644
--- a/src/stage0/init/data/hashmap/basic.c
+++ b/src/stage0/init/data/hashmap/basic.c
@@ -240,7 +240,7 @@ return x_6;
 lean_object* l_HashMapImp_reinsertAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; lean_object* x_12; size_t x_13; lean_object* x_14; 
+lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_5 = lean_array_get_size(x_2);
 lean_inc(x_3);
 x_6 = lean_apply_1(x_1, x_3);
@@ -248,17 +248,13 @@ x_7 = lean_unbox_usize(x_6);
 lean_dec(x_6);
 x_8 = lean_usize_modn(x_7, x_5);
 lean_dec(x_5);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_2, x_10);
-x_12 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_12, 0, x_3);
-lean_ctor_set(x_12, 1, x_4);
-lean_ctor_set(x_12, 2, x_11);
-x_13 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_14 = lean_array_uset(x_2, x_13, x_12);
-return x_14;
+x_9 = lean_array_uget(x_2, x_8);
+x_10 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_10, 0, x_3);
+lean_ctor_set(x_10, 1, x_4);
+lean_ctor_set(x_10, 2, x_9);
+x_11 = lean_array_uset(x_2, x_8, x_10);
+return x_11;
 }
 }
 lean_object* l_HashMapImp_reinsertAux(lean_object* x_1, lean_object* x_2) {
@@ -680,7 +676,7 @@ return x_4;
 lean_object* l_HashMapImp_find___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; 
 x_5 = lean_ctor_get(x_3, 1);
 x_6 = lean_array_get_size(x_5);
 lean_inc(x_4);
@@ -689,12 +685,9 @@ x_8 = lean_unbox_usize(x_7);
 lean_dec(x_7);
 x_9 = lean_usize_modn(x_8, x_6);
 lean_dec(x_6);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_12 = lean_array_uget(x_5, x_11);
-x_13 = l_AssocList_find___main___rarg(x_1, x_4, x_12);
-return x_13;
+x_10 = lean_array_uget(x_5, x_9);
+x_11 = l_AssocList_find___main___rarg(x_1, x_4, x_10);
+return x_11;
 }
 }
 lean_object* l_HashMapImp_find(lean_object* x_1, lean_object* x_2) {
@@ -717,7 +710,7 @@ return x_5;
 uint8_t l_HashMapImp_contains___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_3, 1);
 x_6 = lean_array_get_size(x_5);
 lean_inc(x_4);
@@ -726,12 +719,9 @@ x_8 = lean_unbox_usize(x_7);
 lean_dec(x_7);
 x_9 = lean_usize_modn(x_8, x_6);
 lean_dec(x_6);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_12 = lean_array_uget(x_5, x_11);
-x_13 = l_AssocList_contains___main___rarg(x_1, x_4, x_12);
-return x_13;
+x_10 = lean_array_uget(x_5, x_9);
+x_11 = l_AssocList_contains___main___rarg(x_1, x_4, x_10);
+return x_11;
 }
 }
 lean_object* l_HashMapImp_contains(lean_object* x_1, lean_object* x_2) {
@@ -766,7 +756,7 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_3);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; size_t x_14; lean_object* x_15; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; lean_object* x_12; 
 x_5 = lean_ctor_get(x_3, 0);
 x_6 = lean_ctor_get(x_3, 2);
 x_7 = lean_array_get_size(x_2);
@@ -777,47 +767,39 @@ x_9 = lean_unbox_usize(x_8);
 lean_dec(x_8);
 x_10 = lean_usize_modn(x_9, x_7);
 lean_dec(x_7);
-x_11 = lean_box_usize(x_10);
-x_12 = lean_unbox_usize(x_11);
-x_13 = lean_array_uget(x_2, x_12);
-lean_ctor_set(x_3, 2, x_13);
-x_14 = lean_unbox_usize(x_11);
-lean_dec(x_11);
-x_15 = lean_array_uset(x_2, x_14, x_3);
-x_2 = x_15;
+x_11 = lean_array_uget(x_2, x_10);
+lean_ctor_set(x_3, 2, x_11);
+x_12 = lean_array_uset(x_2, x_10, x_3);
+x_2 = x_12;
 x_3 = x_6;
 goto _start;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; size_t x_22; size_t x_23; lean_object* x_24; size_t x_25; lean_object* x_26; lean_object* x_27; size_t x_28; lean_object* x_29; 
-x_17 = lean_ctor_get(x_3, 0);
-x_18 = lean_ctor_get(x_3, 1);
-x_19 = lean_ctor_get(x_3, 2);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_inc(x_17);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_14 = lean_ctor_get(x_3, 0);
+x_15 = lean_ctor_get(x_3, 1);
+x_16 = lean_ctor_get(x_3, 2);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_inc(x_14);
 lean_dec(x_3);
-x_20 = lean_array_get_size(x_2);
+x_17 = lean_array_get_size(x_2);
 lean_inc(x_1);
-lean_inc(x_17);
-x_21 = lean_apply_1(x_1, x_17);
-x_22 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_23 = lean_usize_modn(x_22, x_20);
-lean_dec(x_20);
-x_24 = lean_box_usize(x_23);
-x_25 = lean_unbox_usize(x_24);
-x_26 = lean_array_uget(x_2, x_25);
-x_27 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_27, 0, x_17);
-lean_ctor_set(x_27, 1, x_18);
-lean_ctor_set(x_27, 2, x_26);
-x_28 = lean_unbox_usize(x_24);
-lean_dec(x_24);
-x_29 = lean_array_uset(x_2, x_28, x_27);
-x_2 = x_29;
-x_3 = x_19;
+lean_inc(x_14);
+x_18 = lean_apply_1(x_1, x_14);
+x_19 = lean_unbox_usize(x_18);
+lean_dec(x_18);
+x_20 = lean_usize_modn(x_19, x_17);
+lean_dec(x_17);
+x_21 = lean_array_uget(x_2, x_20);
+x_22 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_22, 0, x_14);
+lean_ctor_set(x_22, 1, x_15);
+lean_ctor_set(x_22, 2, x_21);
+x_23 = lean_array_uset(x_2, x_20, x_22);
+x_2 = x_23;
+x_3 = x_16;
 goto _start;
 }
 }
@@ -920,7 +902,7 @@ uint8_t x_6;
 x_6 = !lean_is_exclusive(x_3);
 if (x_6 == 0)
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; lean_object* x_13; size_t x_14; lean_object* x_15; uint8_t x_16; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; lean_object* x_13; uint8_t x_14; 
 x_7 = lean_ctor_get(x_3, 0);
 x_8 = lean_ctor_get(x_3, 1);
 x_9 = lean_array_get_size(x_8);
@@ -930,124 +912,112 @@ x_10 = lean_apply_1(x_2, x_4);
 x_11 = lean_unbox_usize(x_10);
 lean_dec(x_10);
 x_12 = lean_usize_modn(x_11, x_9);
-x_13 = lean_box_usize(x_12);
-x_14 = lean_unbox_usize(x_13);
-x_15 = lean_array_uget(x_8, x_14);
-lean_inc(x_15);
+x_13 = lean_array_uget(x_8, x_12);
+lean_inc(x_13);
 lean_inc(x_4);
 lean_inc(x_1);
-x_16 = l_AssocList_contains___main___rarg(x_1, x_4, x_15);
-if (x_16 == 0)
+x_14 = l_AssocList_contains___main___rarg(x_1, x_4, x_13);
+if (x_14 == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; size_t x_20; lean_object* x_21; uint8_t x_22; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
 lean_dec(x_1);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_nat_add(x_7, x_17);
+x_15 = lean_unsigned_to_nat(1u);
+x_16 = lean_nat_add(x_7, x_15);
 lean_dec(x_7);
-x_19 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_19, 0, x_4);
-lean_ctor_set(x_19, 1, x_5);
-lean_ctor_set(x_19, 2, x_15);
-x_20 = lean_unbox_usize(x_13);
-lean_dec(x_13);
-x_21 = lean_array_uset(x_8, x_20, x_19);
-x_22 = lean_nat_dec_le(x_18, x_9);
+x_17 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_17, 0, x_4);
+lean_ctor_set(x_17, 1, x_5);
+lean_ctor_set(x_17, 2, x_13);
+x_18 = lean_array_uset(x_8, x_12, x_17);
+x_19 = lean_nat_dec_le(x_16, x_9);
 lean_dec(x_9);
-if (x_22 == 0)
+if (x_19 == 0)
 {
-lean_object* x_23; 
+lean_object* x_20; 
 lean_free_object(x_3);
-x_23 = l_HashMapImp_expand___rarg(x_2, x_18, x_21);
-return x_23;
+x_20 = l_HashMapImp_expand___rarg(x_2, x_16, x_18);
+return x_20;
 }
 else
 {
 lean_dec(x_2);
-lean_ctor_set(x_3, 1, x_21);
-lean_ctor_set(x_3, 0, x_18);
+lean_ctor_set(x_3, 1, x_18);
+lean_ctor_set(x_3, 0, x_16);
 return x_3;
 }
 }
 else
 {
-lean_object* x_24; size_t x_25; lean_object* x_26; 
+lean_object* x_21; lean_object* x_22; 
 lean_dec(x_9);
 lean_dec(x_2);
-x_24 = l_AssocList_replace___main___rarg(x_1, x_4, x_5, x_15);
-x_25 = lean_unbox_usize(x_13);
-lean_dec(x_13);
-x_26 = lean_array_uset(x_8, x_25, x_24);
-lean_ctor_set(x_3, 1, x_26);
+x_21 = l_AssocList_replace___main___rarg(x_1, x_4, x_5, x_13);
+x_22 = lean_array_uset(x_8, x_12, x_21);
+lean_ctor_set(x_3, 1, x_22);
 return x_3;
 }
 }
 else
 {
-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; size_t x_34; lean_object* x_35; uint8_t x_36; 
-x_27 = lean_ctor_get(x_3, 0);
-x_28 = lean_ctor_get(x_3, 1);
-lean_inc(x_28);
-lean_inc(x_27);
+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; uint8_t x_30; 
+x_23 = lean_ctor_get(x_3, 0);
+x_24 = lean_ctor_get(x_3, 1);
+lean_inc(x_24);
+lean_inc(x_23);
 lean_dec(x_3);
-x_29 = lean_array_get_size(x_28);
+x_25 = lean_array_get_size(x_24);
 lean_inc(x_2);
 lean_inc(x_4);
-x_30 = lean_apply_1(x_2, x_4);
-x_31 = lean_unbox_usize(x_30);
-lean_dec(x_30);
-x_32 = lean_usize_modn(x_31, x_29);
-x_33 = lean_box_usize(x_32);
-x_34 = lean_unbox_usize(x_33);
-x_35 = lean_array_uget(x_28, x_34);
-lean_inc(x_35);
+x_26 = lean_apply_1(x_2, x_4);
+x_27 = lean_unbox_usize(x_26);
+lean_dec(x_26);
+x_28 = lean_usize_modn(x_27, x_25);
+x_29 = lean_array_uget(x_24, x_28);
+lean_inc(x_29);
 lean_inc(x_4);
 lean_inc(x_1);
-x_36 = l_AssocList_contains___main___rarg(x_1, x_4, x_35);
-if (x_36 == 0)
+x_30 = l_AssocList_contains___main___rarg(x_1, x_4, x_29);
+if (x_30 == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; size_t x_40; lean_object* x_41; uint8_t x_42; 
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
 lean_dec(x_1);
-x_37 = lean_unsigned_to_nat(1u);
-x_38 = lean_nat_add(x_27, x_37);
-lean_dec(x_27);
-x_39 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_39, 0, x_4);
-lean_ctor_set(x_39, 1, x_5);
-lean_ctor_set(x_39, 2, x_35);
-x_40 = lean_unbox_usize(x_33);
-lean_dec(x_33);
-x_41 = lean_array_uset(x_28, x_40, x_39);
-x_42 = lean_nat_dec_le(x_38, x_29);
-lean_dec(x_29);
-if (x_42 == 0)
+x_31 = lean_unsigned_to_nat(1u);
+x_32 = lean_nat_add(x_23, x_31);
+lean_dec(x_23);
+x_33 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_33, 0, x_4);
+lean_ctor_set(x_33, 1, x_5);
+lean_ctor_set(x_33, 2, x_29);
+x_34 = lean_array_uset(x_24, x_28, x_33);
+x_35 = lean_nat_dec_le(x_32, x_25);
+lean_dec(x_25);
+if (x_35 == 0)
 {
-lean_object* x_43; 
-x_43 = l_HashMapImp_expand___rarg(x_2, x_38, x_41);
-return x_43;
+lean_object* x_36; 
+x_36 = l_HashMapImp_expand___rarg(x_2, x_32, x_34);
+return x_36;
 }
 else
 {
-lean_object* x_44; 
+lean_object* x_37; 
 lean_dec(x_2);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_38);
-lean_ctor_set(x_44, 1, x_41);
-return x_44;
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_32);
+lean_ctor_set(x_37, 1, x_34);
+return x_37;
 }
 }
 else
 {
-lean_object* x_45; size_t x_46; lean_object* x_47; lean_object* x_48; 
-lean_dec(x_29);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_dec(x_25);
 lean_dec(x_2);
-x_45 = l_AssocList_replace___main___rarg(x_1, x_4, x_5, x_35);
-x_46 = lean_unbox_usize(x_33);
-lean_dec(x_33);
-x_47 = lean_array_uset(x_28, x_46, x_45);
-x_48 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_48, 0, x_27);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
+x_38 = l_AssocList_replace___main___rarg(x_1, x_4, x_5, x_29);
+x_39 = lean_array_uset(x_24, x_28, x_38);
+x_40 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_40, 0, x_23);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
 }
 }
 }
@@ -1063,7 +1033,7 @@ return x_3;
 lean_object* l_HashMapImp_erase___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; uint8_t x_14; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; uint8_t x_12; 
 x_5 = lean_ctor_get(x_3, 0);
 lean_inc(x_5);
 x_6 = lean_ctor_get(x_3, 1);
@@ -1075,16 +1045,13 @@ x_9 = lean_unbox_usize(x_8);
 lean_dec(x_8);
 x_10 = lean_usize_modn(x_9, x_7);
 lean_dec(x_7);
-x_11 = lean_box_usize(x_10);
-x_12 = lean_unbox_usize(x_11);
-x_13 = lean_array_uget(x_6, x_12);
-lean_inc(x_13);
+x_11 = lean_array_uget(x_6, x_10);
+lean_inc(x_11);
 lean_inc(x_4);
 lean_inc(x_1);
-x_14 = l_AssocList_contains___main___rarg(x_1, x_4, x_13);
-if (x_14 == 0)
+x_12 = l_AssocList_contains___main___rarg(x_1, x_4, x_11);
+if (x_12 == 0)
 {
-lean_dec(x_13);
 lean_dec(x_11);
 lean_dec(x_6);
 lean_dec(x_5);
@@ -1094,41 +1061,37 @@ return x_3;
 }
 else
 {
-uint8_t x_15; 
-x_15 = !lean_is_exclusive(x_3);
-if (x_15 == 0)
+uint8_t x_13; 
+x_13 = !lean_is_exclusive(x_3);
+if (x_13 == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; size_t x_21; lean_object* x_22; 
-x_16 = lean_ctor_get(x_3, 1);
-lean_dec(x_16);
-x_17 = lean_ctor_get(x_3, 0);
-lean_dec(x_17);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_sub(x_5, x_18);
+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 = lean_ctor_get(x_3, 1);
+lean_dec(x_14);
+x_15 = lean_ctor_get(x_3, 0);
+lean_dec(x_15);
+x_16 = lean_unsigned_to_nat(1u);
+x_17 = lean_nat_sub(x_5, x_16);
 lean_dec(x_5);
-x_20 = l_AssocList_erase___main___rarg(x_1, x_4, x_13);
-x_21 = lean_unbox_usize(x_11);
-lean_dec(x_11);
-x_22 = lean_array_uset(x_6, x_21, x_20);
-lean_ctor_set(x_3, 1, x_22);
-lean_ctor_set(x_3, 0, x_19);
+x_18 = l_AssocList_erase___main___rarg(x_1, x_4, x_11);
+x_19 = lean_array_uset(x_6, x_10, x_18);
+lean_ctor_set(x_3, 1, x_19);
+lean_ctor_set(x_3, 0, x_17);
 return x_3;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; size_t 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_dec(x_3);
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = lean_nat_sub(x_5, x_23);
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_sub(x_5, x_20);
 lean_dec(x_5);
-x_25 = l_AssocList_erase___main___rarg(x_1, x_4, x_13);
-x_26 = lean_unbox_usize(x_11);
-lean_dec(x_11);
-x_27 = lean_array_uset(x_6, x_26, x_25);
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_24);
-lean_ctor_set(x_28, 1, x_27);
-return x_28;
+x_22 = l_AssocList_erase___main___rarg(x_1, x_4, x_11);
+x_23 = lean_array_uset(x_6, x_10, x_22);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_21);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
 }
 }
 }
diff --git a/src/stage0/init/lean/attributes.c b/src/stage0/init/lean/attributes.c
index 6e86bf7c0a..ab930616d8 100644
--- a/src/stage0/init/lean/attributes.c
+++ b/src/stage0/init/lean/attributes.c
@@ -692,19 +692,16 @@ return x_8;
 uint8_t l_HashMapImp_contains___at_Lean_registerAttribute___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_registerAttribute___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_registerAttribute___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_AssocList_mfoldl___main___at_Lean_registerAttribute___spec__6(lean_object* x_1, lean_object* x_2) {
@@ -720,50 +717,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -896,114 +885,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_registerAttribute___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_registerAttribute___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_registerAttribute___spec__4(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_registerAttribute___spec__4(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_registerAttribute___spec__7(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_registerAttribute___spec__7(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_registerAttribute___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_registerAttribute___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_registerAttribute___spec__4(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_registerAttribute___spec__4(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_registerAttribute___spec__7(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_registerAttribute___spec__7(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -2795,19 +2772,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_getAttributeImpl___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_getAttributeImpl___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_getAttributeImpl___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* _init_l_Lean_getAttributeImpl___closed__1() {
diff --git a/src/stage0/init/lean/class.c b/src/stage0/init/lean/class.c
index c10f638cd4..624eba69cb 100644
--- a/src/stage0/init/lean/class.c
+++ b/src/stage0/init/lean/class.c
@@ -2924,50 +2924,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -3102,116 +3094,104 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__5(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__5(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; lean_object* x_19; uint8_t x_20; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_box(x_3);
-x_17 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_17, 0, x_2);
-lean_ctor_set(x_17, 1, x_16);
-lean_ctor_set(x_17, 2, x_12);
-x_18 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_19 = lean_array_uset(x_6, x_18, x_17);
-x_20 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_box(x_3);
+x_15 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_15, 0, x_2);
+lean_ctor_set(x_15, 1, x_14);
+lean_ctor_set(x_15, 2, x_10);
+x_16 = lean_array_uset(x_6, x_9, x_15);
+x_17 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_20 == 0)
+if (x_17 == 0)
 {
-lean_object* x_21; 
+lean_object* x_18; 
 lean_free_object(x_1);
-x_21 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__6(x_15, x_19);
-return x_21;
+x_18 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__6(x_13, x_16);
+return x_18;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_19);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_16);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_22; size_t x_23; lean_object* x_24; 
+lean_object* x_19; lean_object* x_20; 
 lean_dec(x_7);
-x_22 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__9(x_2, x_3, x_12);
-x_23 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_24 = lean_array_uset(x_6, x_23, x_22);
-lean_ctor_set(x_1, 1, x_24);
+x_19 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__9(x_2, x_3, x_10);
+x_20 = lean_array_uset(x_6, x_9, x_19);
+lean_ctor_set(x_1, 1, x_20);
 return x_1;
 }
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; size_t x_28; size_t x_29; lean_object* x_30; size_t x_31; lean_object* x_32; uint8_t x_33; 
-x_25 = lean_ctor_get(x_1, 0);
-x_26 = lean_ctor_get(x_1, 1);
-lean_inc(x_26);
-lean_inc(x_25);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; size_t x_25; lean_object* x_26; uint8_t x_27; 
+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_1);
-x_27 = lean_array_get_size(x_26);
-x_28 = lean_name_hash_usize(x_2);
-x_29 = lean_usize_modn(x_28, x_27);
-x_30 = lean_box_usize(x_29);
-x_31 = lean_unbox_usize(x_30);
-x_32 = lean_array_uget(x_26, x_31);
-x_33 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__5(x_2, x_32);
+x_23 = lean_array_get_size(x_22);
+x_24 = lean_name_hash_usize(x_2);
+x_25 = lean_usize_modn(x_24, x_23);
+x_26 = lean_array_uget(x_22, x_25);
+x_27 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__5(x_2, x_26);
+if (x_27 == 0)
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
+x_28 = lean_unsigned_to_nat(1u);
+x_29 = lean_nat_add(x_21, x_28);
+lean_dec(x_21);
+x_30 = lean_box(x_3);
+x_31 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_31, 0, x_2);
+lean_ctor_set(x_31, 1, x_30);
+lean_ctor_set(x_31, 2, x_26);
+x_32 = lean_array_uset(x_22, x_25, x_31);
+x_33 = lean_nat_dec_le(x_29, x_23);
+lean_dec(x_23);
 if (x_33 == 0)
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; size_t x_38; lean_object* x_39; uint8_t x_40; 
-x_34 = lean_unsigned_to_nat(1u);
-x_35 = lean_nat_add(x_25, x_34);
-lean_dec(x_25);
-x_36 = lean_box(x_3);
-x_37 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_37, 0, x_2);
-lean_ctor_set(x_37, 1, x_36);
-lean_ctor_set(x_37, 2, x_32);
-x_38 = lean_unbox_usize(x_30);
-lean_dec(x_30);
-x_39 = lean_array_uset(x_26, x_38, x_37);
-x_40 = lean_nat_dec_le(x_35, x_27);
-lean_dec(x_27);
-if (x_40 == 0)
-{
-lean_object* x_41; 
-x_41 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__6(x_35, x_39);
-return x_41;
+lean_object* x_34; 
+x_34 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__6(x_29, x_32);
+return x_34;
 }
 else
 {
-lean_object* x_42; 
-x_42 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_42, 0, x_35);
-lean_ctor_set(x_42, 1, x_39);
-return x_42;
+lean_object* x_35; 
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_29);
+lean_ctor_set(x_35, 1, x_32);
+return x_35;
 }
 }
 else
 {
-lean_object* x_43; size_t x_44; lean_object* x_45; lean_object* x_46; 
-lean_dec(x_27);
-x_43 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__9(x_2, x_3, x_32);
-x_44 = lean_unbox_usize(x_30);
-lean_dec(x_30);
-x_45 = lean_array_uset(x_26, x_44, x_43);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_25);
-lean_ctor_set(x_46, 1, x_45);
-return x_46;
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_dec(x_23);
+x_36 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__9(x_2, x_3, x_26);
+x_37 = lean_array_uset(x_22, x_25, x_36);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_21);
+lean_ctor_set(x_38, 1, x_37);
+return x_38;
 }
 }
 }
@@ -3357,19 +3337,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_ClassState_addEntry___spec__12(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_ClassState_addEntry___spec__13(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_ClassState_addEntry___spec__13(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_ClassState_addEntry___spec__10(lean_object* x_1, lean_object* x_2) {
@@ -3445,50 +3422,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -3621,114 +3590,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__16(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__16(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__17(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__17(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__20(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__20(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__16(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__16(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__17(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__17(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__20(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__20(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -6289,50 +6246,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -6465,114 +6414,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__25(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__25(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__26(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__26(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__29(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__29(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__25(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__25(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__26(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__26(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__29(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_ClassState_addEntry___spec__29(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -9155,19 +9092,16 @@ return x_2;
 uint8_t l_HashMapImp_contains___at_Lean_isClass___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__5(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__5(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_RBNode_find___main___at_Lean_isClass___spec__3(lean_object* x_1, lean_object* x_2) {
@@ -9318,19 +9252,16 @@ return x_4;
 uint8_t l_HashMapImp_contains___at_Lean_isInstance___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__16(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_ClassState_addEntry___spec__16(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 uint8_t l_Lean_SMap_contains___at_Lean_isInstance___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -9489,19 +9420,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_hasOutParams___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_hasOutParams___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_hasOutParams___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_hasOutParams___spec__1(lean_object* x_1, lean_object* x_2) {
diff --git a/src/stage0/init/lean/compiler/closedtermcache.c b/src/stage0/init/lean/compiler/closedtermcache.c
index bc01caa3b8..19ef3b860b 100644
--- a/src/stage0/init/lean/compiler/closedtermcache.c
+++ b/src/stage0/init/lean/compiler/closedtermcache.c
@@ -2622,50 +2622,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_expr_hash(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_expr_hash(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_expr_hash(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -2798,114 +2790,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_expr_hash(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_mkClosedTermCacheExtension___spec__5(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_mkClosedTermCacheExtension___spec__5(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_mkClosedTermCacheExtension___spec__6(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_mkClosedTermCacheExtension___spec__6(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_mkClosedTermCacheExtension___spec__9(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_mkClosedTermCacheExtension___spec__9(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_expr_hash(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_mkClosedTermCacheExtension___spec__5(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_expr_hash(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_mkClosedTermCacheExtension___spec__5(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_mkClosedTermCacheExtension___spec__6(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_mkClosedTermCacheExtension___spec__6(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_mkClosedTermCacheExtension___spec__9(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_mkClosedTermCacheExtension___spec__9(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -5320,19 +5300,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_getClosedTermName___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_expr_hash(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_getClosedTermName___spec__4(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_getClosedTermName___spec__4(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_getClosedTermName___spec__1(lean_object* x_1, lean_object* x_2) {
diff --git a/src/stage0/init/lean/compiler/ir/borrow.c b/src/stage0/init/lean/compiler/ir/borrow.c
index 1947b77e3f..472dda8e50 100644
--- a/src/stage0/init/lean/compiler/ir/borrow.c
+++ b/src/stage0/init/lean/compiler/ir/borrow.c
@@ -695,50 +695,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = l_Lean_IR_Borrow_Key_getHash(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = l_Lean_IR_Borrow_Key_getHash(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = l_Lean_IR_Borrow_Key_getHash(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -871,114 +863,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = l_Lean_IR_Borrow_Key_getHash(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__3(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__3(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__6(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__6(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = l_Lean_IR_Borrow_Key_getHash(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = l_Lean_IR_Borrow_Key_getHash(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__3(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__3(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__6(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_IR_Borrow_InitParamMap_visitFnBody___main___spec__6(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -1230,19 +1210,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___main___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = l_Lean_IR_Borrow_Key_getHash(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___main___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___main___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_IR_Borrow_ApplyParamMap_visitFnBody___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
diff --git a/src/stage0/init/lean/compiler/ir/compilerm.c b/src/stage0/init/lean/compiler/ir/compilerm.c
index c162950914..70dc5004ad 100644
--- a/src/stage0/init/lean/compiler/ir/compilerm.c
+++ b/src/stage0/init/lean/compiler/ir/compilerm.c
@@ -985,50 +985,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -1161,114 +1153,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__3(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__3(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__4(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__4(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__7(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__7(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__3(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__3(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__4(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__4(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__7(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__7(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -6195,19 +6175,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_IR_findEnvDecl___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_IR_findEnvDecl___spec__4(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_IR_findEnvDecl___spec__4(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_IR_findEnvDecl___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -6350,19 +6327,16 @@ return x_4;
 uint8_t l_HashMapImp_contains___at_Lean_IR_containsDecl___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at___private_init_lean_compiler_ir_compilerm_4__mkEntryArray___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 uint8_t l_Lean_SMap_contains___at_Lean_IR_containsDecl___spec__1(lean_object* x_1, lean_object* x_2) {
diff --git a/src/stage0/init/lean/compiler/ir/emitc.c b/src/stage0/init/lean/compiler/ir/emitc.c
index 5ff5dd4721..00bfeaaa23 100644
--- a/src/stage0/init/lean/compiler/ir/emitc.c
+++ b/src/stage0/init/lean/compiler/ir/emitc.c
@@ -6350,19 +6350,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_IR_EmitC_isObj___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_usize_of_nat(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_IR_EmitC_isObj___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_IR_EmitC_isObj___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_IR_EmitC_isObj(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
@@ -6510,19 +6507,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_IR_EmitC_getJPParams___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_usize_of_nat(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_IR_EmitC_getJPParams___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_IR_EmitC_getJPParams___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* _init_l_Lean_IR_EmitC_getJPParams___closed__1() {
diff --git a/src/stage0/init/lean/compiler/ir/emitutil.c b/src/stage0/init/lean/compiler/ir/emitutil.c
index bd886706bc..03e8674ee5 100644
--- a/src/stage0/init/lean/compiler/ir/emitutil.c
+++ b/src/stage0/init/lean/compiler/ir/emitutil.c
@@ -1017,50 +1017,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_usize_of_nat(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_usize_of_nat(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_usize_of_nat(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -1195,116 +1187,104 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_usize_of_nat(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectVar___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectVar___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; lean_object* x_19; uint8_t x_20; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_box(x_3);
-x_17 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_17, 0, x_2);
-lean_ctor_set(x_17, 1, x_16);
-lean_ctor_set(x_17, 2, x_12);
-x_18 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_19 = lean_array_uset(x_6, x_18, x_17);
-x_20 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_box(x_3);
+x_15 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_15, 0, x_2);
+lean_ctor_set(x_15, 1, x_14);
+lean_ctor_set(x_15, 2, x_10);
+x_16 = lean_array_uset(x_6, x_9, x_15);
+x_17 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_20 == 0)
+if (x_17 == 0)
 {
-lean_object* x_21; 
+lean_object* x_18; 
 lean_free_object(x_1);
-x_21 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectVar___spec__3(x_15, x_19);
-return x_21;
+x_18 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectVar___spec__3(x_13, x_16);
+return x_18;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_19);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_16);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_22; size_t x_23; lean_object* x_24; 
+lean_object* x_19; lean_object* x_20; 
 lean_dec(x_7);
-x_22 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectVar___spec__6(x_2, x_3, x_12);
-x_23 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_24 = lean_array_uset(x_6, x_23, x_22);
-lean_ctor_set(x_1, 1, x_24);
+x_19 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectVar___spec__6(x_2, x_3, x_10);
+x_20 = lean_array_uset(x_6, x_9, x_19);
+lean_ctor_set(x_1, 1, x_20);
 return x_1;
 }
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; size_t x_28; size_t x_29; lean_object* x_30; size_t x_31; lean_object* x_32; uint8_t x_33; 
-x_25 = lean_ctor_get(x_1, 0);
-x_26 = lean_ctor_get(x_1, 1);
-lean_inc(x_26);
-lean_inc(x_25);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; size_t x_25; lean_object* x_26; uint8_t x_27; 
+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_1);
-x_27 = lean_array_get_size(x_26);
-x_28 = lean_usize_of_nat(x_2);
-x_29 = lean_usize_modn(x_28, x_27);
-x_30 = lean_box_usize(x_29);
-x_31 = lean_unbox_usize(x_30);
-x_32 = lean_array_uget(x_26, x_31);
-x_33 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectVar___spec__2(x_2, x_32);
+x_23 = lean_array_get_size(x_22);
+x_24 = lean_usize_of_nat(x_2);
+x_25 = lean_usize_modn(x_24, x_23);
+x_26 = lean_array_uget(x_22, x_25);
+x_27 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectVar___spec__2(x_2, x_26);
+if (x_27 == 0)
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
+x_28 = lean_unsigned_to_nat(1u);
+x_29 = lean_nat_add(x_21, x_28);
+lean_dec(x_21);
+x_30 = lean_box(x_3);
+x_31 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_31, 0, x_2);
+lean_ctor_set(x_31, 1, x_30);
+lean_ctor_set(x_31, 2, x_26);
+x_32 = lean_array_uset(x_22, x_25, x_31);
+x_33 = lean_nat_dec_le(x_29, x_23);
+lean_dec(x_23);
 if (x_33 == 0)
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; size_t x_38; lean_object* x_39; uint8_t x_40; 
-x_34 = lean_unsigned_to_nat(1u);
-x_35 = lean_nat_add(x_25, x_34);
-lean_dec(x_25);
-x_36 = lean_box(x_3);
-x_37 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_37, 0, x_2);
-lean_ctor_set(x_37, 1, x_36);
-lean_ctor_set(x_37, 2, x_32);
-x_38 = lean_unbox_usize(x_30);
-lean_dec(x_30);
-x_39 = lean_array_uset(x_26, x_38, x_37);
-x_40 = lean_nat_dec_le(x_35, x_27);
-lean_dec(x_27);
-if (x_40 == 0)
-{
-lean_object* x_41; 
-x_41 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectVar___spec__3(x_35, x_39);
-return x_41;
+lean_object* x_34; 
+x_34 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectVar___spec__3(x_29, x_32);
+return x_34;
 }
 else
 {
-lean_object* x_42; 
-x_42 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_42, 0, x_35);
-lean_ctor_set(x_42, 1, x_39);
-return x_42;
+lean_object* x_35; 
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_29);
+lean_ctor_set(x_35, 1, x_32);
+return x_35;
 }
 }
 else
 {
-lean_object* x_43; size_t x_44; lean_object* x_45; lean_object* x_46; 
-lean_dec(x_27);
-x_43 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectVar___spec__6(x_2, x_3, x_32);
-x_44 = lean_unbox_usize(x_30);
-lean_dec(x_30);
-x_45 = lean_array_uset(x_26, x_44, x_43);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_25);
-lean_ctor_set(x_46, 1, x_45);
-return x_46;
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_dec(x_23);
+x_36 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectVar___spec__6(x_2, x_3, x_26);
+x_37 = lean_array_uset(x_22, x_25, x_36);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_21);
+lean_ctor_set(x_38, 1, x_37);
+return x_38;
 }
 }
 }
@@ -1501,50 +1481,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_usize_of_nat(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_usize_of_nat(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_usize_of_nat(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -1677,114 +1649,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_usize_of_nat(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectJP___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectJP___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectJP___spec__3(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectJP___spec__3(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectJP___spec__6(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectJP___spec__6(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_usize_of_nat(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectJP___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_usize_of_nat(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_IR_CollectMaps_collectJP___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectJP___spec__3(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_IR_CollectMaps_collectJP___spec__3(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectJP___spec__6(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_IR_CollectMaps_collectJP___spec__6(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
diff --git a/src/stage0/init/lean/compiler/ir/expandresetreuse.c b/src/stage0/init/lean/compiler/ir/expandresetreuse.c
index e28641ee16..d5206033b4 100644
--- a/src/stage0/init/lean/compiler/ir/expandresetreuse.c
+++ b/src/stage0/init/lean/compiler/ir/expandresetreuse.c
@@ -172,50 +172,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_usize_of_nat(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_usize_of_nat(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_usize_of_nat(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -348,114 +340,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_usize_of_nat(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__3(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__3(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__6(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__6(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_usize_of_nat(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_usize_of_nat(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__3(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__3(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__6(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_IR_ExpandResetReuse_CollectProjMap_collectVDecl___spec__6(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -1982,19 +1962,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_IR_ExpandResetReuse_isSelfSet___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_usize_of_nat(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_IR_ExpandResetReuse_isSelfSet___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_IR_ExpandResetReuse_isSelfSet___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 uint8_t l_Lean_IR_ExpandResetReuse_isSelfSet(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
diff --git a/src/stage0/init/lean/compiler/specialize.c b/src/stage0/init/lean/compiler/specialize.c
index 36f13f7b96..600406c581 100644
--- a/src/stage0/init/lean/compiler/specialize.c
+++ b/src/stage0/init/lean/compiler/specialize.c
@@ -5976,50 +5976,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -6152,114 +6144,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__5(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__5(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__6(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__6(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__9(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__9(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__5(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__5(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__6(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__6(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__9(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__9(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -8820,50 +8800,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_expr_hash(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_expr_hash(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_expr_hash(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -8996,114 +8968,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_expr_hash(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__14(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__14(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__15(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__15(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__18(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__18(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_expr_hash(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__14(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_expr_hash(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_Compiler_SpecState_addEntry___spec__14(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__15(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_Compiler_SpecState_addEntry___spec__15(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__18(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_Compiler_SpecState_addEntry___spec__18(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -11588,19 +11548,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Compiler_getSpecializationInfo___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Compiler_getSpecializationInfo___spec__4(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Compiler_getSpecializationInfo___spec__4(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_Compiler_getSpecializationInfo___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -11780,19 +11737,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Compiler_getCachedSpecialization___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_expr_hash(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Compiler_getCachedSpecialization___spec__4(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Compiler_getCachedSpecialization___spec__4(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_Compiler_getCachedSpecialization___spec__1(lean_object* x_1, lean_object* x_2) {
diff --git a/src/stage0/init/lean/elaborator/alias.c b/src/stage0/init/lean/elaborator/alias.c
index bc40eb8277..d679963016 100644
--- a/src/stage0/init/lean/elaborator/alias.c
+++ b/src/stage0/init/lean/elaborator/alias.c
@@ -207,19 +207,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_addAliasEntry___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_addAliasEntry___spec__4(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_addAliasEntry___spec__4(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_addAliasEntry___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -2746,50 +2743,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -2922,114 +2911,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_addAliasEntry___spec__9(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_addAliasEntry___spec__9(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_addAliasEntry___spec__10(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_addAliasEntry___spec__10(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_addAliasEntry___spec__13(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_addAliasEntry___spec__13(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_addAliasEntry___spec__9(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_addAliasEntry___spec__9(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_addAliasEntry___spec__10(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_addAliasEntry___spec__10(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_addAliasEntry___spec__13(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_addAliasEntry___spec__13(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
diff --git a/src/stage0/init/lean/elaborator/basic.c b/src/stage0/init/lean/elaborator/basic.c
index 5452e73bf9..d612cdf1f3 100644
--- a/src/stage0/init/lean/elaborator/basic.c
+++ b/src/stage0/init/lean/elaborator/basic.c
@@ -740,19 +740,16 @@ return x_8;
 uint8_t l_HashMapImp_contains___at_Lean_addBuiltinTermElab___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_addBuiltinTermElab___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_addBuiltinTermElab___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_RBNode_find___main___at_Lean_addBuiltinTermElab___spec__4(lean_object* x_1, lean_object* x_2) {
@@ -3307,50 +3304,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -3483,114 +3472,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_addBuiltinTermElab___spec__3(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_addBuiltinTermElab___spec__3(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_addBuiltinTermElab___spec__9(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_addBuiltinTermElab___spec__9(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_addBuiltinTermElab___spec__12(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_addBuiltinTermElab___spec__12(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_addBuiltinTermElab___spec__3(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_addBuiltinTermElab___spec__3(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_addBuiltinTermElab___spec__9(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_addBuiltinTermElab___spec__9(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_addBuiltinTermElab___spec__12(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_addBuiltinTermElab___spec__12(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -4114,19 +4091,16 @@ return x_8;
 uint8_t l_HashMapImp_contains___at_Lean_addBuiltinCommandElab___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_addBuiltinCommandElab___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_addBuiltinCommandElab___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_RBNode_find___main___at_Lean_addBuiltinCommandElab___spec__4(lean_object* x_1, lean_object* x_2) {
@@ -6681,50 +6655,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -6857,114 +6823,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_addBuiltinCommandElab___spec__3(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_addBuiltinCommandElab___spec__3(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_addBuiltinCommandElab___spec__9(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_addBuiltinCommandElab___spec__9(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_addBuiltinCommandElab___spec__12(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_addBuiltinCommandElab___spec__12(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_addBuiltinCommandElab___spec__3(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_addBuiltinCommandElab___spec__3(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_addBuiltinCommandElab___spec__9(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_addBuiltinCommandElab___spec__9(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_addBuiltinCommandElab___spec__12(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_addBuiltinCommandElab___spec__12(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -14590,19 +14544,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Elab_elabCommand___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Elab_elabCommand___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Elab_elabCommand___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_Elab_elabCommand___spec__1(lean_object* x_1, lean_object* x_2) {
diff --git a/src/stage0/init/lean/elaborator/preterm.c b/src/stage0/init/lean/elaborator/preterm.c
index 9e65a91599..ad249dd60d 100644
--- a/src/stage0/init/lean/elaborator/preterm.c
+++ b/src/stage0/init/lean/elaborator/preterm.c
@@ -301,19 +301,16 @@ return x_8;
 uint8_t l_HashMapImp_contains___at_Lean_addBuiltinPreTermElab___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_addBuiltinPreTermElab___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_addBuiltinPreTermElab___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_AssocList_mfoldl___main___at_Lean_addBuiltinPreTermElab___spec__6(lean_object* x_1, lean_object* x_2) {
@@ -329,50 +326,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -505,114 +494,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_addBuiltinPreTermElab___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_addBuiltinPreTermElab___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_addBuiltinPreTermElab___spec__4(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_addBuiltinPreTermElab___spec__4(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_addBuiltinPreTermElab___spec__7(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_addBuiltinPreTermElab___spec__7(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_addBuiltinPreTermElab___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_addBuiltinPreTermElab___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_addBuiltinPreTermElab___spec__4(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_addBuiltinPreTermElab___spec__4(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_addBuiltinPreTermElab___spec__7(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_addBuiltinPreTermElab___spec__7(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -2678,19 +2655,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Elab_toPreTerm___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Elab_toPreTerm___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Elab_toPreTerm___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* _init_l_Lean_Elab_toPreTerm___closed__1() {
diff --git a/src/stage0/init/lean/elaborator/term.c b/src/stage0/init/lean/elaborator/term.c
index 986f22bbc8..e80255bb6b 100644
--- a/src/stage0/init/lean/elaborator/term.c
+++ b/src/stage0/init/lean/elaborator/term.c
@@ -95,19 +95,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Elab_elabTermAux___main___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Elab_elabTermAux___main___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Elab_elabTermAux___main___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_SMap_find___at_Lean_Elab_elabTermAux___main___spec__1(lean_object* x_1, lean_object* x_2) {
diff --git a/src/stage0/init/lean/environment.c b/src/stage0/init/lean/environment.c
index 5eb8af6892..8e97caa854 100644
--- a/src/stage0/init/lean/environment.c
+++ b/src/stage0/init/lean/environment.c
@@ -3041,50 +3041,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -3217,114 +3209,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_Environment_addAux___spec__5(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_Environment_addAux___spec__5(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_Environment_addAux___spec__6(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_Environment_addAux___spec__6(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_Environment_addAux___spec__9(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_Environment_addAux___spec__9(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_Environment_addAux___spec__5(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_Environment_addAux___spec__5(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_Environment_addAux___spec__6(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_Environment_addAux___spec__6(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_Environment_addAux___spec__9(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_Environment_addAux___spec__9(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -3475,19 +3455,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Environment_find___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Environment_find___spec__3(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Environment_find___spec__3(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_RBNode_find___main___at_Lean_Environment_find___spec__4(lean_object* x_1, lean_object* x_2) {
@@ -3620,19 +3597,16 @@ return x_3;
 uint8_t l_HashMapImp_contains___at_Lean_Environment_contains___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_Environment_addAux___spec__5(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_Environment_addAux___spec__5(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 uint8_t l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -3988,19 +3962,16 @@ return x_9;
 lean_object* l_HashMapImp_find___at_Lean_Environment_getModuleIdxFor___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Environment_getModuleIdxFor___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_find___main___at_Lean_Environment_getModuleIdxFor___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_Environment_getModuleIdxFor(lean_object* x_1, lean_object* x_2) {
@@ -14366,50 +14337,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -14542,114 +14505,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_importModules___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_importModules___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_importModules___spec__3(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_importModules___spec__3(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_importModules___spec__6(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_importModules___spec__6(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_importModules___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_importModules___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_importModules___spec__3(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_importModules___spec__3(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_importModules___spec__6(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_importModules___spec__6(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
diff --git a/src/stage0/init/lean/parser/parser.c b/src/stage0/init/lean/parser/parser.c
index 7916eab41e..8880ed27dc 100644
--- a/src/stage0/init/lean/parser/parser.c
+++ b/src/stage0/init/lean/parser/parser.c
@@ -3342,50 +3342,42 @@ uint8_t x_3;
 x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; size_t x_10; lean_object* x_11; size_t x_12; lean_object* x_13; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_2, 2);
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_name_hash_usize(x_4);
 x_8 = lean_usize_modn(x_7, x_6);
 lean_dec(x_6);
-x_9 = lean_box_usize(x_8);
-x_10 = lean_unbox_usize(x_9);
-x_11 = lean_array_uget(x_1, x_10);
-lean_ctor_set(x_2, 2, x_11);
-x_12 = lean_unbox_usize(x_9);
-lean_dec(x_9);
-x_13 = lean_array_uset(x_1, x_12, x_2);
-x_1 = x_13;
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
 x_2 = x_5;
 goto _start;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; size_t x_22; lean_object* x_23; lean_object* x_24; size_t x_25; lean_object* x_26; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
 lean_dec(x_2);
-x_18 = lean_array_get_size(x_1);
-x_19 = lean_name_hash_usize(x_15);
-x_20 = lean_usize_modn(x_19, x_18);
-lean_dec(x_18);
-x_21 = lean_box_usize(x_20);
-x_22 = lean_unbox_usize(x_21);
-x_23 = lean_array_uget(x_1, x_22);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = lean_unbox_usize(x_21);
-lean_dec(x_21);
-x_26 = lean_array_uset(x_1, x_25, x_24);
-x_1 = x_26;
-x_2 = x_17;
+x_15 = lean_array_get_size(x_1);
+x_16 = lean_name_hash_usize(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
 goto _start;
 }
 }
@@ -3518,114 +3510,102 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_1);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; size_t x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_1, 1);
 x_7 = lean_array_get_size(x_6);
 x_8 = lean_name_hash_usize(x_2);
 x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_box_usize(x_9);
-x_11 = lean_unbox_usize(x_10);
-x_12 = lean_array_uget(x_6, x_11);
-x_13 = l_AssocList_contains___main___at_Lean_Parser_nodeInfo___elambda__1___spec__2(x_2, x_12);
-if (x_13 == 0)
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_Parser_nodeInfo___elambda__1___spec__2(x_2, x_10);
+if (x_11 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_5, x_14);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
 lean_dec(x_5);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_2);
-lean_ctor_set(x_16, 1, x_3);
-lean_ctor_set(x_16, 2, x_12);
-x_17 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_18 = lean_array_uset(x_6, x_17, x_16);
-x_19 = lean_nat_dec_le(x_15, x_7);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
 lean_dec(x_7);
-if (x_19 == 0)
+if (x_16 == 0)
 {
-lean_object* x_20; 
+lean_object* x_17; 
 lean_free_object(x_1);
-x_20 = l_HashMapImp_expand___at_Lean_Parser_nodeInfo___elambda__1___spec__3(x_15, x_18);
-return x_20;
+x_17 = l_HashMapImp_expand___at_Lean_Parser_nodeInfo___elambda__1___spec__3(x_13, x_15);
+return x_17;
 }
 else
 {
-lean_ctor_set(x_1, 1, x_18);
-lean_ctor_set(x_1, 0, x_15);
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_21; size_t x_22; lean_object* x_23; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_7);
-x_21 = l_AssocList_replace___main___at_Lean_Parser_nodeInfo___elambda__1___spec__6(x_2, x_3, x_12);
-x_22 = lean_unbox_usize(x_10);
-lean_dec(x_10);
-x_23 = lean_array_uset(x_6, x_22, x_21);
-lean_ctor_set(x_1, 1, x_23);
+x_18 = l_AssocList_replace___main___at_Lean_Parser_nodeInfo___elambda__1___spec__6(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
 return x_1;
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; size_t x_30; lean_object* x_31; uint8_t x_32; 
-x_24 = lean_ctor_get(x_1, 0);
-x_25 = lean_ctor_get(x_1, 1);
-lean_inc(x_25);
-lean_inc(x_24);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
 lean_dec(x_1);
-x_26 = lean_array_get_size(x_25);
-x_27 = lean_name_hash_usize(x_2);
-x_28 = lean_usize_modn(x_27, x_26);
-x_29 = lean_box_usize(x_28);
-x_30 = lean_unbox_usize(x_29);
-x_31 = lean_array_uget(x_25, x_30);
-x_32 = l_AssocList_contains___main___at_Lean_Parser_nodeInfo___elambda__1___spec__2(x_2, x_31);
-if (x_32 == 0)
+x_22 = lean_array_get_size(x_21);
+x_23 = lean_name_hash_usize(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_Parser_nodeInfo___elambda__1___spec__2(x_2, x_25);
+if (x_26 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; size_t x_36; lean_object* x_37; uint8_t x_38; 
-x_33 = lean_unsigned_to_nat(1u);
-x_34 = lean_nat_add(x_24, x_33);
-lean_dec(x_24);
-x_35 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_35, 0, x_2);
-lean_ctor_set(x_35, 1, x_3);
-lean_ctor_set(x_35, 2, x_31);
-x_36 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_37 = lean_array_uset(x_25, x_36, x_35);
-x_38 = lean_nat_dec_le(x_34, x_26);
-lean_dec(x_26);
-if (x_38 == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
 {
-lean_object* x_39; 
-x_39 = l_HashMapImp_expand___at_Lean_Parser_nodeInfo___elambda__1___spec__3(x_34, x_37);
-return x_39;
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_Parser_nodeInfo___elambda__1___spec__3(x_28, x_30);
+return x_32;
 }
 else
 {
-lean_object* x_40; 
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_34);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
 }
 }
 else
 {
-lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_26);
-x_41 = l_AssocList_replace___main___at_Lean_Parser_nodeInfo___elambda__1___spec__6(x_2, x_3, x_31);
-x_42 = lean_unbox_usize(x_29);
-lean_dec(x_29);
-x_43 = lean_array_uset(x_25, x_42, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_24);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_Parser_nodeInfo___elambda__1___spec__6(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
@@ -26635,19 +26615,16 @@ return x_39;
 uint8_t l_HashMapImp_contains___at_Lean_Parser_isValidSyntaxNodeKind___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; size_t x_8; lean_object* x_9; uint8_t x_10; 
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; uint8_t x_8; 
 x_3 = lean_ctor_get(x_1, 1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_name_hash_usize(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
-x_7 = lean_box_usize(x_6);
-x_8 = lean_unbox_usize(x_7);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_contains___main___at_Lean_Parser_nodeInfo___elambda__1___spec__2(x_2, x_7);
 lean_dec(x_7);
-x_9 = lean_array_uget(x_3, x_8);
-x_10 = l_AssocList_contains___main___at_Lean_Parser_nodeInfo___elambda__1___spec__2(x_2, x_9);
-lean_dec(x_9);
-return x_10;
+return x_8;
 }
 }
 lean_object* l_Lean_Parser_isValidSyntaxNodeKind(lean_object* x_1, lean_object* x_2) {