diff --git a/stage0/src/CMakeLists.txt b/stage0/src/CMakeLists.txt
index dbf48d5908..09a7134e08 100644
--- a/stage0/src/CMakeLists.txt
+++ b/stage0/src/CMakeLists.txt
@@ -821,6 +821,12 @@ if(LEAN_INSTALL_PREFIX)
   set(CMAKE_INSTALL_PREFIX "${LEAN_INSTALL_PREFIX}/lean-${LEAN_VERSION_STRING}${LEAN_INSTALL_SUFFIX}")
 endif()
 
+if (STAGE GREATER 1)
+  # The build of stage2+ may depend on local changes made to src/ that are not reflected by the
+  # commit hash in stage1/bin/lean, so we make sure to disable the global cache
+  string(APPEND LEAN_EXTRA_LAKEFILE_TOML "\n\nenableArtifactCache = false")
+endif()
+
 # Escape for `make`. Yes, twice.
 string(REPLACE "$" "\\\$$" CMAKE_EXE_LINKER_FLAGS_MAKE "${CMAKE_EXE_LINKER_FLAGS}")
 configure_file(${LEAN_SOURCE_DIR}/stdlib.make.in ${CMAKE_BINARY_DIR}/stdlib.make)
diff --git a/stage0/src/stdlib_flags.h b/stage0/src/stdlib_flags.h
index 6b964da742..79a0e58edd 100644
--- a/stage0/src/stdlib_flags.h
+++ b/stage0/src/stdlib_flags.h
@@ -11,7 +11,7 @@ options get_default_options() {
     opts = opts.update({"debug", "terminalTacticsAsSorry"}, false);
     // switch to `true` for ABI-breaking changes affecting meta code;
     // see also next option!
-    opts = opts.update({"interpreter", "prefer_native"}, true);
+    opts = opts.update({"interpreter", "prefer_native"}, false);
     // switch to `false` when enabling `prefer_native` should also affect use
     // of built-in parsers in quotations; this is usually the case, but setting
     // both to `true` may be necessary for handling non-builtin parsers with
diff --git a/stage0/stdlib/Lean/Compiler/IR/ElimDeadBranches.c b/stage0/stdlib/Lean/Compiler/IR/ElimDeadBranches.c
index 39cd2b9b88..8973dcf5f4 100644
--- a/stage0/stdlib/Lean/Compiler/IR/ElimDeadBranches.c
+++ b/stage0/stdlib/Lean/Compiler/IR/ElimDeadBranches.c
@@ -17,6 +17,7 @@ LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___at___Lean_IR_elimDeadBranches_
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_interpExpr_spec__0(size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_elimDeadBranches___redArg___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 LEAN_EXPORT lean_object* l_Nat_foldM_loop___at___Lean_IR_UnreachableBranches_updateJPParamsAssignment_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__3___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
 lean_object* lean_format_pretty(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -32,13 +33,13 @@ LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_Value_truncateMaxDepth;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_Value_truncate_go(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat___closed__7;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_updateVarAssignment___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_Raw_u2080_expand_go___at___Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranches_markJPVisited_spec__1_spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_shift_right(size_t, size_t);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_foldlM___at___Std_DHashMap_Internal_Raw_u2080_expand_go___at___Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranches_updateVarAssignment_spec__1_spec__1_spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___at___Lean_IR_elimDeadBranches_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__3(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___Lean_IR_UnreachableBranches_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073__spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_IR_UnreachableBranches_inferStep___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_elimDeadBranches___redArg(lean_object*, lean_object*, lean_object*);
@@ -49,21 +50,21 @@ LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_contains___at___Lean_
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_IR_UnreachableBranches_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073__spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
 static lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat___closed__8;
-static lean_object* l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 uint8_t l_Array_isEmpty___redArg(lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat___closed__2;
 lean_object* l_Std_Format_fill(lean_object*);
 LEAN_EXPORT lean_object* l_Array_isEqvAux___at___Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55__spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
 size_t lean_uint64_to_usize(uint64_t);
-static lean_object* l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__3___redArg(lean_object*);
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_instToFormatValue;
+static lean_object* l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* l_Array_qpartition___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_IR_elimDeadBranches_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_getD___at___Lean_IR_UnreachableBranches_findVarValue_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
 static lean_object* l_Lean_IR_UnreachableBranches_reprValue___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182_;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_resetNestedJPParams(lean_object*, lean_object*, lean_object*);
@@ -87,24 +88,22 @@ lean_object* l_Std_Format_join(lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_replace___at___Lean_IR_UnreachableBranches_updateVarAssignment_spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Environment_find_x3f(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT uint8_t l_Lean_IR_UnreachableBranches_Value_toFormat___lam__0(uint8_t, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* l_Lean_PersistentHashMap_toArray___at___Lean_initFn____x40_Lean_Structure___hyg_447__spec__0___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_IR_UnreachableBranches_Value_merge_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_elem___at___Lean_IR_UnreachableBranches_Value_truncate_go_spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_instReprValue;
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_IR_UnreachableBranches_Value_merge_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_IR_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_Value_truncate_go_spec__0(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
 extern lean_object* l_Lean_IR_instInhabitedFnBody;
-static lean_object* l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_functionSummariesExt;
 lean_object* lean_nat_shiftr(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 LEAN_EXPORT lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTR_loop___at___Lean_IR_UnreachableBranches_Value_truncate_go_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+static lean_object* l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* l_Lean_PersistentHashMap_insert___at___Lean_MetavarContext_addExprMVarDecl_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldM_loop___at___Lean_IR_UnreachableBranches_inferStep_spec__3___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
@@ -131,7 +130,6 @@ static lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_in
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_inferStep_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_interpFnBody___closed__1;
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___Lean_IR_UnreachableBranches_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073__spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Nat_foldM_loop___at___Lean_IR_UnreachableBranches_inferStep_spec__3___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_elimDeadBranches(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_findArgValue___boxed(lean_object*, lean_object*, lean_object*);
@@ -139,7 +137,6 @@ LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_getD___at___Lean_IR_U
 static lean_object* l_Lean_IR_UnreachableBranches_Value_addChoice___closed__0;
 static lean_object* l_Lean_IR_UnreachableBranches_getFunctionSummary_x3f___closed__0;
 LEAN_EXPORT uint8_t l_Std_DHashMap_Internal_AssocList_contains___at___Lean_IR_UnreachableBranches_updateVarAssignment_spec__0___redArg(lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 static lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__3___redArg___closed__2;
 static lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_sortEntries___closed__0;
@@ -149,6 +146,7 @@ uint64_t lean_uint64_shift_right(uint64_t, uint64_t);
 LEAN_EXPORT uint8_t l_Lean_IR_UnreachableBranches_containsCtor(lean_object*, lean_object*);
 static lean_object* l_Lean_IR_elimDeadBranches___redArg___closed__2;
 static lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_inferStep_spec__0___redArg___closed__0;
+static lean_object* l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* lean_nat_to_int(lean_object*);
 lean_object* lean_nat_div(lean_object*, lean_object*);
 static lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__3___redArg___closed__3;
@@ -160,22 +158,21 @@ LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_contains___at___Lean_
 lean_object* l_Lean_IR_LocalContext_getJPParams(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_qsort_sort___at___Lean_IR_UnreachableBranches_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073__spec__1___redArg___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55____boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 static lean_object* l_Array_Array_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__0___closed__5;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_inferStep(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_List_beq___at___Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55__spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_inferStep___lam__0___boxed(lean_object*, lean_object*);
 static lean_object* l_Array_Array_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__0___closed__2;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat(lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Nat_foldM_loop___at___Lean_IR_UnreachableBranches_inferStep_spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__3___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
 LEAN_EXPORT lean_object* l_Array_isEqvAux___at___Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55__spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+static lean_object* l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_____private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_resetNestedJPParams_spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_____private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_resetNestedJPParams_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat___closed__3;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 static lean_object* l_Lean_IR_UnreachableBranches_reprValue___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182_;
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranches_updateVarAssignment_spec__1___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_markJPVisited(lean_object*, lean_object*, lean_object*);
@@ -192,7 +189,6 @@ LEAN_EXPORT lean_object* l_List_mapTR_loop___at___Lean_IR_UnreachableBranches_Va
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_resetNestedJPParams___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_IR_elimDeadBranches_spec__0___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_instBEqValue___closed__0;
-static lean_object* l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT uint8_t l_Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55_(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_instToStringValue;
 LEAN_EXPORT uint8_t l_Std_DHashMap_Internal_AssocList_contains___at___Lean_IR_UnreachableBranches_updateVarAssignment_spec__0(lean_object*, lean_object*, lean_object*);
@@ -210,7 +206,6 @@ LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_interpFnBody(lean_object*
 static lean_object* l_Array_Array_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__0___closed__1;
 static lean_object* l_Lean_IR_UnreachableBranches_reprValue___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182_;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_addFunctionSummary(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___Array_Array_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__0_spec__0___lam__0(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_Value_addChoice(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073____boxed(lean_object*);
@@ -221,14 +216,13 @@ LEAN_EXPORT lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_I
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_elimDeadAux(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_updateCurrFnSummary(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073____boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Nat_foldM_loop___at___Lean_IR_UnreachableBranches_updateJPParamsAssignment_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_updateVarAssignment(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_reprValue___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182_;
 lean_object* l_Lean_NameSet_insert(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_getD___at___Lean_IR_UnreachableBranches_findVarValue_spec__0(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_instToStringValue___lam__0(lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+static lean_object* l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* lean_usize_to_nat(size_t);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___at___Lean_IR_elimDeadBranches_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SimplePersistentEnvExtension_getState___redArg(lean_object*, lean_object*, lean_object*, uint8_t);
@@ -240,7 +234,6 @@ LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_reprValue____x40_Lean_Com
 static lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__3___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_modifyAux___at___Lean_PersistentArray_modify___at___Lean_IR_UnreachableBranches_updateCurrFnSummary_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Std_DHashMap_Internal_AssocList_contains___at___Lean_IR_UnreachableBranches_markJPVisited_spec__0(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_IR_UnreachableBranches_interpFnBody_spec__0(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_beqVarId____x40_Lean_Compiler_IR_Basic___hyg_38____boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__2___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
@@ -256,6 +249,7 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_IR_UnreachableBra
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_contains___at___Lean_IR_UnreachableBranches_markJPVisited_spec__0___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_declLt___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_IR_FnBody_setBody(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 static lean_object* l_Lean_IR_UnreachableBranches_instReprValue___closed__0;
 lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_IR_UnreachableBranches_inferStep_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -278,6 +272,7 @@ static lean_object* l_List_repr___at___Lean_IR_UnreachableBranches_reprValue____
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_resetParamAssignment(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_beq___boxed(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_interpExpr___lam__0___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_markJPVisited___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_findAtSorted_x3f(lean_object*, lean_object*);
@@ -306,7 +301,6 @@ LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_getFunctionSummary_x3f(le
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* l_Lean_IR_beqJoinPointId____x40_Lean_Compiler_IR_Basic___hyg_192____boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 uint8_t l_Std_DTreeMap_Internal_Impl_contains___at___Lean_NameMap_contains_spec__0___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_elimDead___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_Value_truncate(lean_object*, lean_object*, lean_object*);
@@ -328,6 +322,7 @@ lean_object* lean_array_mk(lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_interpFnBody___closed__3;
 static lean_object* l_Array_Array_repr___at___Lean_IR_UnreachableBranches_reprValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182__spec__0___closed__9;
 LEAN_EXPORT uint8_t l_Lean_IR_UnreachableBranches_interpExpr___lam__0(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_IR_UnreachableBranches_getFunctionSummary_x3f_spec__0___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_instBEqValue;
 size_t lean_usize_add(size_t, size_t);
@@ -349,12 +344,12 @@ size_t lean_usize_shift_left(size_t, size_t);
 lean_object* l_Lean_Name_mkStr4(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_beq___at___Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55__spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_foldlM___at___Std_DHashMap_Internal_Raw_u2080_expand_go___at___Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranches_updateVarAssignment_spec__1_spec__1_spec__1___redArg(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 static lean_object* l_Lean_IR_UnreachableBranches_Value_merge___closed__0;
 lean_object* l_Lean_IR_LocalContext_addJP(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_sortEntries(lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_IR_UnreachableBranches_getFunctionSummary_x3f_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___Lean_IR_UnreachableBranches_interpFnBody_spec__1(lean_object*);
-static lean_object* l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_containsCtor___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_inferStep_spec__0(lean_object*, lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT uint8_t l_Std_DHashMap_Internal_AssocList_contains___at___Lean_IR_UnreachableBranches_markJPVisited_spec__0___redArg(lean_object*, lean_object*);
@@ -375,12 +370,15 @@ uint8_t l_List_any___redArg(lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___redArg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_initFn___lam__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_(lean_object*, lean_object*, lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l_Lean_IR_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_(lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_reprValue___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182_;
 static lean_object* l_Lean_IR_UnreachableBranches_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_____private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_resetNestedJPParams_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_inferStep_spec__0___redArg___closed__3;
+static lean_object* l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* l_Lean_SimplePersistentEnvExtension_replayOfFilter___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 static lean_object* l_Array_mapMUnsafe_map___at___Lean_IR_UnreachableBranches_inferStep_spec__0___redArg___closed__2;
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_Raw_u2080_expand_go___at___Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranches_markJPVisited_spec__1_spec__1___redArg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_reprCtorInfo___redArg____x40_Lean_Compiler_IR_Basic___hyg_2044_(lean_object*);
@@ -394,14 +392,15 @@ lean_object* l_Lean_IR_LocalContext_getJPBody(lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_Value_toFormat___closed__4;
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_IR_UnreachableBranches_getFunctionSummary_x3f_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_land(size_t, size_t);
-static lean_object* l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
 static lean_object* l_Lean_IR_UnreachableBranches_reprValue___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_182_;
 static lean_object* l_List_mapTR_loop___at___Lean_IR_UnreachableBranches_Value_toFormat_spec__0___closed__1;
 LEAN_EXPORT lean_object* l_List_mapTR_loop___at___Lean_IR_UnreachableBranches_Value_truncate_go_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_HashMap_instInhabited(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_UnreachableBranches_instToFormatValue___closed__0;
 lean_object* l_Std_HashSet_instInhabited(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 uint8_t l_Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0___redArg(lean_object*, lean_object*);
+static lean_object* l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 lean_object* l_Lean_IR_hashJoinPointId____x40_Lean_Compiler_IR_Basic___hyg_250____boxed(lean_object*);
 static lean_object* _init_l_Lean_IR_UnreachableBranches_instInhabitedValue() {
 _start:
@@ -3218,15 +3217,13 @@ return x_1;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_addFunctionSummary(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_4 = l_Lean_IR_UnreachableBranches_addFunctionSummary___closed__0;
-lean_inc(x_2);
-x_5 = l_Lean_Environment_addExtraName(x_1, x_2);
-x_6 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_6, 0, x_2);
-lean_ctor_set(x_6, 1, x_3);
-x_7 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_4, x_5, x_6);
-return x_7;
+x_5 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_5, 0, x_2);
+lean_ctor_set(x_5, 1, x_3);
+x_6 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_4, x_1, x_5);
+return x_6;
 }
 }
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_IR_UnreachableBranches_getFunctionSummary_x3f_spec__0___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -5549,7 +5546,7 @@ return x_3;
 LEAN_EXPORT lean_object* l_Lean_IR_UnreachableBranches_markJPVisited(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_15; uint8_t x_16; lean_object* x_17; uint8_t x_20; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; uint64_t x_75; uint64_t x_76; uint64_t x_77; uint64_t x_78; uint64_t x_79; uint64_t x_80; uint64_t x_81; size_t x_82; size_t x_83; size_t x_84; size_t x_85; size_t x_86; lean_object* x_87; uint8_t x_88; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; lean_object* x_10; uint8_t x_15; lean_object* x_16; lean_object* x_17; uint8_t x_20; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; uint64_t x_75; uint64_t x_76; uint64_t x_77; uint64_t x_78; uint64_t x_79; uint64_t x_80; uint64_t x_81; size_t x_82; size_t x_83; size_t x_84; size_t x_85; size_t x_86; lean_object* x_87; uint8_t x_88; 
 x_4 = lean_ctor_get(x_2, 0);
 x_5 = lean_ctor_get(x_3, 0);
 lean_inc_ref(x_5);
@@ -5623,8 +5620,8 @@ return x_13;
 block_19:
 {
 lean_object* x_18; 
-x_18 = lean_array_fset(x_15, x_4, x_17);
-x_9 = x_16;
+x_18 = lean_array_fset(x_16, x_4, x_17);
+x_9 = x_15;
 x_10 = x_18;
 goto block_14;
 }
@@ -5701,8 +5698,8 @@ lean_object* x_56;
 x_56 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranches_markJPVisited_spec__1___redArg(x_49);
 lean_ctor_set(x_23, 1, x_56);
 lean_ctor_set(x_23, 0, x_47);
-x_15 = x_27;
-x_16 = x_20;
+x_15 = x_20;
+x_16 = x_27;
 x_17 = x_23;
 goto block_19;
 }
@@ -5710,8 +5707,8 @@ else
 {
 lean_ctor_set(x_23, 1, x_49);
 lean_ctor_set(x_23, 0, x_47);
-x_15 = x_27;
-x_16 = x_20;
+x_15 = x_20;
+x_16 = x_27;
 x_17 = x_23;
 goto block_19;
 }
@@ -5744,8 +5741,8 @@ x_67 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_IR_UnreachableBranch
 x_68 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_68, 0, x_58);
 lean_ctor_set(x_68, 1, x_67);
-x_15 = x_27;
-x_16 = x_20;
+x_15 = x_20;
+x_16 = x_27;
 x_17 = x_68;
 goto block_19;
 }
@@ -5755,8 +5752,8 @@ lean_object* x_69;
 x_69 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_69, 0, x_58);
 lean_ctor_set(x_69, 1, x_60);
-x_15 = x_27;
-x_16 = x_20;
+x_15 = x_20;
+x_16 = x_27;
 x_17 = x_69;
 goto block_19;
 }
@@ -5768,8 +5765,8 @@ lean_dec(x_41);
 lean_dec_ref(x_25);
 lean_dec(x_24);
 lean_dec(x_1);
-x_15 = x_27;
-x_16 = x_20;
+x_15 = x_20;
+x_16 = x_27;
 x_17 = x_23;
 goto block_19;
 }
@@ -7260,7 +7257,7 @@ goto block_73;
 block_59:
 {
 lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_52 = l_Lean_IR_UnreachableBranches_interpFnBody(x_48, x_50, x_51);
+x_52 = l_Lean_IR_UnreachableBranches_interpFnBody(x_48, x_49, x_51);
 x_53 = lean_ctor_get(x_52, 1);
 lean_inc(x_53);
 lean_dec_ref(x_52);
@@ -7278,8 +7275,8 @@ lean_dec_ref(x_54);
 lean_dec(x_35);
 lean_inc(x_2);
 x_57 = l_outOfBounds___redArg(x_2);
-x_16 = x_49;
-x_17 = x_53;
+x_16 = x_53;
+x_17 = x_50;
 x_18 = x_57;
 goto block_24;
 }
@@ -7289,8 +7286,8 @@ lean_object* x_58;
 lean_inc(x_2);
 x_58 = l_Lean_PersistentArray_get_x21___redArg(x_2, x_54, x_35);
 lean_dec(x_35);
-x_16 = x_49;
-x_17 = x_53;
+x_16 = x_53;
+x_17 = x_50;
 x_18 = x_58;
 goto block_24;
 }
@@ -7316,8 +7313,8 @@ if (x_66 == 0)
 {
 lean_dec(x_64);
 lean_dec_ref(x_47);
-x_49 = x_60;
-x_50 = x_65;
+x_49 = x_65;
+x_50 = x_60;
 x_51 = x_9;
 goto block_59;
 }
@@ -7329,8 +7326,8 @@ if (x_67 == 0)
 {
 lean_dec(x_64);
 lean_dec_ref(x_47);
-x_49 = x_60;
-x_50 = x_65;
+x_49 = x_65;
+x_50 = x_60;
 x_51 = x_9;
 goto block_59;
 }
@@ -7346,8 +7343,8 @@ lean_dec_ref(x_47);
 x_72 = lean_ctor_get(x_71, 1);
 lean_inc(x_72);
 lean_dec_ref(x_71);
-x_49 = x_60;
-x_50 = x_65;
+x_49 = x_65;
+x_50 = x_60;
 x_51 = x_72;
 goto block_59;
 }
@@ -7388,31 +7385,31 @@ block_24:
 if (x_7 == 0)
 {
 uint8_t x_19; 
-x_19 = l_Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55_(x_16, x_18);
+x_19 = l_Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55_(x_17, x_18);
 lean_dec(x_18);
-lean_dec(x_16);
+lean_dec(x_17);
 if (x_19 == 0)
 {
 uint8_t x_20; 
 x_20 = 1;
 x_6 = x_15;
 x_7 = x_20;
-x_9 = x_17;
+x_9 = x_16;
 goto _start;
 }
 else
 {
 x_6 = x_15;
-x_9 = x_17;
+x_9 = x_16;
 goto _start;
 }
 }
 else
 {
 lean_dec(x_18);
-lean_dec(x_16);
+lean_dec(x_17);
 x_6 = x_15;
-x_9 = x_17;
+x_9 = x_16;
 goto _start;
 }
 }
@@ -7421,31 +7418,31 @@ block_33:
 if (x_7 == 0)
 {
 uint8_t x_28; 
-x_28 = l_Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55_(x_25, x_27);
+x_28 = l_Lean_IR_UnreachableBranches_beqValue____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_55_(x_26, x_27);
 lean_dec(x_27);
-lean_dec(x_25);
+lean_dec(x_26);
 if (x_28 == 0)
 {
 uint8_t x_29; 
 x_29 = 1;
 x_6 = x_15;
 x_7 = x_29;
-x_9 = x_26;
+x_9 = x_25;
 goto _start;
 }
 else
 {
 x_6 = x_15;
-x_9 = x_26;
+x_9 = x_25;
 goto _start;
 }
 }
 else
 {
 lean_dec(x_27);
-lean_dec(x_25);
+lean_dec(x_26);
 x_6 = x_15;
-x_9 = x_26;
+x_9 = x_25;
 goto _start;
 }
 }
@@ -7472,8 +7469,8 @@ lean_dec_ref(x_40);
 lean_dec(x_35);
 lean_inc(x_2);
 x_43 = l_outOfBounds___redArg(x_2);
-x_25 = x_36;
-x_26 = x_39;
+x_25 = x_39;
+x_26 = x_36;
 x_27 = x_43;
 goto block_33;
 }
@@ -7483,8 +7480,8 @@ lean_object* x_44;
 lean_inc(x_2);
 x_44 = l_Lean_PersistentArray_get_x21___redArg(x_2, x_40, x_35);
 lean_dec(x_35);
-x_25 = x_36;
-x_26 = x_39;
+x_25 = x_39;
+x_26 = x_36;
 x_27 = x_44;
 goto block_33;
 }
@@ -8509,7 +8506,7 @@ lean_dec_ref(x_2);
 return x_5;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8517,7 +8514,7 @@ x_1 = lean_mk_string_unchecked("compiler", 8, 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8525,7 +8522,7 @@ x_1 = lean_mk_string_unchecked("ir", 2, 2);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8533,18 +8530,18 @@ x_1 = lean_mk_string_unchecked("elim_dead_branches", 18, 18);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_2 = l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_3 = l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_2 = l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_3 = l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_4 = l_Lean_Name_mkStr3(x_3, x_2, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -8554,17 +8551,17 @@ x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_IR_UnreachableBranches_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
-x_2 = l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_2 = l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8572,17 +8569,17 @@ x_1 = lean_mk_string_unchecked("initFn", 6, 6);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_2 = l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_2 = l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8590,27 +8587,27 @@ x_1 = lean_mk_string_unchecked("_@", 2, 2);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_2 = l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_2 = l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_IR_UnreachableBranches_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
-x_2 = l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_2 = l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8618,27 +8615,27 @@ x_1 = lean_mk_string_unchecked("Compiler", 8, 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_2 = l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_2 = l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_IR_UnreachableBranches_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_1073_;
-x_2 = l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_2 = l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8646,17 +8643,17 @@ x_1 = lean_mk_string_unchecked("ElimDeadBranches", 16, 16);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_2 = l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_2 = l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; 
@@ -8664,33 +8661,33 @@ x_1 = lean_mk_string_unchecked("_hyg", 4, 4);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
-x_2 = l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
+x_2 = l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_() {
+static lean_object* _init_l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(3705u);
-x_2 = l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_1 = lean_unsigned_to_nat(3702u);
+x_2 = l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = l_Lean_Name_num___override(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_IR_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_IR_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; lean_object* x_5; 
-x_2 = l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_2 = l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_3 = 1;
-x_4 = l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_;
+x_4 = l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_;
 x_5 = l_Lean_registerTraceClass(x_2, x_3, x_4, x_1);
 return x_5;
 }
@@ -8887,45 +8884,45 @@ l_Lean_IR_elimDeadBranches___redArg___closed__1 = _init_l_Lean_IR_elimDeadBranch
 lean_mark_persistent(l_Lean_IR_elimDeadBranches___redArg___closed__1);
 l_Lean_IR_elimDeadBranches___redArg___closed__2 = _init_l_Lean_IR_elimDeadBranches___redArg___closed__2();
 lean_mark_persistent(l_Lean_IR_elimDeadBranches___redArg___closed__2);
-l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_ = _init_l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_();
-lean_mark_persistent(l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_);
-if (builtin) {res = l_Lean_IR_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3705_(lean_io_mk_world());
+l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__0____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__1____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__2____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__3____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__4____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__5____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__6____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__7____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__8____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__9____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__10____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__11____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__12____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__13____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__14____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__15____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__16____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__17____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_ = _init_l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_();
+lean_mark_persistent(l_Lean_IR_initFn___closed__18____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_);
+if (builtin) {res = l_Lean_IR_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_3702_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 }return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/IR/ToIR.c b/stage0/stdlib/Lean/Compiler/IR/ToIR.c
index dc54e4a413..d6c4b2d7be 100644
--- a/stage0/stdlib/Lean/Compiler/IR/ToIR.c
+++ b/stage0/stdlib/Lean/Compiler/IR/ToIR.c
@@ -60,7 +60,6 @@ static lean_object* l_Lean_IR_ToIR_lowerProj___closed__0;
 lean_object* l_ReaderT_instApplicativeOfMonad___redArg___lam__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_IR_ToIR_lowerCode___closed__3;
 uint8_t l_List_isEmpty___redArg(lean_object*);
-lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
 extern lean_object* l_Lean_IR_instInhabitedFnBody;
 static lean_object* l_Lean_IR_ToIR_lowerLet___closed__3;
 static lean_object* l_Lean_IR_ToIR_lowerLet___closed__15;
@@ -1395,93 +1394,103 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_IR_ToIR_addDecl___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_30; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
 x_4 = lean_st_ref_take(x_2, x_3);
 x_5 = lean_ctor_get(x_4, 0);
 lean_inc(x_5);
 x_6 = lean_ctor_get(x_4, 1);
 lean_inc(x_6);
 lean_dec_ref(x_4);
-x_7 = lean_ctor_get(x_5, 0);
-lean_inc_ref(x_7);
-x_8 = lean_ctor_get(x_5, 1);
-lean_inc(x_8);
-x_9 = lean_ctor_get(x_5, 2);
-lean_inc_ref(x_9);
-x_10 = lean_ctor_get(x_5, 3);
-lean_inc_ref(x_10);
-x_11 = lean_ctor_get(x_5, 4);
-lean_inc_ref(x_11);
-x_12 = lean_ctor_get(x_5, 6);
-lean_inc_ref(x_12);
-x_13 = lean_ctor_get(x_5, 7);
-lean_inc_ref(x_13);
-x_14 = lean_ctor_get(x_5, 8);
-lean_inc_ref(x_14);
-if (lean_is_exclusive(x_5)) {
- lean_ctor_release(x_5, 0);
- lean_ctor_release(x_5, 1);
- lean_ctor_release(x_5, 2);
- lean_ctor_release(x_5, 3);
- lean_ctor_release(x_5, 4);
- lean_ctor_release(x_5, 5);
- lean_ctor_release(x_5, 6);
- lean_ctor_release(x_5, 7);
- lean_ctor_release(x_5, 8);
- x_15 = x_5;
-} else {
- lean_dec_ref(x_5);
- x_15 = lean_box(0);
-}
-x_16 = l_Lean_IR_ToIR_addDecl___redArg___closed__0;
-x_30 = lean_ctor_get(x_1, 0);
-lean_inc(x_30);
-x_17 = x_30;
-goto block_29;
-block_29:
+x_7 = !lean_is_exclusive(x_5);
+if (x_7 == 0)
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
-x_18 = l_Lean_Environment_addExtraName(x_7, x_17);
-x_19 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_16, x_18, x_1);
-x_20 = l_Lean_IR_ToIR_addDecl___redArg___closed__3;
-if (lean_is_scalar(x_15)) {
- x_21 = lean_alloc_ctor(0, 9, 0);
-} else {
- x_21 = x_15;
-}
-lean_ctor_set(x_21, 0, x_19);
-lean_ctor_set(x_21, 1, x_8);
-lean_ctor_set(x_21, 2, x_9);
-lean_ctor_set(x_21, 3, x_10);
-lean_ctor_set(x_21, 4, x_11);
-lean_ctor_set(x_21, 5, x_20);
-lean_ctor_set(x_21, 6, x_12);
-lean_ctor_set(x_21, 7, x_13);
-lean_ctor_set(x_21, 8, x_14);
-x_22 = lean_st_ref_set(x_2, x_21, x_6);
-x_23 = !lean_is_exclusive(x_22);
-if (x_23 == 0)
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_8 = lean_ctor_get(x_5, 0);
+x_9 = lean_ctor_get(x_5, 5);
+lean_dec(x_9);
+x_10 = l_Lean_IR_ToIR_addDecl___redArg___closed__0;
+x_11 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_10, x_8, x_1);
+x_12 = l_Lean_IR_ToIR_addDecl___redArg___closed__3;
+lean_ctor_set(x_5, 5, x_12);
+lean_ctor_set(x_5, 0, x_11);
+x_13 = lean_st_ref_set(x_2, x_5, x_6);
+x_14 = !lean_is_exclusive(x_13);
+if (x_14 == 0)
 {
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_ctor_get(x_22, 0);
-lean_dec(x_24);
-x_25 = lean_box(0);
-lean_ctor_set(x_22, 0, x_25);
-return x_22;
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_13, 0);
+lean_dec(x_15);
+x_16 = lean_box(0);
+lean_ctor_set(x_13, 0, x_16);
+return x_13;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_22, 1);
-lean_inc(x_26);
-lean_dec(x_22);
-x_27 = lean_box(0);
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_27);
-lean_ctor_set(x_28, 1, x_26);
-return x_28;
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_13, 1);
+lean_inc(x_17);
+lean_dec(x_13);
+x_18 = lean_box(0);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_17);
+return x_19;
 }
 }
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_20 = lean_ctor_get(x_5, 0);
+x_21 = lean_ctor_get(x_5, 1);
+x_22 = lean_ctor_get(x_5, 2);
+x_23 = lean_ctor_get(x_5, 3);
+x_24 = lean_ctor_get(x_5, 4);
+x_25 = lean_ctor_get(x_5, 6);
+x_26 = lean_ctor_get(x_5, 7);
+x_27 = lean_ctor_get(x_5, 8);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_5);
+x_28 = l_Lean_IR_ToIR_addDecl___redArg___closed__0;
+x_29 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_28, x_20, x_1);
+x_30 = l_Lean_IR_ToIR_addDecl___redArg___closed__3;
+x_31 = lean_alloc_ctor(0, 9, 0);
+lean_ctor_set(x_31, 0, x_29);
+lean_ctor_set(x_31, 1, x_21);
+lean_ctor_set(x_31, 2, x_22);
+lean_ctor_set(x_31, 3, x_23);
+lean_ctor_set(x_31, 4, x_24);
+lean_ctor_set(x_31, 5, x_30);
+lean_ctor_set(x_31, 6, x_25);
+lean_ctor_set(x_31, 7, x_26);
+lean_ctor_set(x_31, 8, x_27);
+x_32 = lean_st_ref_set(x_2, x_31, x_6);
+x_33 = lean_ctor_get(x_32, 1);
+lean_inc(x_33);
+if (lean_is_exclusive(x_32)) {
+ lean_ctor_release(x_32, 0);
+ lean_ctor_release(x_32, 1);
+ x_34 = x_32;
+} else {
+ lean_dec_ref(x_32);
+ x_34 = lean_box(0);
+}
+x_35 = lean_box(0);
+if (lean_is_scalar(x_34)) {
+ x_36 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_36 = x_34;
+}
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_33);
+return x_36;
+}
 }
 }
 LEAN_EXPORT lean_object* l_Lean_IR_ToIR_addDecl(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/ElimDeadBranches.c b/stage0/stdlib/Lean/Compiler/LCNF/ElimDeadBranches.c
index 1eda7fdcf6..1529691c43 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/ElimDeadBranches.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/ElimDeadBranches.c
@@ -13,7 +13,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_modifyAssignment___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_mkAuxLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_reprValue____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56__spec__0___closed__9;
@@ -28,6 +28,7 @@ static lean_object* l_panic___at___Lean_Compiler_LCNF_UnreachableBranches_Value_
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateVarAssignment___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at___Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go_spec__0___closed__1;
 LEAN_EXPORT lean_object* l_Array_isEqvAux___at___Lean_Compiler_LCNF_UnreachableBranches_Value_beq_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 lean_object* l_Lean_Core_instMonadCoreM___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Prod_repr___at___Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__2_spec__2___redArg___closed__2;
@@ -63,7 +64,6 @@ lean_object* l_Std_Format_fill(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___lam__0(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
 size_t lean_uint64_to_usize(uint64_t);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_reprValue____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_ofNat_goBig(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_truncate_go(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -86,7 +86,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateVarAssig
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__2_spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_findFunVal_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_addTrace___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__1___redArg___closed__9;
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_UnreachableBranches_Value_beq___lam__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___lam__0___boxed(lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -111,8 +110,10 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getAssignment_
 static lean_object* l_Lean_Compiler_LCNF_Decl_elimDeadBranches___closed__3;
 lean_object* l_Lean_Environment_find_x3f(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_widening(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_____private_Lean_Compiler_LCNF_ElimDeadBranches_0__Lean_Compiler_LCNF_UnreachableBranches_resetNestedFunDeclParams_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment_spec__0___redArg(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 lean_object* l_Lean_Compiler_LCNF_getBinderName___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_elimDead(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_____private_Lean_Compiler_LCNF_ElimDeadBranches_0__Lean_Compiler_LCNF_UnreachableBranches_resetNestedFunDeclParams_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -122,12 +123,12 @@ static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getFunctionSummary_
 lean_object* l_Lean_PersistentHashMap_toArray___at___Lean_initFn____x40_Lean_Structure___hyg_447__spec__0___redArg(lean_object*);
 static lean_object* l_Lean_addTrace___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__1___redArg___closed__6;
 lean_object* l_ReaderT_instApplicativeOfMonad___redArg___lam__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
 lean_object* l_Lean_Name_mkStr5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsTop_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_containsCtor___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069__spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Prod_repr___at___Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__2_spec__2(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_reprValue___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56_;
 LEAN_EXPORT lean_object* l_List_elem___at___Lean_Compiler_LCNF_UnreachableBranches_Value_truncate_go_spec__2___boxed(lean_object*, lean_object*);
@@ -165,6 +166,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getFunVal___re
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_truncate(lean_object*, lean_object*);
 size_t lean_ptr_addr(lean_object*);
 lean_object* l_Std_Iterators_instIteratorMap___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Std_Iterators_IterM_DefaultConsumers_forIn_x27___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_elimDead___lam__0___boxed(lean_object*);
 extern lean_object* l_Lean_Compiler_LCNF_instInhabitedDecl;
@@ -184,7 +186,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_beq___bo
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_instBEq___closed__0;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateVarAssignment___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateCurrFnSummary(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Array_filterMapM___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__2_spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_functionSummariesExt;
@@ -212,6 +213,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_ofNat(le
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_findFunVal_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getAssignment___redArg___closed__0;
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_Compiler_LCNF_Decl_elimDeadBranches_spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instMonadEIO(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -244,7 +246,6 @@ lean_object* l_instInhabitedForall___redArg___lam__0___boxed(lean_object*, lean_
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___Lean_Compiler_LCNF_UnreachableBranches_Value_isLiteral_spec__0(lean_object*, size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getFunctionSummary_x3f___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go_spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_interpLetValue_spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_addFunctionSummary___closed__0;
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
@@ -264,6 +265,7 @@ LEAN_EXPORT lean_object* l_panic___at___Lean_Compiler_LCNF_UnreachableBranches_V
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__5_spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_reprValue___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56_;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___closed__6;
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_getNatConstant___closed__0;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_interpCode_handleFunVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_reprValue____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56__spec__0___closed__0;
@@ -271,6 +273,7 @@ LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_Compiler_LCNF_Unreacha
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_reprValue___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56_;
 static lean_object* l_Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_reprValue____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56__spec__0___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___lam__2(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_findVarValue___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_inferStep(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -279,13 +282,11 @@ lean_object* l_Lean_PersistentArray_push___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_elimDeadBranches;
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_Compiler_LCNF_Decl_elimDeadBranches_spec__1___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_addTrace___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__1___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 uint8_t l_Lean_Compiler_LCNF_isDeclPublic(lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_Compiler_LCNF_UnreachableBranches_inferStep_spec__0___boxed(lean_object**);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___closed__10;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___closed__3;
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___closed__11;
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_UnreachableBranches_Value_beq___lam__2(lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
@@ -304,7 +305,6 @@ static lean_object* l_Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBran
 LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getAssignment___redArg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_resetVarAssignment___redArg___lam__0(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Std_Iterators_IterM_DefaultConsumers_forIn_x27___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment_spec__1___redArg(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_foldl___at___Lean_Compiler_LCNF_UnreachableBranches_Value_proj_spec__0(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_reprValue___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56_;
@@ -331,17 +331,21 @@ extern lean_object* l_Std_PRange_instUpwardEnumerableNat;
 static lean_object* l___private_Lean_Compiler_LCNF_ElimDeadBranches_0__Lean_Compiler_LCNF_UnreachableBranches_findAtSorted_x3f___closed__0;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go___closed__5;
 LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_attachCodeDecls(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_Compiler_LCNF_UnreachableBranches_inferStep_spec__0___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 lean_object* l_Lean_Compiler_LCNF_getFunDecl___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_elimDead_go___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_getNatConstant___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment_spec__0___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_mapMUnsafe_map___at___Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__5_spec__5___lam__0(uint8_t, lean_object*);
 static lean_object* l_List_repr___at___Lean_Compiler_LCNF_UnreachableBranches_reprValue____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56__spec__3___redArg___closed__3;
 static lean_object* l_Lean_Compiler_LCNF_Decl_elimDeadBranches___closed__1;
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at___Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__5_spec__5___closed__1;
 lean_object* l_Lean_PersistentHashMap_find_x3f___at___Lean_SMap_find_x3f_x27___at___Lean_Kernel_Environment_find_x3f_spec__0_spec__1___redArg(lean_object*, lean_object*);
@@ -355,11 +359,11 @@ LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_foldlM___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__6(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 static lean_object* l_Prod_repr___at___Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__2_spec__2___redArg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_findArgValue___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Std_DHashMap_Internal_AssocList_contains___at_____private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectType_spec__0___redArg(lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getFunctionSummary_x3f___closed__0;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go___closed__6;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
@@ -380,13 +384,13 @@ lean_object* l_Lean_Compiler_LCNF_normCodeImp(uint8_t, lean_object*, lean_object
 static lean_object* l_Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_reprValue____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56__spec__0___closed__4;
 lean_object* l_Lean_Name_beq___boxed(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_isLiteral___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_ElimDeadBranches_0__Lean_Compiler_LCNF_UnreachableBranches_decLt___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_interpLetValue_spec__0___redArg(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___Lean_Compiler_LCNF_UnreachableBranches_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069__spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_findFunDecl_x3f___redArg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_ElimDeadBranches_0__Lean_Compiler_LCNF_UnreachableBranches_resetNestedFunDeclParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_inferMain_spec__0___redArg___closed__0;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_ofNat_goBig___closed__1;
@@ -406,7 +410,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_findArgValue__
 LEAN_EXPORT lean_object* l_Prod_repr___at___Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__2_spec__2___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_addChoice___closed__3;
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___Lean_Compiler_LCNF_UnreachableBranches_Value_getCtorArgs_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 uint64_t lean_uint64_xor(uint64_t, uint64_t);
 lean_object* lean_uint16_to_nat(uint16_t);
 lean_object* l_Repr_addAppParen(lean_object*, lean_object*);
@@ -451,7 +454,6 @@ lean_object* l_Id_instMonad___lam__6(lean_object*, lean_object*, lean_object*, l
 lean_object* l_Std_Format_joinSep___at___Lean_Syntax_formatStxAux_spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_elimDeadBranches(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_Compiler_LCNF_Decl_elimDeadBranches_spec__0___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_maxValueDepth;
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___closed__12;
 size_t lean_usize_sub(size_t, size_t);
@@ -474,7 +476,6 @@ LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___at___Lean_Compiler_LCNF_Decl_e
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_modifyAssignment___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_proj___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go___closed__0;
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateCurrFnSummary___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___Lean_Compiler_LCNF_UnreachableBranches_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069__spec__1___redArg___lam__0___boxed(lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
@@ -482,12 +483,10 @@ static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_ofNat_goSmall
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Array_filterMapM___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__2_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_array_size(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_merge(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_Value_containsCtor___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTR_loop___at___Lean_Compiler_LCNF_UnreachableBranches_Value_truncate_go_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment___closed__4;
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_getAssignment___redArg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_Array_repr___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_spec__2(lean_object*);
@@ -496,6 +495,7 @@ lean_object* l_Lean_Name_mkStr1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_findVarValue___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 lean_object* l_Std_DHashMap_Internal_AssocList_get_x3f___at___Lean_Compiler_LCNF_getType_spec__0___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Compiler_LCNF_UnreachableBranches_updateFunDeclParamsAssignment_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_reprValue___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_56_;
@@ -521,7 +521,6 @@ LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_getD___at___Lean_Comp
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_Value_truncate_go_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Id_instMonad___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_Compiler_LCNF_UnreachableBranches_getFunctionSummary_x3f_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Nat_foldTR_loop___at___Lean_Compiler_LCNF_Decl_elimDeadBranches_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___Lean_Compiler_LCNF_UnreachableBranches_Value_getLiteral_go_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -5535,15 +5534,13 @@ return x_1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_UnreachableBranches_addFunctionSummary(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_4 = l_Lean_Compiler_LCNF_UnreachableBranches_addFunctionSummary___closed__0;
-lean_inc(x_2);
-x_5 = l_Lean_Environment_addExtraName(x_1, x_2);
-x_6 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_6, 0, x_2);
-lean_ctor_set(x_6, 1, x_3);
-x_7 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_4, x_5, x_6);
-return x_7;
+x_5 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_5, 0, x_2);
+lean_ctor_set(x_5, 1, x_3);
+x_6 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_4, x_1, x_5);
+return x_6;
 }
 }
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___Lean_Compiler_LCNF_UnreachableBranches_getFunctionSummary_x3f_spec__0___redArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -8834,9 +8831,9 @@ x_38 = l_Array_toSubarray___redArg(x_33, x_36, x_37);
 x_39 = l_Array_ofSubarray___redArg(x_38);
 lean_dec_ref(x_38);
 x_40 = lean_array_get_size(x_39);
-x_41 = lean_nat_dec_eq(x_35, x_40);
+x_41 = lean_nat_dec_eq(x_34, x_40);
 lean_dec(x_40);
-lean_dec(x_35);
+lean_dec(x_34);
 if (x_41 == 0)
 {
 lean_object* x_42; lean_object* x_43; 
@@ -8846,7 +8843,7 @@ lean_dec_ref(x_2);
 x_42 = lean_box(1);
 x_43 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_43, 0, x_42);
-lean_ctor_set(x_43, 1, x_34);
+lean_ctor_set(x_43, 1, x_35);
 return x_43;
 }
 else
@@ -8854,7 +8851,7 @@ else
 size_t x_44; size_t x_45; lean_object* x_46; uint8_t x_47; 
 x_44 = lean_array_size(x_39);
 x_45 = 0;
-x_46 = l_Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_interpLetValue_spec__0___redArg(x_44, x_45, x_39, x_2, x_3, x_34);
+x_46 = l_Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_interpCode_interpLetValue_spec__0___redArg(x_44, x_45, x_39, x_2, x_3, x_35);
 lean_dec_ref(x_2);
 x_47 = !lean_is_exclusive(x_46);
 if (x_47 == 0)
@@ -8930,8 +8927,8 @@ lean_dec_ref(x_68);
 x_71 = lean_nat_dec_le(x_69, x_59);
 if (x_71 == 0)
 {
-x_34 = x_64;
-x_35 = x_70;
+x_34 = x_70;
+x_35 = x_64;
 x_36 = x_69;
 x_37 = x_60;
 goto block_54;
@@ -8939,8 +8936,8 @@ goto block_54;
 else
 {
 lean_dec(x_69);
-x_34 = x_64;
-x_35 = x_70;
+x_34 = x_70;
+x_35 = x_64;
 x_36 = x_59;
 x_37 = x_60;
 goto block_54;
@@ -13620,8 +13617,8 @@ if (x_11 == 0)
 lean_object* x_12; lean_object* x_13; 
 lean_dec_ref(x_2);
 x_12 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_12, 0, x_9);
-lean_ctor_set(x_12, 1, x_8);
+lean_ctor_set(x_12, 0, x_8);
+lean_ctor_set(x_12, 1, x_9);
 x_13 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_13, 0, x_12);
 lean_ctor_set(x_13, 1, x_10);
@@ -13645,8 +13642,8 @@ if (x_19 == 0)
 lean_object* x_20; lean_object* x_21; 
 lean_dec_ref(x_2);
 x_20 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_20, 0, x_17);
-lean_ctor_set(x_20, 1, x_16);
+lean_ctor_set(x_20, 0, x_16);
+lean_ctor_set(x_20, 1, x_17);
 x_21 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_21, 0, x_20);
 lean_ctor_set(x_21, 1, x_18);
@@ -13715,8 +13712,8 @@ x_47 = lean_usize_dec_eq(x_45, x_46);
 if (x_47 == 0)
 {
 lean_dec_ref(x_43);
-x_8 = x_41;
-x_9 = x_38;
+x_8 = x_38;
+x_9 = x_41;
 x_10 = x_42;
 x_11 = x_47;
 goto block_15;
@@ -13728,8 +13725,8 @@ x_48 = lean_ptr_addr(x_43);
 lean_dec_ref(x_43);
 x_49 = lean_ptr_addr(x_38);
 x_50 = lean_usize_dec_eq(x_48, x_49);
-x_8 = x_41;
-x_9 = x_38;
+x_8 = x_38;
+x_9 = x_41;
 x_10 = x_42;
 x_11 = x_50;
 goto block_15;
@@ -13754,8 +13751,8 @@ x_57 = lean_usize_dec_eq(x_55, x_56);
 if (x_57 == 0)
 {
 lean_dec_ref(x_53);
-x_16 = x_51;
-x_17 = x_38;
+x_16 = x_38;
+x_17 = x_51;
 x_18 = x_52;
 x_19 = x_57;
 goto block_23;
@@ -13767,8 +13764,8 @@ x_58 = lean_ptr_addr(x_53);
 lean_dec_ref(x_53);
 x_59 = lean_ptr_addr(x_38);
 x_60 = lean_usize_dec_eq(x_58, x_59);
-x_16 = x_51;
-x_17 = x_38;
+x_16 = x_38;
+x_17 = x_51;
 x_18 = x_52;
 x_19 = x_60;
 goto block_23;
@@ -15616,7 +15613,7 @@ x_1 = l_Lean_Compiler_LCNF_elimDeadBranches___closed__2;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -15626,27 +15623,27 @@ x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; 
@@ -15654,17 +15651,17 @@ x_1 = lean_mk_string_unchecked("initFn", 6, 6);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_1 = l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; 
@@ -15672,47 +15669,47 @@ x_1 = lean_mk_string_unchecked("_@", 2, 2);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_1 = l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Compiler_LCNF_UnreachableBranches_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_2069_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; 
@@ -15720,17 +15717,17 @@ x_1 = lean_mk_string_unchecked("ElimDeadBranches", 16, 16);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_1 = l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; 
@@ -15738,33 +15735,33 @@ x_1 = lean_mk_string_unchecked("_hyg", 4, 4);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_1 = l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(6608u);
-x_2 = l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_1 = lean_unsigned_to_nat(6605u);
+x_2 = l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_3 = l_Lean_Name_num___override(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Array_mapMUnsafe_map___at___Array_mapMUnsafe_map___at___Lean_Compiler_LCNF_UnreachableBranches_elimDead_go_spec__5_spec__5___closed__1;
 x_3 = 1;
-x_4 = l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_;
+x_4 = l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_;
 x_5 = l_Lean_registerTraceClass(x_2, x_3, x_4, x_1);
 return x_5;
 }
@@ -16060,37 +16057,37 @@ l_Lean_Compiler_LCNF_elimDeadBranches___closed__2 = _init_l_Lean_Compiler_LCNF_e
 lean_mark_persistent(l_Lean_Compiler_LCNF_elimDeadBranches___closed__2);
 l_Lean_Compiler_LCNF_elimDeadBranches = _init_l_Lean_Compiler_LCNF_elimDeadBranches();
 lean_mark_persistent(l_Lean_Compiler_LCNF_elimDeadBranches);
-l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_ = _init_l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_);
-if (builtin) {res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6608_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__0____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__1____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__2____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__3____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__4____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__5____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__6____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__7____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__8____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__9____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__10____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__11____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__12____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__13____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_ = _init_l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn___closed__14____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_);
+if (builtin) {res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ElimDeadBranches___hyg_6605_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 }return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c b/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c
index 6023854065..c87c48bd3d 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c
@@ -71,7 +71,6 @@ uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
 static lean_object* l___auto___closed__9____x40_Lean_Compiler_LCNF_PhaseExt___hyg_570_;
 static lean_object* l_Lean_Compiler_LCNF_forEachModuleDecl___closed__0;
 lean_object* l_Lean_stringToMessageData(lean_object*);
-lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkDeclExt___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_forEachMainModuleDecl(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkDeclExt___lam__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2404,25 +2403,19 @@ return x_5;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_saveBaseDeclCore(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_3 = lean_ctor_get(x_2, 0);
-lean_inc(x_3);
-x_4 = l_Lean_Compiler_LCNF_getBaseDecl_x3f___redArg___closed__0;
-x_5 = l_Lean_Environment_addExtraName(x_1, x_3);
-x_6 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_4, x_5, x_2);
-return x_6;
+lean_object* x_3; lean_object* x_4; 
+x_3 = l_Lean_Compiler_LCNF_getBaseDecl_x3f___redArg___closed__0;
+x_4 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_3, x_1, x_2);
+return x_4;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_saveMonoDeclCore(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_3 = lean_ctor_get(x_2, 0);
-lean_inc(x_3);
-x_4 = l_Lean_Compiler_LCNF_getMonoDecl_x3f___redArg___closed__0;
-x_5 = l_Lean_Environment_addExtraName(x_1, x_3);
-x_6 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_4, x_5, x_2);
-return x_6;
+lean_object* x_3; lean_object* x_4; 
+x_3 = l_Lean_Compiler_LCNF_getMonoDecl_x3f___redArg___closed__0;
+x_4 = l_Lean_PersistentEnvExtension_addEntry___redArg(x_3, x_1, x_2);
+return x_4;
 }
 }
 static lean_object* _init_l_Lean_Compiler_LCNF_Decl_saveBase___redArg___closed__0() {
diff --git a/stage0/stdlib/Lean/DeclarationRange.c b/stage0/stdlib/Lean/DeclarationRange.c
index 6aacf52b13..fc2b758081 100644
--- a/stage0/stdlib/Lean/DeclarationRange.c
+++ b/stage0/stdlib/Lean/DeclarationRange.c
@@ -39,6 +39,7 @@ lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 uint8_t lean_is_no_confusion(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_findDeclarationRangesCore_x3f___redArg(lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(uint8_t, uint8_t);
 lean_object* l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DTreeMap_Internal_Impl_foldlM___at___Std_DTreeMap_Internal_Impl_foldl___at___Lean_initFn____x40_Lean_DeclarationRange___hyg_45__spec__0_spec__0___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_isRec___redArg(lean_object*, lean_object*, lean_object*);
@@ -57,7 +58,6 @@ lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 lean_object* l_Lean_MapDeclarationExtension_insert___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_findDeclarationRanges_x3f___redArg___lam__1___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_addDeclarationRanges___redArg___lam__0___closed__0;
-uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(uint8_t, uint8_t);
 lean_object* l_Lean_MapDeclarationExtension_find_x3f___redArg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_findDeclarationRanges_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_findDeclarationRanges_x3f___redArg___lam__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -150,7 +150,7 @@ _start:
 {
 uint8_t x_4; uint8_t x_5; lean_object* x_6; 
 x_4 = 1;
-x_5 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(x_3, x_4);
+x_5 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(x_3, x_4);
 x_6 = lean_box(x_5);
 if (lean_obj_tag(x_6) == 0)
 {
diff --git a/stage0/stdlib/Lean/DocString/Extension.c b/stage0/stdlib/Lean/DocString/Extension.c
index 5e864ddcde..b6dfbfdf25 100644
--- a/stage0/stdlib/Lean/DocString/Extension.c
+++ b/stage0/stdlib/Lean/DocString/Extension.c
@@ -64,6 +64,7 @@ lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 lean_object* l_Lean_Name_num___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_DocString_Extension_0__Lean_initFn____x40_Lean_DocString_Extension___hyg_3_(lean_object*);
+uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(uint8_t, uint8_t);
 lean_object* l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn___closed__2____x40_Lean_DocString_Extension___hyg_44_;
 lean_object* l_Lean_PersistentArray_push___redArg(lean_object*, lean_object*);
@@ -97,7 +98,6 @@ LEAN_EXPORT lean_object* l_Lean_addDocStringCore___redArg___lam__3___boxed(lean_
 lean_object* l_Lean_Environment_getModuleIdx_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_MapDeclarationExtension_insert___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_DocString_Extension_0__Lean_initFn___closed__10____x40_Lean_DocString_Extension___hyg_382_;
-uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_addDocStringCore___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_DocString_Extension_0__Lean_initFn___closed__5____x40_Lean_DocString_Extension___hyg_382_;
 lean_object* l_Lean_MapDeclarationExtension_find_x3f___redArg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
@@ -631,7 +631,7 @@ _start:
 {
 uint8_t x_5; uint8_t x_6; lean_object* x_7; 
 x_5 = 1;
-x_6 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(x_4, x_5);
+x_6 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(x_4, x_5);
 x_7 = lean_box(x_6);
 if (lean_obj_tag(x_7) == 0)
 {
diff --git a/stage0/stdlib/Lean/Environment.c b/stage0/stdlib/Lean/Environment.c
index 2dc4d49ec0..c4dc932385 100644
--- a/stage0/stdlib/Lean/Environment.c
+++ b/stage0/stdlib/Lean/Environment.c
@@ -13,6 +13,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+static lean_object* l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9117_;
 static lean_object* l_Prod_repr___at___List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__13_spec__13___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Array_foldrMUnsafe_fold___at___Lean_Environment_displayStats_spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_compacted_region_is_memory_mapped(size_t);
@@ -23,6 +24,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getSt
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___lam__0(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_const___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instReprIRPhases;
+static lean_object* l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_instMonadEnvOfMonadLift(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_Environment_replayConsts_replayKernel_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withoutExporting___redArg___lam__1(uint8_t, lean_object*);
@@ -48,16 +50,15 @@ LEAN_EXPORT uint8_t l_Array_qsort_sort___at___Lean_mkModuleData_spec__5___redArg
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState_unsafe__9___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withExporting___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___closed__2;
-LEAN_EXPORT lean_object* l_Lean_Environment_addExtraName___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_ImportedModule_loadIRData_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtension_modifyState___redArg___closed__1;
+static lean_object* l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_withoutExporting___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at___Array_foldlMUnsafe_fold___at___Lean_Environment_displayStats_spec__7_spec__7___closed__0;
 LEAN_EXPORT lean_object* l_List_foldl___at___List_toString___at___Lean_Environment_dbgFormatAsyncState_spec__3_spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_findAsyncCore_x3f(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_readModuleData(lean_object*, lean_object*);
-static lean_object* l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_Lean_mkModuleData(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_toList___at___Lean_Environment_dbgFormatAsyncState_spec__22___redArg___boxed(lean_object*);
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__13;
@@ -76,11 +77,12 @@ LEAN_EXPORT lean_object* l_Lean_Environment_evalConst___boxed(lean_object*, lean
 size_t lean_usize_shift_right(size_t, size_t);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___at___Lean_finalizeImport_spec__8___redArg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_instDecidableEqOLeanLevel(uint8_t, uint8_t);
+static lean_object* l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_Environment_addDeclCore(lean_object*, size_t, lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__5(lean_object*, uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ConstantVal_instantiateTypeLevelParams(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_evalConstCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__14;
 static lean_object* l_Lean_initFn___closed__2____x40_Lean_Environment___hyg_6_;
@@ -108,7 +110,6 @@ static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___close
 static lean_object* l_Std_DHashMap_Internal_AssocList_get_x21___at___Lean_throwAlreadyImported_spec__0___redArg___closed__3;
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_get_x21___at___Lean_throwAlreadyImported_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedModuleData;
-static lean_object* l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9162_;
 LEAN_EXPORT lean_object* l_Lean_finalizeImport(lean_object*, lean_object*, lean_object*, uint32_t, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_AsyncConsts_findRecTask(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__20___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -134,7 +135,7 @@ LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lam__2(lea
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__10_spec__10(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_foldl___at___Lean_Environment_realizeConst_spec__1(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_instInhabitedIRPhases;
-static lean_object* l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1573_;
+static lean_object* l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at_____private_Lean_Environment_0__Lean_setImportedEntries_spec__2___redArg(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_modifyState___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_levelParams(lean_object*);
@@ -144,7 +145,6 @@ LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_replace___at___Lean_S
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_finalizeImport_spec__16_spec__16___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts;
 uint8_t l_Array_isEmpty___redArg(lean_object*);
-static lean_object* l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_Lean_Environment_allImportedModuleNames___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_importModulesCore_spec__0(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__6___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -181,7 +181,6 @@ static lean_object* l_Lean_PersistentEnvExtension_getModuleEntries_unsafe__1___r
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_setState___redArg___lam__2___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_saveModuleData___closed__0;
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__11;
-static lean_object* l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState_unsafe__4(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_finalizeImport_spec__16_spec__16(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_String_quote(lean_object*);
@@ -198,6 +197,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_findConstVal_x3f(lean_object*, lean_
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldl___at___Lean_mkModuleData_spec__2___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_saveModuleDataParts___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1560_;
 static lean_object* l_Lean_mkEmptyEnvironment___closed__3;
 LEAN_EXPORT lean_object* l_Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_sort___override(lean_object*);
@@ -218,6 +218,7 @@ static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateIm
 LEAN_EXPORT lean_object* l_List_elem___at___Lean_Environment_realizeConst_spec__4___boxed(lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__5___closed__0;
 LEAN_EXPORT uint8_t l_Lean_Environment_isRealizing(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9117____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 static lean_object* l_Lean_instInhabitedPersistentEnvExtension___lam__3___closed__0;
 static lean_object* l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__8___closed__1;
@@ -231,6 +232,7 @@ static lean_object* l_Lean_EnvExtension_modifyState___redArg___closed__2;
 static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateImpl___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_toList___at___Lean_Environment_dbgFormatAsyncState_spec__22___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkExtNameMap(lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_MonadExcept_ofExcept___at___Lean_Environment_replayConsts_replayKernel_spec__1(lean_object*, lean_object*);
 uint8_t lean_get_ir_phases(lean_object*, lean_object*);
 static lean_object* l_Lean_importModules___closed__0;
@@ -244,7 +246,6 @@ static lean_object* l___private_Lean_Environment_0__Lean_Environment_mkFallbackC
 static lean_object* l_Lean_mkEmptyEnvironment___closed__11;
 LEAN_EXPORT lean_object* l_Lean_registerEnvExtension___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0_spec__0(lean_object*, lean_object*, size_t, lean_object*);
-static lean_object* l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT uint8_t l_Lean_beqIRPhases____x40_Lean_Environment___hyg_362_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_containsAtAux___at___Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at___Lean_Environment_addDeclCore_spec__0___closed__2;
@@ -303,22 +304,23 @@ LEAN_EXPORT lean_object* l_Lean_Environment_find_x3f___boxed(lean_object*, lean_
 LEAN_EXPORT lean_object* l_Lean_Environment_imports___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_replayConsts_replayKernel_unsafe__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_AsyncMode_toCtorIdx(uint8_t);
-LEAN_EXPORT lean_object* l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_dbgFormatAsyncState___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Environment_dbgFormatCheckedSyncState(lean_object*, lean_object*);
+static lean_object* l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__17___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getNumBuiltinAttributes___boxed(lean_object*);
+static lean_object* l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9117_;
 LEAN_EXPORT lean_object* l_Lean_SMap_numBuckets___at___Lean_Environment_displayStats_spec__5___redArg___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_setState___redArg___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Environment_0__Lean_AsyncContext_mayContain(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_findOLeanParts___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_enterAsync(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_getDiagnostics(lean_object*);
+static lean_object* l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9117_;
 LEAN_EXPORT lean_object* l_Lean_ImportStateM_run(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__7___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedAsyncConstantInfo___closed__5;
-static lean_object* l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Lean_withoutExporting___redArg___lam__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IRPhases_noConfusion(lean_object*, uint8_t, uint8_t, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Environment_0__Lean_looksLikeOldCodegenName(lean_object*);
@@ -332,13 +334,13 @@ uint8_t l_Lean_ConstantInfo_isUnsafe(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_findTaskCore___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_EStateM_bind(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_findStateAsync(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560____boxed(lean_object*, lean_object*);
 uint8_t l_List_isEmpty___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_enableDiag___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_mkInitialExtensionStates(lean_object*);
 static lean_object* l_panic___at___Lean_Environment_addDeclCore_spec__0___closed__0;
 static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_modifyStateImpl___redArg___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
 static lean_object* l_panic___at___Lean_Environment_addDeclCore_spec__0___closed__5;
 LEAN_EXPORT uint8_t l_Lean_PersistentHashMap_containsAtAux___at___Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0_spec__0_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn___closed__5____x40_Lean_Environment___hyg_6_;
@@ -379,6 +381,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_addDeclCore___lam__0___boxed(lean_ob
 LEAN_EXPORT lean_object* l_Lean_writeModule___lam__0(lean_object*, lean_object*, uint8_t, lean_object*);
 uint8_t l_Lean_Name_isPrefixOf(lean_object*, lean_object*);
 lean_object* l_Array_unzip___redArg(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9117_(uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtension___lam__0(lean_object*);
 lean_object* lean_read_module_data_parts(lean_object*, lean_object*);
 lean_object* l_Id_instMonad___lam__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -388,7 +391,6 @@ LEAN_EXPORT lean_object* l_MonadExcept_ofExcept___at___Lean_Environment_replayCo
 LEAN_EXPORT lean_object* l_Lean_finalizeImport___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SMap_numBuckets___at___Lean_Environment_displayStats_spec__5___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_value_x21(lean_object*, uint8_t);
 lean_object* lean_string_utf8_byte_size(lean_object*);
@@ -408,6 +410,7 @@ static lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries___cl
 uint8_t l_Std_Format_isNil(lean_object*);
 static lean_object* l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__8___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Kernel_Environment_isQuotInit___boxed(lean_object*);
+static lean_object* l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9610_;
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___Lean_finalizeImport_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__10___boxed(lean_object*, lean_object*);
@@ -415,7 +418,6 @@ static lean_object* l_Lean_reprIRPhases___closed__5____x40_Lean_Environment___hy
 LEAN_EXPORT lean_object* l_List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__13___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1___redArg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___closed__4;
-static lean_object* l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Lean_Kernel_enableDiag(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__1___redArg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkDefinitionValInferrringUnsafe___redArg___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -445,13 +447,12 @@ lean_object* l_Lean_Name_mkStr3(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_getMaxHeight___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_envExtensionsRef;
 LEAN_EXPORT uint8_t l_List_elem___at___Lean_Environment_realizeConst_spec__4(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnvExtension(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
-static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7407_;
 LEAN_EXPORT lean_object* l_Lean_registerEnvExtension_unsafe__1___redArg(lean_object*);
 static lean_object* l_Lean_registerEnvExtension___redArg___closed__1;
 lean_object* lean_io_promise_resolve(lean_object*, lean_object*, lean_object*);
 lean_object* l_Except_map(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_mkModuleData___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__18___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_promise_result_opt(lean_object*);
@@ -529,7 +530,6 @@ LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_findStateAsyncUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_hasUnsafe___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries_unsafe__1___boxed(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9655_;
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_finalizeImport_spec__16(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint64_t lean_uint64_shift_right(uint64_t, uint64_t);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateImpl___redArg(lean_object*, lean_object*, lean_object*);
@@ -560,13 +560,13 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState___redArg(lean_object*,
 static lean_object* l_Lean_Environment_displayStats___closed__7;
 lean_object* l_List_find_x3f___redArg(lean_object*, lean_object*);
 lean_object* l_Std_Iterators_Types_Attach_instIterator___redArg(lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1560_;
 static lean_object* l_Lean_Environment_AddConstAsyncResult_commitConst___closed__1;
 lean_object* l_Lean_ImportArtifacts_oleanParts(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instModuleIdxBEq;
 static lean_object* l_Lean_mkEmptyEnvironment___closed__9;
 LEAN_EXPORT lean_object* l_Lean_ConstantKind_toCtorIdx(uint8_t);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_mkModuleData_spec__0(lean_object*, lean_object*, uint8_t, size_t, size_t, lean_object*);
-static lean_object* l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9162_;
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__13;
 LEAN_EXPORT lean_object* l_Lean_Kernel_Environment_isDiagnosticsEnabled___boxed(lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___closed__3;
@@ -575,7 +575,6 @@ static lean_object* l_Lean_Environment_dbgFormatAsyncState___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Environment_evalConst(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Kernel_Environment_resetDiag(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instModuleIdxToString;
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_9655_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getMaxHeight___boxed__const__1;
 LEAN_EXPORT uint8_t l_Lean_AsyncConstantInfo_isUnsafe(lean_object*);
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__3;
@@ -610,7 +609,6 @@ static lean_object* l_Lean_PersistentHashMap_insert___at___Lean_SMap_insert___at
 LEAN_EXPORT lean_object* l_Lean_Environment_setMainModule___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_PromiseCheckedResult_commitChecked___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PRange_instSupportsUpperBoundOpenOfDecidableLT___redArg___lam__0___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9162_(uint8_t, lean_object*);
 static lean_object* l_Lean_Environment_PromiseCheckedResult_commitChecked___closed__2;
 static lean_object* l___private_Lean_Environment_0__Lean_looksLikeOldCodegenName___closed__3;
 LEAN_EXPORT lean_object* l_List_mapTR_loop___at___Lean_Environment_dbgFormatAsyncState_spec__1(lean_object*, lean_object*);
@@ -624,7 +622,6 @@ lean_object* lean_st_ref_get(lean_object*, lean_object*);
 static lean_object* l_Lean_registerEnvExtension___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_AssocList_get_x3f___at___Lean_SMap_find_x3f_x27___at___Lean_Kernel_Environment_find_x3f_spec__0_spec__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_VisibilityMap_get___redArg(lean_object*, lean_object*);
-static lean_object* l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_mkModuleData_spec__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__4;
 LEAN_EXPORT lean_object* l_Lean_finalizeImport_unsafe__17(lean_object*);
@@ -646,11 +643,11 @@ LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState_unsafe__4___redArg(lean
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_findTaskCore___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_instBEqIRPhases___closed__0;
 lean_object* l_Lean_Name_num___override(lean_object*, lean_object*);
-static lean_object* l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_panic___at___Lean_importModulesCore_go_spec__0(lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at___Lean_readModuleData_spec__0___closed__0;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__19(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_importEnv_x3f_unsafe__1(lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lam__0___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_repr___at___Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__17_spec__17___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateImpl(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -659,13 +656,12 @@ static lean_object* l_Lean_EnvExtension_modifyState___redArg___closed__6;
 LEAN_EXPORT lean_object* l_Lean_throwAlreadyImported___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_findTaskCore___lam__0(lean_object*, lean_object*);
 lean_object* lean_io_map_task(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
+LEAN_EXPORT uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_ConstantKind_toCtorIdx___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_setState___redArg___lam__0(lean_object*, lean_object*);
 lean_object* l_Lean_privateToUserName(lean_object*);
-LEAN_EXPORT uint8_t l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(uint8_t, uint8_t);
 LEAN_EXPORT uint8_t l_Lean_instInhabitedConstantKind;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_setState___redArg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9162_;
 LEAN_EXPORT lean_object* l_Lean_finalizeImport_unsafe__14(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t lean_environment_quot_init(lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg___closed__2;
@@ -686,13 +682,11 @@ LEAN_EXPORT uint8_t l_Lean_Environment_addDeclCore___lam__0(lean_object*, lean_o
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Environment_setMainModule(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Environment_freeRegions_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9162_;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_AsyncConsts_add___lam__0___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getMaxHeight___lam__0___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_looksLikeOldCodegenName___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_enterAsyncRealizing(lean_object*, lean_object*);
-static lean_object* l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2222_;
 static lean_object* l_Array_filterMapM___at___Lean_mkModuleData_spec__3___closed__0;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_modifyStateImpl___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_throwAlreadyImported___redArg___closed__1;
@@ -719,7 +713,6 @@ lean_object* l_Id_instMonad___lam__3(lean_object*, lean_object*, lean_object*, l
 LEAN_EXPORT uint8_t l_Lean_ConstantKind_ofConstantInfo(lean_object*);
 static lean_object* l_Lean_withImportModules___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___List_repr___at___Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__17_spec__17_spec__18(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_initFn____x40_Lean_Environment___hyg_7407_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_numBuckets___at___Lean_SMap_numBuckets___at___Lean_Environment_displayStats_spec__5_spec__5___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_toString___at___Lean_Environment_displayStats_spec__0(lean_object*);
@@ -762,7 +755,6 @@ LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___List_repr___at___Lean_Envir
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries_unsafe__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries_unsafe__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withExporting___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Lean_Environment_findTask(lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Expr_instantiateLevelParams(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___Lean_Environment_addDeclCore_spec__0(lean_object*);
@@ -770,7 +762,6 @@ LEAN_EXPORT lean_object* l_Lean_Environment_PromiseCheckedResult_commitChecked(l
 static lean_object* l_Lean_Environment_evalConstCheck___redArg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_AsyncMode_toCtorIdx___boxed(lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1573_;
 lean_object* l_List_takeTR_go___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at___Array_foldlMUnsafe_fold___at___Lean_Environment_displayStats_spec__7_spec__7___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_setStateImpl___redArg___boxed(lean_object*, lean_object*, lean_object*);
@@ -780,9 +771,9 @@ LEAN_EXPORT lean_object* l_Lean_instDecidableEqOLeanLevel___boxed(lean_object*,
 static lean_object* l_Lean_reprIRPhases___closed__4____x40_Lean_Environment___hyg_380_;
 static lean_object* l_List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__10___redArg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9117_;
 static lean_object* l_Lean_mkEmptyEnvironment___closed__2;
 LEAN_EXPORT lean_object* l_IO_println___at___Lean_Environment_displayStats_spec__2(lean_object*, lean_object*);
-lean_object* l_Lean_NameSet_insert(lean_object*, lean_object*);
 lean_object* lean_task_get_own(lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___closed__11;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState_unsafe__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -813,6 +804,7 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_sp
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__26;
 extern lean_object* l_Std_PRange_instUpwardEnumerableNat;
 LEAN_EXPORT lean_object* l_Lean_Environment_realizeConst___lam__1(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0___redArg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_IO_print___at___IO_println___at___Lean_Environment_displayStats_spec__2_spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState___redArg___lam__1(lean_object*, lean_object*, lean_object*);
@@ -820,7 +812,6 @@ static lean_object* l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_sp
 LEAN_EXPORT lean_object* l_Lean_Environment_realizeConst___lam__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_Environment_addDeclCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instMonadEnvOfMonadLift___redArg(lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1573_;
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__16;
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_importModulesCore_go_spec__1___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_getIRExtraConstNames___boxed(lean_object*, lean_object*);
@@ -835,7 +826,6 @@ LEAN_EXPORT lean_object* l_Lean_Environment_findConstVal_x3f___boxed(lean_object
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_ensureExtensionsArraySize(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instGetElemArrayModuleIdxLtNatToNatSize(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_OLeanLevel_noConfusion___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1573_;
 static lean_object* l_Lean_writeModule___closed__0;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_findStateAsyncUnsafe___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Substring_nextn(lean_object*, lean_object*, lean_object*);
@@ -843,12 +833,14 @@ static lean_object* l_Lean_instInhabitedEnvExtension___lam__0___closed__1;
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_mkExtNameMap_spec__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___Lean_SMap_find_x3f_x27___at___Lean_Kernel_Environment_find_x3f_spec__0_spec__1___redArg(lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedAsyncConstantInfo___closed__1;
+static lean_object* l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Lean_Environment_replayConsts___lam__0(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_realizeConst___lam__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpectedType(lean_object*, lean_object*, lean_object*);
 static size_t l_Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0_spec__0___redArg___closed__1;
 static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_invalidExtMsg___closed__0;
 lean_object* lean_eval_const(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___Lean_finalizeImport_spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getMaxHeight___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_modifyState___redArg(lean_object*, lean_object*, lean_object*, uint8_t);
@@ -857,6 +849,7 @@ static lean_object* l_Lean_throwAlreadyImported___redArg___closed__0;
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___Lean_Environment_replayConsts_replayKernel_spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_AddConstAsyncResult_commitConst___closed__4;
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_mkExtNameMap_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(uint8_t, uint8_t);
 static lean_object* l_Lean_instInhabitedModuleData___closed__0;
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Kernel_instInhabitedDiagnostics;
@@ -903,10 +896,10 @@ LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lam__3___b
 LEAN_EXPORT lean_object* l_Lean_Environment_AddConstAsyncResult_commitSignature(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_OLeanLevel_adjustFileName___closed__1;
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___Lean_mkModuleData_spec__5___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9162____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldl___at___Lean_mkModuleData_spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__14(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries___lam__0___boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__7(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_numBuckets___at___Lean_SMap_numBuckets___at___Lean_Environment_displayStats_spec__5_spec__5(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Option_set___at___Lean_Environment_realizeConst_spec__2(lean_object*, lean_object*, uint8_t);
@@ -917,6 +910,7 @@ static lean_object* l_Lean_Environment_enableRealizationsForConst___closed__1;
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__27;
 uint8_t l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* lake_environment_add(lean_object*, lean_object*);
+static lean_object* l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Lean_Environment_mainModule___boxed(lean_object*);
 extern lean_object* l_Lean_instInhabitedConstantInfo;
 lean_object* lean_elab_add_decl(lean_object*, size_t, lean_object*, lean_object*);
@@ -924,16 +918,17 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_findAs
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lam__3(lean_object*, lean_object*, uint8_t);
 static lean_object* l_Lean_instReprIRPhases___closed__0;
 LEAN_EXPORT lean_object* l_Lean_beqIRPhases____x40_Lean_Environment___hyg_362____boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9117_;
 lean_object* l_Lean_Name_beq___boxed(lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at___Array_foldlMUnsafe_fold___at___Lean_Environment_displayStats_spec__7_spec__7___closed__1;
 static lean_object* l_List_toString___at___Lean_Environment_dbgFormatAsyncState_spec__3___closed__0;
 lean_object* l_Lean_Expr_FoldConstsImpl_fold_visit___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_dbgFormatCheckedSyncState___closed__0;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 static lean_object* l_Lean_readModuleData___closed__4;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_modifyStateImpl___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_mainModule(lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__15(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_modifyStateImpl(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_addDeclCheck___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -945,6 +940,7 @@ static lean_object* l_Lean_Environment_displayStats___closed__1;
 LEAN_EXPORT lean_object* l_List_forIn_x27_loop___at___Lean_Environment_replayConsts_replayKernel_spec__2___redArg(lean_object*, uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_findTaskCore(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_AsyncMode_noConfusion___redArg___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542____boxed(lean_object*, lean_object*);
 static lean_object* l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1___redArg___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg(lean_object*, lean_object*, lean_object*, uint8_t);
 static lean_object* l_Lean_reprIRPhases___closed__2____x40_Lean_Environment___hyg_380_;
@@ -964,6 +960,7 @@ static lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpe
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__7___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___Lean_finalizeImport_spec__10(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_useDefaultIfOtherFieldGiven___redArg(lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__9(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleIREntries___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_SMap_contains___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -974,19 +971,17 @@ LEAN_EXPORT lean_object* l_Lean_reprIRPhases____x40_Lean_Environment___hyg_380_(
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lam__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_isConstructor___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IRPhases_noConfusion___redArg___boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_List_foldl___at___Lean_Environment_replayConsts_spec__0___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvironmentHeader_moduleNames(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_promiseChecked(lean_object*, lean_object*);
-static lean_object* l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__2___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withoutExporting___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_isRealizing___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__0___redArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ConstantInfo_instantiateTypeLevelParams___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___Lean_Environment_freeRegions_spec__0(lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_ImportedModule_mainModule_x3f(lean_object*);
-LEAN_EXPORT uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___lam__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint32_t l_Lean_getMaxHeight___lam__0(lean_object*, lean_object*, uint32_t);
 LEAN_EXPORT uint8_t l_Lean_Environment_isSafeDefinition(lean_object*, lean_object*);
@@ -995,7 +990,9 @@ LEAN_EXPORT lean_object* l_Lean_Environment_promiseChecked___lam__0___boxed(lean
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___Lean_finalizeImport_spec__10___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_set(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_replayConsts_replayKernel(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1560_;
 uint64_t l_Lean_Name_hash___override(lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_ConstantKind_noConfusion___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_findAux___at___Lean_PersistentHashMap_find_x3f_spec__0___redArg(lean_object*, lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at___Lean_EnvironmentHeader_moduleNames_spec__0___boxed(lean_object*, lean_object*, lean_object*);
@@ -1012,11 +1009,11 @@ LEAN_EXPORT lean_object* l_Prod_repr___at___List_repr___at___Option_repr___at___
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Std_PRange_RangeIterator_instIteratorLoop_loop___at_____private_Lean_Environment_0__Lean_setImportedEntries_spec__2_spec__2___redArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_foldl___at___List_foldl___at_____private_Lean_Environment_0__Lean_Environment_updateBaseAfterKernelAdd_spec__0_spec__0___closed__0;
 static lean_object* l_Array_filterMapM___at___Lean_finalizeImport_spec__2___closed__0;
-static lean_object* l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Lean_mkModuleData___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_reverse___redArg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_evalConstCheck___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__13(lean_object*, lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l_Lean_instBEqConstantKind;
 LEAN_EXPORT lean_object* l_List_foldl___at___List_toString___at___Lean_Environment_dbgFormatAsyncState_spec__3_spec__3(lean_object*, lean_object*);
 lean_object* lean_task_map(lean_object*, lean_object*, lean_object*, uint8_t);
@@ -1025,6 +1022,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__0___boxed(lean_
 static lean_object* l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__1;
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_importModulesCore_go_spec__1___redArg___lam__0(uint8_t, lean_object*, uint8_t, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_initFn____x40_Lean_Environment___hyg_7369_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync___lam__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Prod_repr___at___List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__13_spec__13___boxed(lean_object*, lean_object*);
 lean_object* l_Array_append___redArg(lean_object*, lean_object*);
@@ -1039,7 +1037,6 @@ LEAN_EXPORT uint8_t l_Lean_Kernel_isDefEqGuarded(lean_object*, lean_object*, lea
 static lean_object* l_Std_DHashMap_Internal_AssocList_get_x21___at___Lean_throwAlreadyImported_spec__0___redArg___closed__1;
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_importModules_spec__0(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__7;
-static lean_object* l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1573_;
 uint8_t l_Std_DTreeMap_Internal_Impl_contains___at___Lean_NameMap_contains_spec__0___redArg(lean_object*, lean_object*);
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___closed__8;
 static lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_importModules_spec__0___closed__0;
@@ -1049,12 +1046,10 @@ static lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries___cl
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_AsyncConsts_findPrefix_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_addEntry(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_evalConst___redArg___closed__0;
-static lean_object* l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2222_;
 LEAN_EXPORT uint8_t l_Lean_EnvExtension_instInhabitedAsyncMode;
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_enableRealizationsForConst_unsafe__1(lean_object*);
 lean_object* l_Array_findIdx_x3f_loop___redArg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555____boxed(lean_object*, lean_object*);
 static size_t l_Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at___Lean_SMap_contains___at___Lean_Environment_containsOnBranch_spec__0_spec__0_spec__0___redArg___closed__0;
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___redArg___closed__10;
 static lean_object* l_Lean_Environment_displayStats___closed__0;
@@ -1093,7 +1088,6 @@ lean_object* lean_io_initializing(lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__8;
 static lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__0;
 LEAN_EXPORT lean_object* l_Lean_Environment_replayConsts___lam__0___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize___lam__0(lean_object*, lean_object*);
 static lean_object* l_Lean_PersistentHashMap_find_x3f___at___Lean_SMap_find_x3f_x27___at___Lean_Kernel_Environment_find_x3f_spec__0_spec__1___redArg___closed__0;
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_6_(lean_object*);
@@ -1116,6 +1110,7 @@ LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at___Lean_SMap_find
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_findStateAsync___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withImportModules___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Name_quickCmp(lean_object*, lean_object*);
+static lean_object* l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Lean_withImportModules___redArg(lean_object*, lean_object*, lean_object*, uint32_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_findAsync_x3f(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_importModulesCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1123,7 +1118,6 @@ uint8_t l_Substring_beq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ModuleIdx_toNat(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Visibility_noConfusion___redArg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_readModuleDataParts___boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9162_;
 size_t lean_usize_add(size_t, size_t);
 lean_object* l_mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_check___boxed(lean_object*, lean_object*, lean_object*);
@@ -1146,8 +1140,9 @@ static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___cl
 static lean_object* l_List_foldl___at___List_foldl___at_____private_Lean_Environment_0__Lean_Environment_updateBaseAfterKernelAdd_spec__0_spec__0___closed__3;
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__15;
 LEAN_EXPORT lean_object* l_Lean_Kernel_isDiagnosticsEnabled___boxed(lean_object*);
+static lean_object* l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1560_;
+static lean_object* l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1560_;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_AsyncConsts_find_x3f(lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1573_;
 lean_object* lean_array_uget(lean_object*, size_t);
 LEAN_EXPORT lean_object* l_Lean_reprIRPhases____x40_Lean_Environment___hyg_380____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ConstantKind_noConfusion(lean_object*, uint8_t, uint8_t, lean_object*);
@@ -1155,6 +1150,7 @@ size_t lean_array_size(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_findStateAsync___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__5;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_findOLeanParts___lam__0___boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState_unsafe__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn___closed__1____x40_Lean_Environment___hyg_6_;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Visibility_toCtorIdx(uint8_t);
@@ -1185,7 +1181,6 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getSt
 LEAN_EXPORT lean_object* l_Std_Format_joinSep___at___List_repr___at___Lean_Environment_dbgFormatAsyncState_spec__10_spec__10___lam__0(lean_object*);
 lean_object* lean_get_ir_extra_const_names(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_VisibilityMap_map___redArg(lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1573_;
 static lean_object* l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__4___closed__0;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries___lam__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_replayConsts_replayKernel___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1197,6 +1192,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_setSt
 LEAN_EXPORT lean_object* l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__17(lean_object*, lean_object*);
 static lean_object* l_Lean_mkEmptyEnvironment___closed__7;
 lean_object* lean_string_append(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_9610_(lean_object*);
 lean_object* l_Std_PRange_instIteratorRangeIteratorIdOfUpwardEnumerableOfSupportsUpperBound___redArg___lam__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapFinIdxM_map___at___Lean_finalizeImport_spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_looksLikeOldCodegenName___closed__8;
@@ -1215,12 +1211,15 @@ LEAN_EXPORT lean_object* l_Lean_Environment_dbgFormatAsyncState(lean_object*, le
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_getStateImpl___redArg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_Environment_enableDiag(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_mkExtNameMap_spec__0(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2209_;
 lean_object* l_Id_instMonad___lam__0(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7369_;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_invalidExtMsg;
 LEAN_EXPORT lean_object* l_Lean_Environment_realizingStack___boxed(lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__2;
 lean_object* l_Lean_mkAtom(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instGetElem_x3fArrayModuleIdxLtNatToNatSize(lean_object*);
+static lean_object* l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9117_;
 LEAN_EXPORT lean_object* l_Lean_AsyncConstantInfo_toConstantVal(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_saveModuleData___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_findOLeanParts___closed__2;
@@ -1260,7 +1259,6 @@ LEAN_EXPORT lean_object* l_Lean_OLeanLevel_noConfusion___redArg___boxed(lean_obj
 LEAN_EXPORT lean_object* lean_environment_add(lean_object*, lean_object*);
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__23;
 static lean_object* l_Lean_Environment_addDeclCore___closed__0;
-LEAN_EXPORT lean_object* l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069____boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_PersistentEnvExtensionDescrCore_name___autoParam___closed__10;
 LEAN_EXPORT lean_object* l_Lean_importModules(lean_object*, lean_object*, uint32_t, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_VisibilityMap_const(lean_object*, lean_object*);
@@ -1274,9 +1272,9 @@ static lean_object* l_panic___at___Lean_Environment_addDeclCore_spec__0___closed
 LEAN_EXPORT uint8_t l_Lean_Environment_getModuleIdx_x3f___lam__0(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_setExporting(lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Std_DHashMap_Internal_numBuckets___at___Lean_SMap_numBuckets___at___Lean_Environment_displayStats_spec__5_spec__5___redArg(lean_object*);
+static lean_object* l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2209_;
 LEAN_EXPORT lean_object* l_Array_filterMapM___at___Lean_mkModuleData_spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_kernel_whnf(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1573_;
 LEAN_EXPORT lean_object* l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__8___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_PrefixTreeNode_findLongestPrefix_x3f_loop___redArg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_setDiagnostics___lam__0(lean_object*, lean_object*);
@@ -1311,7 +1309,6 @@ LEAN_EXPORT lean_object* l_Lean_instReprOLeanLevel;
 static lean_object* l_panic___at___Lean_Environment_addDeclCore_spec__0___closed__1;
 lean_object* l_Lean_Name_hash___override___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_IRPhases_noConfusion___redArg___lam__0___boxed(lean_object*);
-static lean_object* l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9162_;
 static lean_object* l_Lean_initFn___closed__3____x40_Lean_Environment___hyg_6_;
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_ImportedModule_serverData_x3f___boxed(lean_object*, lean_object*);
@@ -2306,20 +2303,18 @@ if (x_2 == 0)
 {
 uint8_t x_3; 
 x_3 = 1;
-lean_ctor_set_uint8(x_1, sizeof(void*)*7, x_3);
+lean_ctor_set_uint8(x_1, sizeof(void*)*6, x_3);
 return x_1;
 }
 else
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_11; 
 x_4 = lean_ctor_get(x_1, 0);
 x_5 = lean_ctor_get(x_1, 1);
 x_6 = lean_ctor_get(x_1, 2);
 x_7 = lean_ctor_get(x_1, 3);
 x_8 = lean_ctor_get(x_1, 4);
 x_9 = lean_ctor_get(x_1, 5);
-x_10 = lean_ctor_get(x_1, 6);
-lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
@@ -2327,17 +2322,16 @@ lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_dec(x_1);
-x_11 = 1;
-x_12 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_12, 0, x_4);
-lean_ctor_set(x_12, 1, x_5);
-lean_ctor_set(x_12, 2, x_6);
-lean_ctor_set(x_12, 3, x_7);
-lean_ctor_set(x_12, 4, x_8);
-lean_ctor_set(x_12, 5, x_9);
-lean_ctor_set(x_12, 6, x_10);
-lean_ctor_set_uint8(x_12, sizeof(void*)*7, x_11);
-return x_12;
+x_10 = 1;
+x_11 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_11, 0, x_4);
+lean_ctor_set(x_11, 1, x_5);
+lean_ctor_set(x_11, 2, x_6);
+lean_ctor_set(x_11, 3, x_7);
+lean_ctor_set(x_11, 4, x_8);
+lean_ctor_set(x_11, 5, x_9);
+lean_ctor_set_uint8(x_11, sizeof(void*)*6, x_10);
+return x_11;
 }
 }
 }
@@ -2345,7 +2339,7 @@ LEAN_EXPORT uint8_t lean_environment_quot_init(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; 
-x_2 = lean_ctor_get_uint8(x_1, sizeof(void*)*7);
+x_2 = lean_ctor_get_uint8(x_1, sizeof(void*)*6);
 lean_dec_ref(x_1);
 return x_2;
 }
@@ -2815,16 +2809,14 @@ return x_1;
 }
 else
 {
-lean_object* x_7; uint8_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+lean_object* x_7; uint8_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 x_7 = lean_ctor_get(x_1, 0);
-x_8 = lean_ctor_get_uint8(x_1, sizeof(void*)*7);
+x_8 = lean_ctor_get_uint8(x_1, sizeof(void*)*6);
 x_9 = lean_ctor_get(x_1, 1);
 x_10 = lean_ctor_get(x_1, 2);
 x_11 = lean_ctor_get(x_1, 3);
 x_12 = lean_ctor_get(x_1, 4);
 x_13 = lean_ctor_get(x_1, 5);
-x_14 = lean_ctor_get(x_1, 6);
-lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
@@ -2832,18 +2824,17 @@ lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_7);
 lean_dec(x_1);
-x_15 = l_Lean_ConstantInfo_name(x_2);
-x_16 = l_Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0___redArg(x_7, x_15, x_2);
-x_17 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_17, 0, x_16);
-lean_ctor_set(x_17, 1, x_9);
-lean_ctor_set(x_17, 2, x_10);
-lean_ctor_set(x_17, 3, x_11);
-lean_ctor_set(x_17, 4, x_12);
-lean_ctor_set(x_17, 5, x_13);
-lean_ctor_set(x_17, 6, x_14);
-lean_ctor_set_uint8(x_17, sizeof(void*)*7, x_8);
-return x_17;
+x_14 = l_Lean_ConstantInfo_name(x_2);
+x_15 = l_Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0___redArg(x_7, x_14, x_2);
+x_16 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_9);
+lean_ctor_set(x_16, 2, x_10);
+lean_ctor_set(x_16, 3, x_11);
+lean_ctor_set(x_16, 4, x_12);
+lean_ctor_set(x_16, 5, x_13);
+lean_ctor_set_uint8(x_16, sizeof(void*)*6, x_8);
+return x_16;
 }
 }
 }
@@ -2895,16 +2886,14 @@ return x_1;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
 x_8 = lean_ctor_get(x_1, 1);
 x_9 = lean_ctor_get(x_1, 0);
-x_10 = lean_ctor_get_uint8(x_1, sizeof(void*)*7);
+x_10 = lean_ctor_get_uint8(x_1, sizeof(void*)*6);
 x_11 = lean_ctor_get(x_1, 2);
 x_12 = lean_ctor_get(x_1, 3);
 x_13 = lean_ctor_get(x_1, 4);
 x_14 = lean_ctor_get(x_1, 5);
-x_15 = lean_ctor_get(x_1, 6);
-lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
@@ -2912,32 +2901,31 @@ lean_inc(x_11);
 lean_inc(x_8);
 lean_inc(x_9);
 lean_dec(x_1);
-x_16 = lean_ctor_get(x_8, 0);
-lean_inc_ref(x_16);
+x_15 = lean_ctor_get(x_8, 0);
+lean_inc_ref(x_15);
 if (lean_is_exclusive(x_8)) {
  lean_ctor_release(x_8, 0);
- x_17 = x_8;
+ x_16 = x_8;
 } else {
  lean_dec_ref(x_8);
- x_17 = lean_box(0);
+ x_16 = lean_box(0);
 }
-if (lean_is_scalar(x_17)) {
- x_18 = lean_alloc_ctor(0, 1, 1);
+if (lean_is_scalar(x_16)) {
+ x_17 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_18 = x_17;
+ x_17 = x_16;
 }
-lean_ctor_set(x_18, 0, x_16);
-lean_ctor_set_uint8(x_18, sizeof(void*)*1, x_2);
-x_19 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_19, 0, x_9);
-lean_ctor_set(x_19, 1, x_18);
-lean_ctor_set(x_19, 2, x_11);
-lean_ctor_set(x_19, 3, x_12);
-lean_ctor_set(x_19, 4, x_13);
-lean_ctor_set(x_19, 5, x_14);
-lean_ctor_set(x_19, 6, x_15);
-lean_ctor_set_uint8(x_19, sizeof(void*)*7, x_10);
-return x_19;
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set_uint8(x_17, sizeof(void*)*1, x_2);
+x_18 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_18, 0, x_9);
+lean_ctor_set(x_18, 1, x_17);
+lean_ctor_set(x_18, 2, x_11);
+lean_ctor_set(x_18, 3, x_12);
+lean_ctor_set(x_18, 4, x_13);
+lean_ctor_set(x_18, 5, x_14);
+lean_ctor_set_uint8(x_18, sizeof(void*)*6, x_10);
+return x_18;
 }
 }
 }
@@ -3003,16 +2991,14 @@ return x_1;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
 x_10 = lean_ctor_get(x_1, 1);
 x_11 = lean_ctor_get(x_1, 0);
-x_12 = lean_ctor_get_uint8(x_1, sizeof(void*)*7);
+x_12 = lean_ctor_get_uint8(x_1, sizeof(void*)*6);
 x_13 = lean_ctor_get(x_1, 2);
 x_14 = lean_ctor_get(x_1, 3);
 x_15 = lean_ctor_get(x_1, 4);
 x_16 = lean_ctor_get(x_1, 5);
-x_17 = lean_ctor_get(x_1, 6);
-lean_inc(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
@@ -3020,32 +3006,31 @@ lean_inc(x_13);
 lean_inc(x_10);
 lean_inc(x_11);
 lean_dec(x_1);
-x_18 = lean_ctor_get_uint8(x_10, sizeof(void*)*1);
+x_17 = lean_ctor_get_uint8(x_10, sizeof(void*)*1);
 if (lean_is_exclusive(x_10)) {
  lean_ctor_release(x_10, 0);
- x_19 = x_10;
+ x_18 = x_10;
 } else {
  lean_dec_ref(x_10);
- x_19 = lean_box(0);
+ x_18 = lean_box(0);
 }
-x_20 = l_Lean_Kernel_instInhabitedDiagnostics___closed__1;
-if (lean_is_scalar(x_19)) {
- x_21 = lean_alloc_ctor(0, 1, 1);
+x_19 = l_Lean_Kernel_instInhabitedDiagnostics___closed__1;
+if (lean_is_scalar(x_18)) {
+ x_20 = lean_alloc_ctor(0, 1, 1);
 } else {
- x_21 = x_19;
+ x_20 = x_18;
 }
-lean_ctor_set(x_21, 0, x_20);
-lean_ctor_set_uint8(x_21, sizeof(void*)*1, x_18);
-x_22 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_22, 0, x_11);
-lean_ctor_set(x_22, 1, x_21);
-lean_ctor_set(x_22, 2, x_13);
-lean_ctor_set(x_22, 3, x_14);
-lean_ctor_set(x_22, 4, x_15);
-lean_ctor_set(x_22, 5, x_16);
-lean_ctor_set(x_22, 6, x_17);
-lean_ctor_set_uint8(x_22, sizeof(void*)*7, x_12);
-return x_22;
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set_uint8(x_20, sizeof(void*)*1, x_17);
+x_21 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_21, 0, x_11);
+lean_ctor_set(x_21, 1, x_20);
+lean_ctor_set(x_21, 2, x_13);
+lean_ctor_set(x_21, 3, x_14);
+lean_ctor_set(x_21, 4, x_15);
+lean_ctor_set(x_21, 5, x_16);
+lean_ctor_set_uint8(x_21, sizeof(void*)*6, x_12);
+return x_21;
 }
 }
 }
@@ -3125,31 +3110,28 @@ return x_1;
 }
 else
 {
-lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get_uint8(x_1, sizeof(void*)*7);
+x_6 = lean_ctor_get_uint8(x_1, sizeof(void*)*6);
 x_7 = lean_ctor_get(x_1, 2);
 x_8 = lean_ctor_get(x_1, 3);
 x_9 = lean_ctor_get(x_1, 4);
 x_10 = lean_ctor_get(x_1, 5);
-x_11 = lean_ctor_get(x_1, 6);
-lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_5);
 lean_dec(x_1);
-x_12 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_12, 0, x_5);
-lean_ctor_set(x_12, 1, x_2);
-lean_ctor_set(x_12, 2, x_7);
-lean_ctor_set(x_12, 3, x_8);
-lean_ctor_set(x_12, 4, x_9);
-lean_ctor_set(x_12, 5, x_10);
-lean_ctor_set(x_12, 6, x_11);
-lean_ctor_set_uint8(x_12, sizeof(void*)*7, x_6);
-return x_12;
+x_11 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_11, 0, x_5);
+lean_ctor_set(x_11, 1, x_2);
+lean_ctor_set(x_11, 2, x_7);
+lean_ctor_set(x_11, 3, x_8);
+lean_ctor_set(x_11, 4, x_9);
+lean_ctor_set(x_11, 5, x_10);
+lean_ctor_set_uint8(x_11, sizeof(void*)*6, x_6);
+return x_11;
 }
 }
 }
@@ -3269,7 +3251,7 @@ x_1 = 0;
 return x_1;
 }
 }
-LEAN_EXPORT uint8_t l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(uint8_t x_1, uint8_t x_2) {
+LEAN_EXPORT uint8_t l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(uint8_t x_1, uint8_t x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -3281,13 +3263,13 @@ lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555____boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542____boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; uint8_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox(x_1);
 x_4 = lean_unbox(x_2);
-x_5 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(x_3, x_4);
+x_5 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
 }
@@ -3296,7 +3278,7 @@ static lean_object* _init_l_Lean_instBEqConstantKind___closed__0() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555____boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542____boxed), 2, 0);
 return x_1;
 }
 }
@@ -3308,7 +3290,7 @@ x_1 = l_Lean_instBEqConstantKind___closed__0;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3316,17 +3298,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.defn", 22, 22);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3334,17 +3316,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.thm", 21, 21);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3352,17 +3334,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.axiom", 23, 23);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3370,17 +3352,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.opaque", 24, 24);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3388,17 +3370,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.quot", 22, 22);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3406,17 +3388,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.induct", 24, 24);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3424,17 +3406,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.ctor", 22, 22);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; 
@@ -3442,17 +3424,17 @@ x_1 = lean_mk_string_unchecked("Lean.ConstantKind.recursor", 26, 26);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1573_() {
+static lean_object* _init_l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1560_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1573_;
+x_1 = l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1560_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(uint8_t x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(uint8_t x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_10; lean_object* x_17; lean_object* x_24; lean_object* x_31; lean_object* x_38; lean_object* x_45; lean_object* x_52; 
@@ -3621,7 +3603,7 @@ goto block_58;
 block_9:
 {
 lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; 
-x_4 = l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1573_;
+x_4 = l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1560_;
 x_5 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_5, 0, x_3);
 lean_ctor_set(x_5, 1, x_4);
@@ -3635,7 +3617,7 @@ return x_8;
 block_16:
 {
 lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; 
-x_11 = l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1573_;
+x_11 = l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1560_;
 x_12 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
@@ -3649,7 +3631,7 @@ return x_15;
 block_23:
 {
 lean_object* x_18; lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; 
-x_18 = l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1573_;
+x_18 = l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1560_;
 x_19 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_19, 0, x_17);
 lean_ctor_set(x_19, 1, x_18);
@@ -3663,7 +3645,7 @@ return x_22;
 block_30:
 {
 lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; 
-x_25 = l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1573_;
+x_25 = l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1560_;
 x_26 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_26, 0, x_24);
 lean_ctor_set(x_26, 1, x_25);
@@ -3677,7 +3659,7 @@ return x_29;
 block_37:
 {
 lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; 
-x_32 = l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1573_;
+x_32 = l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1560_;
 x_33 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_33, 0, x_31);
 lean_ctor_set(x_33, 1, x_32);
@@ -3691,7 +3673,7 @@ return x_36;
 block_44:
 {
 lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; 
-x_39 = l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1573_;
+x_39 = l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1560_;
 x_40 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_40, 0, x_38);
 lean_ctor_set(x_40, 1, x_39);
@@ -3705,7 +3687,7 @@ return x_43;
 block_51:
 {
 lean_object* x_46; lean_object* x_47; uint8_t x_48; lean_object* x_49; lean_object* x_50; 
-x_46 = l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1573_;
+x_46 = l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1560_;
 x_47 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_47, 0, x_45);
 lean_ctor_set(x_47, 1, x_46);
@@ -3719,7 +3701,7 @@ return x_50;
 block_58:
 {
 lean_object* x_53; lean_object* x_54; uint8_t x_55; lean_object* x_56; lean_object* x_57; 
-x_53 = l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1573_;
+x_53 = l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1560_;
 x_54 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_54, 0, x_52);
 lean_ctor_set(x_54, 1, x_53);
@@ -3732,12 +3714,12 @@ return x_57;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573____boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560____boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
 x_3 = lean_unbox(x_1);
-x_4 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(x_3, x_2);
+x_4 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(x_3, x_2);
 lean_dec(x_2);
 return x_4;
 }
@@ -3746,7 +3728,7 @@ static lean_object* _init_l_Lean_instReprConstantKind___closed__0() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573____boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560____boxed), 2, 0);
 return x_1;
 }
 }
@@ -4054,7 +4036,7 @@ x_1 = l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts___closed__1;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; 
@@ -4062,27 +4044,27 @@ x_1 = lean_mk_string_unchecked("_private", 8, 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2222_;
+x_1 = l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2209_;
 x_2 = lean_box(0);
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_initFn___closed__5____x40_Lean_Environment___hyg_6_;
-x_2 = l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2222_;
+x_2 = l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2209_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; 
@@ -4090,37 +4072,37 @@ x_1 = lean_mk_string_unchecked("Environment", 11, 11);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2222_;
-x_2 = l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2222_;
+x_1 = l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2209_;
+x_2 = l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2209_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_unsigned_to_nat(0u);
-x_2 = l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2222_;
+x_2 = l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2209_;
 x_3 = l_Lean_Name_num___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_initFn___closed__5____x40_Lean_Environment___hyg_6_;
-x_2 = l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2222_;
+x_2 = l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2209_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; 
@@ -4128,21 +4110,21 @@ x_1 = lean_mk_string_unchecked("AsyncConsts", 11, 11);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2222_;
-x_2 = l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2222_;
+x_1 = l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2209_;
+x_2 = l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2209_;
 x_3 = l_Lean_Name_str___override(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_instImpl____x40_Lean_Environment___hyg_2222_() {
+static lean_object* _init_l_Lean_instImpl____x40_Lean_Environment___hyg_2209_() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2222_;
+x_1 = l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2209_;
 return x_1;
 }
 }
@@ -4150,7 +4132,7 @@ static lean_object* _init_l_Lean_instTypeNameAsyncConsts() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_1 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 return x_1;
 }
 }
@@ -4291,7 +4273,7 @@ lean_dec_ref(x_28);
 x_30 = lean_alloc_closure((void*)(l___private_Lean_Environment_0__Lean_AsyncConsts_add___lam__0___boxed), 1, 0);
 x_31 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_32 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__1;
-x_33 = lean_unsigned_to_nat(464u);
+x_33 = lean_unsigned_to_nat(458u);
 x_34 = lean_unsigned_to_nat(4u);
 x_35 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__2;
 x_36 = 1;
@@ -4409,7 +4391,7 @@ if (x_8 == 0)
 {
 lean_object* x_9; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
 lean_dec_ref(x_3);
-x_9 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_9 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_16 = l_Lean_privateToUserName(x_7);
 lean_inc(x_2);
 x_17 = l_Lean_privateToUserName(x_2);
@@ -4533,7 +4515,7 @@ if (x_9 == 0)
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14; 
 lean_dec_ref(x_3);
-x_10 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_10 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_11 = lean_alloc_closure((void*)(l___private_Lean_Environment_0__Lean_AsyncConsts_findRecTask___lam__0___boxed), 3, 2);
 lean_closure_set(x_11, 0, x_10);
 lean_closure_set(x_11, 1, x_2);
@@ -4780,7 +4762,7 @@ _start:
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_2 = lean_ctor_get(x_1, 0);
 x_3 = lean_ctor_get(x_2, 0);
-x_4 = lean_ctor_get(x_3, 6);
+x_4 = lean_ctor_get(x_3, 5);
 lean_inc_ref(x_4);
 return x_4;
 }
@@ -5592,7 +5574,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1___redArg___closed__1;
 x_2 = lean_unsigned_to_nat(47u);
-x_3 = lean_unsigned_to_nat(720u);
+x_3 = lean_unsigned_to_nat(714u);
 x_4 = l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1___redArg___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -6026,7 +6008,7 @@ _start:
 lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_12; 
 x_6 = lean_ctor_get(x_1, 4);
 lean_inc(x_6);
-x_7 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_7 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 if (lean_obj_tag(x_6) == 0)
 {
 x_12 = x_1;
@@ -6307,7 +6289,7 @@ if (x_7 == 0)
 {
 lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_8 = lean_ctor_get(x_6, 3);
-x_9 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_9 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_10 = lean_alloc_closure((void*)(l___private_Lean_Environment_0__Lean_Environment_lakeAdd___lam__0), 3, 2);
 lean_closure_set(x_10, 0, x_2);
 lean_closure_set(x_10, 1, x_9);
@@ -6336,7 +6318,7 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_dec(x_6);
-x_21 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_21 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_22 = lean_alloc_closure((void*)(l___private_Lean_Environment_0__Lean_Environment_lakeAdd___lam__0), 3, 2);
 lean_closure_set(x_22, 0, x_2);
 lean_closure_set(x_22, 1, x_21);
@@ -7281,7 +7263,7 @@ x_8 = l_Lean_Environment_addDeclCore___closed__0;
 x_9 = 1;
 x_10 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_11 = l_Lean_Environment_enableRealizationsForConst___closed__0;
-x_12 = lean_unsigned_to_nat(859u);
+x_12 = lean_unsigned_to_nat(853u);
 x_13 = lean_unsigned_to_nat(4u);
 x_14 = l_Lean_Environment_enableRealizationsForConst___closed__1;
 x_15 = l_Lean_Name_toString(x_3, x_9, x_8);
@@ -7367,7 +7349,7 @@ lean_closure_set(x_55, 0, x_54);
 x_56 = 1;
 x_57 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_58 = l_Lean_Environment_enableRealizationsForConst___closed__0;
-x_59 = lean_unsigned_to_nat(863u);
+x_59 = lean_unsigned_to_nat(857u);
 x_60 = lean_unsigned_to_nat(6u);
 lean_inc_ref(x_55);
 x_61 = l_Lean_Name_toString(x_3, x_56, x_55);
@@ -9359,7 +9341,7 @@ x_23 = lean_unsigned_to_nat(0u);
 x_24 = l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__8(x_17, x_23);
 x_25 = lean_unsigned_to_nat(120u);
 x_26 = lean_format_pretty(x_24, x_25, x_23, x_23);
-x_27 = lean_string_append(x_16, x_26);
+x_27 = lean_string_append(x_14, x_26);
 lean_dec_ref(x_26);
 x_28 = l_Lean_Environment_dbgFormatAsyncState___closed__0;
 x_29 = lean_string_append(x_27, x_28);
@@ -9378,7 +9360,7 @@ x_40 = lean_string_append(x_37, x_39);
 lean_dec_ref(x_39);
 x_41 = l_Lean_Environment_dbgFormatAsyncState___closed__2;
 x_42 = lean_string_append(x_40, x_41);
-x_43 = l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__17(x_14, x_23);
+x_43 = l_Option_repr___at___Lean_Environment_dbgFormatAsyncState_spec__17(x_16, x_23);
 x_44 = lean_format_pretty(x_43, x_25, x_23, x_23);
 x_45 = lean_string_append(x_42, x_44);
 lean_dec_ref(x_44);
@@ -9408,9 +9390,9 @@ if (lean_obj_tag(x_4) == 0)
 {
 lean_object* x_58; 
 x_58 = lean_box(0);
-x_14 = x_55;
+x_14 = x_57;
 x_15 = x_56;
-x_16 = x_57;
+x_16 = x_55;
 x_17 = x_58;
 goto block_54;
 }
@@ -9426,9 +9408,9 @@ x_61 = lean_ctor_get(x_60, 0);
 lean_inc(x_61);
 lean_dec(x_60);
 lean_ctor_set(x_4, 0, x_61);
-x_14 = x_55;
+x_14 = x_57;
 x_15 = x_56;
-x_16 = x_57;
+x_16 = x_55;
 x_17 = x_4;
 goto block_54;
 }
@@ -9443,9 +9425,9 @@ lean_inc(x_63);
 lean_dec(x_62);
 x_64 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_64, 0, x_63);
-x_14 = x_55;
+x_14 = x_57;
 x_15 = x_56;
-x_16 = x_57;
+x_16 = x_55;
 x_17 = x_64;
 goto block_54;
 }
@@ -9963,7 +9945,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Environment_PromiseCheckedResult_commitChecked___closed__1;
 x_2 = lean_unsigned_to_nat(2u);
-x_3 = lean_unsigned_to_nat(941u);
+x_3 = lean_unsigned_to_nat(935u);
 x_4 = l_Lean_Environment_PromiseCheckedResult_commitChecked___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -10243,10 +10225,10 @@ lean_dec_ref(x_6);
 lean_dec(x_1);
 x_21 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_22 = l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__15;
-x_23 = lean_unsigned_to_nat(997u);
+x_23 = lean_unsigned_to_nat(991u);
 x_24 = lean_unsigned_to_nat(11u);
 x_25 = l___private_Lean_Environment_0__Lean_Environment_mkFallbackConstInfo___closed__16;
-x_26 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(x_2, x_4);
+x_26 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(x_2, x_4);
 x_27 = lean_unsigned_to_nat(120u);
 x_28 = lean_format_pretty(x_26, x_27, x_4, x_4);
 x_29 = lean_string_append(x_25, x_28);
@@ -10486,7 +10468,7 @@ return x_6;
 LEAN_EXPORT lean_object* l_Lean_Environment_addConstAsync(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, uint8_t x_5, uint8_t x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_89; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_89; 
 x_8 = lean_box(x_3);
 lean_inc(x_2);
 x_9 = lean_alloc_closure((void*)(l_Lean_Environment_addConstAsync___lam__0___boxed), 3, 2);
@@ -10506,7 +10488,7 @@ lean_closure_set(x_13, 0, x_1);
 lean_inc_ref(x_1);
 x_62 = lean_alloc_closure((void*)(l_Lean_Environment_addConstAsync___lam__4___boxed), 2, 1);
 lean_closure_set(x_62, 0, x_1);
-x_63 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_63 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_64 = lean_alloc_closure((void*)(l_Lean_Environment_addConstAsync___lam__5), 2, 1);
 lean_closure_set(x_64, 0, x_63);
 x_65 = lean_alloc_closure((void*)(l_Lean_Environment_addConstAsync___lam__6), 2, 1);
@@ -10678,20 +10660,20 @@ block_37:
 {
 lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_16);
+lean_ctor_set(x_30, 0, x_19);
 lean_ctor_set(x_30, 1, x_29);
-x_31 = lean_io_promise_result_opt(x_25);
-x_32 = lean_task_bind(x_31, x_13, x_27, x_26);
+x_31 = lean_io_promise_result_opt(x_15);
+x_32 = lean_task_bind(x_31, x_13, x_25, x_23);
 x_33 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_33, 0, x_19);
-lean_ctor_set(x_33, 1, x_23);
-lean_ctor_set(x_33, 2, x_28);
+lean_ctor_set(x_33, 0, x_26);
+lean_ctor_set(x_33, 1, x_16);
+lean_ctor_set(x_33, 2, x_27);
 lean_ctor_set(x_33, 3, x_30);
-lean_ctor_set(x_33, 4, x_20);
-lean_ctor_set(x_33, 5, x_22);
-lean_ctor_set(x_33, 6, x_15);
+lean_ctor_set(x_33, 4, x_21);
+lean_ctor_set(x_33, 5, x_14);
+lean_ctor_set(x_33, 6, x_22);
 lean_ctor_set(x_33, 7, x_32);
-lean_ctor_set_uint8(x_33, sizeof(void*)*8, x_14);
+lean_ctor_set_uint8(x_33, sizeof(void*)*8, x_18);
 lean_inc(x_2);
 x_34 = l___private_Lean_Environment_0__Lean_Environment_enterAsync(x_2, x_1);
 x_35 = lean_alloc_ctor(0, 8, 1);
@@ -10699,14 +10681,14 @@ lean_ctor_set(x_35, 0, x_33);
 lean_ctor_set(x_35, 1, x_34);
 lean_ctor_set(x_35, 2, x_2);
 lean_ctor_set(x_35, 3, x_4);
-lean_ctor_set(x_35, 4, x_17);
-lean_ctor_set(x_35, 5, x_18);
-lean_ctor_set(x_35, 6, x_24);
-lean_ctor_set(x_35, 7, x_25);
+lean_ctor_set(x_35, 4, x_20);
+lean_ctor_set(x_35, 5, x_24);
+lean_ctor_set(x_35, 6, x_17);
+lean_ctor_set(x_35, 7, x_15);
 lean_ctor_set_uint8(x_35, sizeof(void*)*8, x_3);
 x_36 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_21);
+lean_ctor_set(x_36, 1, x_28);
 return x_36;
 }
 block_61:
@@ -10730,27 +10712,27 @@ lean_inc(x_54);
 x_55 = lean_ctor_get(x_47, 1);
 lean_inc(x_55);
 lean_dec_ref(x_47);
-x_56 = lean_io_promise_result_opt(x_42);
-lean_inc(x_43);
-x_57 = lean_task_bind(x_56, x_12, x_43, x_41);
+x_56 = lean_io_promise_result_opt(x_43);
+lean_inc(x_40);
+x_57 = lean_task_bind(x_56, x_12, x_40, x_38);
 x_58 = l___private_Lean_Environment_0__Lean_AsyncConsts_add(x_54, x_45);
 if (lean_obj_tag(x_46) == 0)
 {
-x_14 = x_53;
-x_15 = x_52;
-x_16 = x_58;
-x_17 = x_44;
-x_18 = x_38;
-x_19 = x_48;
-x_20 = x_50;
-x_21 = x_39;
-x_22 = x_51;
-x_23 = x_49;
-x_24 = x_42;
+x_14 = x_51;
+x_15 = x_41;
+x_16 = x_49;
+x_17 = x_43;
+x_18 = x_53;
+x_19 = x_58;
+x_20 = x_44;
+x_21 = x_50;
+x_22 = x_52;
+x_23 = x_38;
+x_24 = x_39;
 x_25 = x_40;
-x_26 = x_41;
-x_27 = x_43;
-x_28 = x_57;
+x_26 = x_48;
+x_27 = x_57;
+x_28 = x_42;
 x_29 = x_55;
 goto block_37;
 }
@@ -10761,21 +10743,21 @@ x_59 = lean_ctor_get(x_46, 0);
 lean_inc(x_59);
 lean_dec_ref(x_46);
 x_60 = l___private_Lean_Environment_0__Lean_AsyncConsts_add(x_55, x_59);
-x_14 = x_53;
-x_15 = x_52;
-x_16 = x_58;
-x_17 = x_44;
-x_18 = x_38;
-x_19 = x_48;
-x_20 = x_50;
-x_21 = x_39;
-x_22 = x_51;
-x_23 = x_49;
-x_24 = x_42;
+x_14 = x_51;
+x_15 = x_41;
+x_16 = x_49;
+x_17 = x_43;
+x_18 = x_53;
+x_19 = x_58;
+x_20 = x_44;
+x_21 = x_50;
+x_22 = x_52;
+x_23 = x_38;
+x_24 = x_39;
 x_25 = x_40;
-x_26 = x_41;
-x_27 = x_43;
-x_28 = x_57;
+x_26 = x_48;
+x_27 = x_57;
+x_28 = x_42;
 x_29 = x_60;
 goto block_37;
 }
@@ -10783,27 +10765,27 @@ goto block_37;
 block_88:
 {
 lean_object* x_77; lean_object* x_78; 
-lean_inc(x_74);
-lean_inc_ref(x_69);
-x_77 = lean_task_map(x_65, x_69, x_74, x_73);
+lean_inc(x_68);
+lean_inc_ref(x_73);
+x_77 = lean_task_map(x_65, x_73, x_68, x_66);
 lean_inc(x_76);
 x_78 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_78, 0, x_68);
+lean_ctor_set(x_78, 0, x_71);
 lean_ctor_set(x_78, 1, x_76);
 lean_ctor_set(x_78, 2, x_77);
 if (lean_obj_tag(x_4) == 0)
 {
 lean_object* x_79; 
 lean_dec(x_76);
+lean_dec_ref(x_73);
 lean_dec_ref(x_70);
-lean_dec_ref(x_69);
 lean_dec_ref(x_64);
 x_79 = lean_box(0);
 x_38 = x_66;
 x_39 = x_67;
-x_40 = x_72;
-x_41 = x_73;
-x_42 = x_71;
+x_40 = x_68;
+x_41 = x_69;
+x_42 = x_72;
 x_43 = x_74;
 x_44 = x_75;
 x_45 = x_78;
@@ -10820,9 +10802,9 @@ lean_inc(x_2);
 x_81 = lean_alloc_closure((void*)(l_Lean_Environment_addConstAsync___lam__7___boxed), 3, 2);
 lean_closure_set(x_81, 0, x_2);
 lean_closure_set(x_81, 1, x_80);
-lean_inc(x_74);
-lean_inc_ref(x_69);
-x_82 = lean_task_map(x_81, x_69, x_74, x_73);
+lean_inc(x_68);
+lean_inc_ref(x_73);
+x_82 = lean_task_map(x_81, x_73, x_68, x_66);
 lean_inc(x_2);
 x_83 = lean_alloc_ctor(0, 3, 1);
 lean_ctor_set(x_83, 0, x_2);
@@ -10831,8 +10813,8 @@ lean_ctor_set(x_83, 2, x_82);
 x_84 = lean_unbox(x_80);
 lean_dec(x_80);
 lean_ctor_set_uint8(x_83, sizeof(void*)*3, x_84);
-lean_inc(x_74);
-x_85 = lean_task_map(x_64, x_69, x_74, x_73);
+lean_inc(x_68);
+x_85 = lean_task_map(x_64, x_73, x_68, x_66);
 x_86 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_86, 0, x_83);
 lean_ctor_set(x_86, 1, x_76);
@@ -10841,9 +10823,9 @@ x_87 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_87, 0, x_86);
 x_38 = x_66;
 x_39 = x_67;
-x_40 = x_72;
-x_41 = x_73;
-x_42 = x_71;
+x_40 = x_68;
+x_41 = x_69;
+x_42 = x_72;
 x_43 = x_74;
 x_44 = x_75;
 x_45 = x_78;
@@ -10897,15 +10879,15 @@ if (x_5 == 0)
 lean_object* x_109; 
 lean_dec_ref(x_62);
 x_109 = lean_box(0);
-x_66 = x_94;
-x_67 = x_101;
-x_68 = x_108;
-x_69 = x_106;
+x_66 = x_104;
+x_67 = x_94;
+x_68 = x_103;
+x_69 = x_97;
 x_70 = x_105;
-x_71 = x_100;
-x_72 = x_97;
-x_73 = x_104;
-x_74 = x_103;
+x_71 = x_108;
+x_72 = x_101;
+x_73 = x_106;
+x_74 = x_100;
 x_75 = x_91;
 x_76 = x_109;
 goto block_88;
@@ -10917,15 +10899,15 @@ lean_inc_ref(x_106);
 x_110 = lean_task_map(x_62, x_106, x_103, x_104);
 x_111 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_111, 0, x_110);
-x_66 = x_94;
-x_67 = x_101;
-x_68 = x_108;
-x_69 = x_106;
+x_66 = x_104;
+x_67 = x_94;
+x_68 = x_103;
+x_69 = x_97;
 x_70 = x_105;
-x_71 = x_100;
-x_72 = x_97;
-x_73 = x_104;
-x_74 = x_103;
+x_71 = x_108;
+x_72 = x_101;
+x_73 = x_106;
+x_74 = x_100;
 x_75 = x_91;
 x_76 = x_111;
 goto block_88;
@@ -11300,11 +11282,11 @@ x_13 = lean_ctor_get(x_11, 3);
 lean_inc_ref(x_13);
 lean_dec(x_11);
 x_14 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_14, 0, x_7);
+lean_ctor_set(x_14, 0, x_6);
 lean_ctor_set(x_14, 1, x_9);
 lean_ctor_set(x_14, 2, x_13);
 lean_ctor_set(x_14, 3, x_12);
-x_15 = lean_io_promise_resolve(x_14, x_8, x_6);
+x_15 = lean_io_promise_resolve(x_14, x_8, x_7);
 lean_dec(x_8);
 x_16 = !lean_is_exclusive(x_15);
 if (x_16 == 0)
@@ -11353,7 +11335,7 @@ x_32 = lean_ctor_get(x_1, 5);
 lean_inc(x_32);
 lean_dec_ref(x_1);
 x_33 = l_Lean_ConstantKind_ofConstantInfo(x_21);
-x_34 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(x_29, x_33);
+x_34 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(x_29, x_33);
 if (x_34 == 0)
 {
 lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
@@ -11367,14 +11349,14 @@ lean_dec(x_4);
 lean_dec_ref(x_2);
 x_35 = l_Lean_Environment_AddConstAsyncResult_commitConst___closed__0;
 x_36 = lean_unsigned_to_nat(0u);
-x_37 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(x_33, x_36);
+x_37 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(x_33, x_36);
 x_38 = lean_unsigned_to_nat(120u);
 x_39 = lean_format_pretty(x_37, x_38, x_36, x_36);
 x_40 = lean_string_append(x_35, x_39);
 lean_dec_ref(x_39);
 x_41 = l_Lean_Environment_AddConstAsyncResult_commitSignature___closed__1;
 x_42 = lean_string_append(x_40, x_41);
-x_43 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(x_29, x_36);
+x_43 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(x_29, x_36);
 x_44 = lean_format_pretty(x_43, x_38, x_36, x_36);
 x_45 = lean_string_append(x_42, x_44);
 lean_dec_ref(x_44);
@@ -11469,8 +11451,8 @@ if (lean_obj_tag(x_30) == 0)
 {
 lean_dec(x_28);
 lean_inc_ref(x_21);
-x_6 = x_26;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_26;
 x_8 = x_32;
 x_9 = x_21;
 goto block_20;
@@ -11486,8 +11468,8 @@ x_73 = l_Lean_Environment_find_x3f(x_72, x_28, x_71);
 if (lean_obj_tag(x_73) == 0)
 {
 lean_inc_ref(x_21);
-x_6 = x_26;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_26;
 x_8 = x_32;
 x_9 = x_21;
 goto block_20;
@@ -11498,8 +11480,8 @@ lean_object* x_74;
 x_74 = lean_ctor_get(x_73, 0);
 lean_inc(x_74);
 lean_dec_ref(x_73);
-x_6 = x_26;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_26;
 x_8 = x_32;
 x_9 = x_74;
 goto block_20;
@@ -11533,8 +11515,8 @@ return x_24;
 else
 {
 lean_free_object(x_24);
-x_6 = x_26;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_26;
 x_8 = x_32;
 x_9 = x_75;
 goto block_20;
@@ -11561,7 +11543,7 @@ x_84 = lean_ctor_get(x_1, 5);
 lean_inc(x_84);
 lean_dec_ref(x_1);
 x_85 = l_Lean_ConstantKind_ofConstantInfo(x_21);
-x_86 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(x_81, x_85);
+x_86 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(x_81, x_85);
 if (x_86 == 0)
 {
 lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
@@ -11575,14 +11557,14 @@ lean_dec(x_4);
 lean_dec_ref(x_2);
 x_87 = l_Lean_Environment_AddConstAsyncResult_commitConst___closed__0;
 x_88 = lean_unsigned_to_nat(0u);
-x_89 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(x_85, x_88);
+x_89 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(x_85, x_88);
 x_90 = lean_unsigned_to_nat(120u);
 x_91 = lean_format_pretty(x_89, x_90, x_88, x_88);
 x_92 = lean_string_append(x_87, x_91);
 lean_dec_ref(x_91);
 x_93 = l_Lean_Environment_AddConstAsyncResult_commitSignature___closed__1;
 x_94 = lean_string_append(x_92, x_93);
-x_95 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1573_(x_81, x_88);
+x_95 = l_Lean_reprConstantKind____x40_Lean_Environment___hyg_1560_(x_81, x_88);
 x_96 = lean_format_pretty(x_95, x_90, x_88, x_88);
 x_97 = lean_string_append(x_94, x_96);
 lean_dec_ref(x_96);
@@ -11679,8 +11661,8 @@ if (lean_obj_tag(x_82) == 0)
 {
 lean_dec(x_80);
 lean_inc_ref(x_21);
-x_6 = x_79;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_79;
 x_8 = x_84;
 x_9 = x_21;
 goto block_20;
@@ -11696,8 +11678,8 @@ x_128 = l_Lean_Environment_find_x3f(x_127, x_80, x_126);
 if (lean_obj_tag(x_128) == 0)
 {
 lean_inc_ref(x_21);
-x_6 = x_79;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_79;
 x_8 = x_84;
 x_9 = x_21;
 goto block_20;
@@ -11708,8 +11690,8 @@ lean_object* x_129;
 x_129 = lean_ctor_get(x_128, 0);
 lean_inc(x_129);
 lean_dec_ref(x_128);
-x_6 = x_79;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_79;
 x_8 = x_84;
 x_9 = x_129;
 goto block_20;
@@ -11743,8 +11725,8 @@ return x_134;
 }
 else
 {
-x_6 = x_79;
-x_7 = x_21;
+x_6 = x_21;
+x_7 = x_79;
 x_8 = x_84;
 x_9 = x_130;
 goto block_20;
@@ -12283,76 +12265,6 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Environment_addExtraName___lam__0(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_ctor_get(x_2, 5);
-x_5 = l_Lean_NameSet_insert(x_4, x_1);
-lean_ctor_set(x_2, 5, x_5);
-return x_2;
-}
-else
-{
-lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_6 = lean_ctor_get(x_2, 0);
-x_7 = lean_ctor_get_uint8(x_2, sizeof(void*)*7);
-x_8 = lean_ctor_get(x_2, 1);
-x_9 = lean_ctor_get(x_2, 2);
-x_10 = lean_ctor_get(x_2, 3);
-x_11 = lean_ctor_get(x_2, 4);
-x_12 = lean_ctor_get(x_2, 5);
-x_13 = lean_ctor_get(x_2, 6);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_6);
-lean_dec(x_2);
-x_14 = l_Lean_NameSet_insert(x_12, x_1);
-x_15 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_15, 0, x_6);
-lean_ctor_set(x_15, 1, x_8);
-lean_ctor_set(x_15, 2, x_9);
-lean_ctor_set(x_15, 3, x_10);
-lean_ctor_set(x_15, 4, x_11);
-lean_ctor_set(x_15, 5, x_14);
-lean_ctor_set(x_15, 6, x_13);
-lean_ctor_set_uint8(x_15, sizeof(void*)*7, x_7);
-return x_15;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Environment_addExtraName(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; uint8_t x_5; 
-x_3 = 1;
-lean_inc_ref(x_1);
-x_4 = l_Lean_Environment_setExporting(x_1, x_3);
-lean_inc(x_2);
-x_5 = l_Lean_Environment_contains(x_4, x_2, x_3);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; 
-x_6 = lean_alloc_closure((void*)(l_Lean_Environment_addExtraName___lam__0), 2, 1);
-lean_closure_set(x_6, 0, x_2);
-x_7 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_1, x_6);
-return x_7;
-}
-else
-{
-lean_dec(x_2);
-return x_1;
-}
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Environment_setMainModule_unsafe__1(lean_object* x_1) {
 _start:
 {
@@ -12377,7 +12289,7 @@ x_3 = !lean_is_exclusive(x_2);
 if (x_3 == 0)
 {
 lean_object* x_4; uint8_t x_5; 
-x_4 = lean_ctor_get(x_2, 6);
+x_4 = lean_ctor_get(x_2, 5);
 x_5 = !lean_is_exclusive(x_4);
 if (x_5 == 0)
 {
@@ -12409,72 +12321,69 @@ lean_ctor_set(x_13, 3, x_11);
 lean_ctor_set(x_13, 4, x_12);
 lean_ctor_set_uint32(x_13, sizeof(void*)*5, x_7);
 lean_ctor_set_uint8(x_13, sizeof(void*)*5 + 4, x_8);
-lean_ctor_set(x_2, 6, x_13);
+lean_ctor_set(x_2, 5, x_13);
 return x_2;
 }
 }
 else
 {
-lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint32_t x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_14 = lean_ctor_get(x_2, 6);
+lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint32_t x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_14 = lean_ctor_get(x_2, 5);
 x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get_uint8(x_2, sizeof(void*)*7);
+x_16 = lean_ctor_get_uint8(x_2, sizeof(void*)*6);
 x_17 = lean_ctor_get(x_2, 1);
 x_18 = lean_ctor_get(x_2, 2);
 x_19 = lean_ctor_get(x_2, 3);
 x_20 = lean_ctor_get(x_2, 4);
-x_21 = lean_ctor_get(x_2, 5);
 lean_inc(x_14);
-lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_15);
 lean_dec(x_2);
-x_22 = lean_ctor_get_uint32(x_14, sizeof(void*)*5);
-x_23 = lean_ctor_get_uint8(x_14, sizeof(void*)*5 + 4);
-x_24 = lean_ctor_get(x_14, 1);
+x_21 = lean_ctor_get_uint32(x_14, sizeof(void*)*5);
+x_22 = lean_ctor_get_uint8(x_14, sizeof(void*)*5 + 4);
+x_23 = lean_ctor_get(x_14, 1);
+lean_inc_ref(x_23);
+x_24 = lean_ctor_get(x_14, 2);
 lean_inc_ref(x_24);
-x_25 = lean_ctor_get(x_14, 2);
+x_25 = lean_ctor_get(x_14, 3);
 lean_inc_ref(x_25);
-x_26 = lean_ctor_get(x_14, 3);
+x_26 = lean_ctor_get(x_14, 4);
 lean_inc_ref(x_26);
-x_27 = lean_ctor_get(x_14, 4);
-lean_inc_ref(x_27);
 if (lean_is_exclusive(x_14)) {
  lean_ctor_release(x_14, 0);
  lean_ctor_release(x_14, 1);
  lean_ctor_release(x_14, 2);
  lean_ctor_release(x_14, 3);
  lean_ctor_release(x_14, 4);
- x_28 = x_14;
+ x_27 = x_14;
 } else {
  lean_dec_ref(x_14);
- x_28 = lean_box(0);
+ x_27 = lean_box(0);
 }
-if (lean_is_scalar(x_28)) {
- x_29 = lean_alloc_ctor(0, 5, 5);
+if (lean_is_scalar(x_27)) {
+ x_28 = lean_alloc_ctor(0, 5, 5);
 } else {
- x_29 = x_28;
+ x_28 = x_27;
 }
-lean_ctor_set(x_29, 0, x_1);
-lean_ctor_set(x_29, 1, x_24);
-lean_ctor_set(x_29, 2, x_25);
-lean_ctor_set(x_29, 3, x_26);
-lean_ctor_set(x_29, 4, x_27);
-lean_ctor_set_uint32(x_29, sizeof(void*)*5, x_22);
-lean_ctor_set_uint8(x_29, sizeof(void*)*5 + 4, x_23);
-x_30 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_30, 0, x_15);
-lean_ctor_set(x_30, 1, x_17);
-lean_ctor_set(x_30, 2, x_18);
-lean_ctor_set(x_30, 3, x_19);
-lean_ctor_set(x_30, 4, x_20);
-lean_ctor_set(x_30, 5, x_21);
-lean_ctor_set(x_30, 6, x_29);
-lean_ctor_set_uint8(x_30, sizeof(void*)*7, x_16);
-return x_30;
+lean_ctor_set(x_28, 0, x_1);
+lean_ctor_set(x_28, 1, x_23);
+lean_ctor_set(x_28, 2, x_24);
+lean_ctor_set(x_28, 3, x_25);
+lean_ctor_set(x_28, 4, x_26);
+lean_ctor_set_uint32(x_28, sizeof(void*)*5, x_21);
+lean_ctor_set_uint8(x_28, sizeof(void*)*5 + 4, x_22);
+x_29 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_29, 0, x_15);
+lean_ctor_set(x_29, 1, x_17);
+lean_ctor_set(x_29, 2, x_18);
+lean_ctor_set(x_29, 3, x_19);
+lean_ctor_set(x_29, 4, x_20);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set_uint8(x_29, sizeof(void*)*6, x_16);
+return x_29;
 }
 }
 }
@@ -12812,7 +12721,7 @@ lean_dec_ref(x_4);
 x_6 = lean_ctor_get_uint8(x_5, sizeof(void*)*3);
 lean_dec(x_5);
 x_7 = 6;
-x_8 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(x_6, x_7);
+x_8 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(x_6, x_7);
 return x_8;
 }
 }
@@ -13124,7 +13033,7 @@ lean_ctor_set_uint8(x_6, sizeof(void*)*3, x_4);
 return x_6;
 }
 }
-static lean_object* _init_l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7407_() {
+static lean_object* _init_l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7369_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -13133,11 +13042,11 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_initFn____x40_Lean_Environment___hyg_7407_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtension_initFn____x40_Lean_Environment___hyg_7369_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
-x_2 = l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7407_;
+x_2 = l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7369_;
 x_3 = lean_st_mk_ref(x_2, x_1);
 x_4 = !lean_is_exclusive(x_3);
 if (x_4 == 0)
@@ -13358,7 +13267,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Environment_0__Lean_EnvExtension_invalidExtMsg___closed__0;
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(1321u);
+x_3 = lean_unsigned_to_nat(1302u);
 x_4 = l___private_Lean_Environment_0__Lean_EnvExtension_setStateImpl___redArg___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -13429,7 +13338,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Environment_0__Lean_EnvExtension_invalidExtMsg___closed__0;
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(1332u);
+x_3 = lean_unsigned_to_nat(1313u);
 x_4 = l___private_Lean_Environment_0__Lean_EnvExtension_modifyStateImpl___redArg___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -13512,7 +13421,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Environment_0__Lean_EnvExtension_invalidExtMsg___closed__0;
 x_2 = lean_unsigned_to_nat(4u);
-x_3 = lean_unsigned_to_nat(1338u);
+x_3 = lean_unsigned_to_nat(1319u);
 x_4 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateImpl___redArg___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -13791,10 +13700,10 @@ return x_5;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState___redArg___lam__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; uint8_t x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+lean_object* x_4; uint8_t x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
 x_4 = lean_ctor_get(x_3, 0);
 lean_inc_ref(x_4);
-x_5 = lean_ctor_get_uint8(x_3, sizeof(void*)*7);
+x_5 = lean_ctor_get_uint8(x_3, sizeof(void*)*6);
 x_6 = lean_ctor_get(x_3, 1);
 lean_inc_ref(x_6);
 x_7 = lean_ctor_get(x_3, 2);
@@ -13802,46 +13711,41 @@ lean_inc_ref(x_7);
 x_8 = lean_ctor_get(x_3, 4);
 lean_inc_ref(x_8);
 x_9 = lean_ctor_get(x_3, 5);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_3, 6);
-lean_inc_ref(x_10);
+lean_inc_ref(x_9);
 lean_inc_ref(x_3);
-x_11 = l_Lean_EnvExtension_modifyState_unsafe__9___redArg(x_1, x_2, x_3);
-x_12 = !lean_is_exclusive(x_3);
-if (x_12 == 0)
+x_10 = l_Lean_EnvExtension_modifyState_unsafe__9___redArg(x_1, x_2, x_3);
+x_11 = !lean_is_exclusive(x_3);
+if (x_11 == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_13 = lean_ctor_get(x_3, 6);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_12 = lean_ctor_get(x_3, 5);
+lean_dec(x_12);
+x_13 = lean_ctor_get(x_3, 4);
 lean_dec(x_13);
-x_14 = lean_ctor_get(x_3, 5);
+x_14 = lean_ctor_get(x_3, 3);
 lean_dec(x_14);
-x_15 = lean_ctor_get(x_3, 4);
+x_15 = lean_ctor_get(x_3, 2);
 lean_dec(x_15);
-x_16 = lean_ctor_get(x_3, 3);
+x_16 = lean_ctor_get(x_3, 1);
 lean_dec(x_16);
-x_17 = lean_ctor_get(x_3, 2);
+x_17 = lean_ctor_get(x_3, 0);
 lean_dec(x_17);
-x_18 = lean_ctor_get(x_3, 1);
-lean_dec(x_18);
-x_19 = lean_ctor_get(x_3, 0);
-lean_dec(x_19);
-lean_ctor_set(x_3, 3, x_11);
+lean_ctor_set(x_3, 3, x_10);
 return x_3;
 }
 else
 {
-lean_object* x_20; 
+lean_object* x_18; 
 lean_dec(x_3);
-x_20 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_20, 0, x_4);
-lean_ctor_set(x_20, 1, x_6);
-lean_ctor_set(x_20, 2, x_7);
-lean_ctor_set(x_20, 3, x_11);
-lean_ctor_set(x_20, 4, x_8);
-lean_ctor_set(x_20, 5, x_9);
-lean_ctor_set(x_20, 6, x_10);
-lean_ctor_set_uint8(x_20, sizeof(void*)*7, x_5);
-return x_20;
+x_18 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_18, 0, x_4);
+lean_ctor_set(x_18, 1, x_6);
+lean_ctor_set(x_18, 2, x_7);
+lean_ctor_set(x_18, 3, x_10);
+lean_ctor_set(x_18, 4, x_8);
+lean_ctor_set(x_18, 5, x_9);
+lean_ctor_set_uint8(x_18, sizeof(void*)*6, x_5);
+return x_18;
 }
 }
 }
@@ -13987,15 +13891,13 @@ return x_30;
 }
 else
 {
-lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
 x_31 = lean_ctor_get(x_7, 0);
-x_32 = lean_ctor_get_uint8(x_7, sizeof(void*)*7);
+x_32 = lean_ctor_get_uint8(x_7, sizeof(void*)*6);
 x_33 = lean_ctor_get(x_7, 1);
 x_34 = lean_ctor_get(x_7, 2);
 x_35 = lean_ctor_get(x_7, 4);
 x_36 = lean_ctor_get(x_7, 5);
-x_37 = lean_ctor_get(x_7, 6);
-lean_inc(x_37);
 lean_inc(x_36);
 lean_inc(x_35);
 lean_inc(x_34);
@@ -14003,7 +13905,7 @@ lean_inc(x_33);
 lean_inc(x_31);
 lean_dec(x_7);
 lean_inc_ref(x_2);
-x_38 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_3);
+x_37 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_3);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14014,58 +13916,55 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_39 = x_2;
+ x_38 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_39 = lean_box(0);
+ x_38 = lean_box(0);
 }
-x_40 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_40, 0, x_31);
-lean_ctor_set(x_40, 1, x_33);
-lean_ctor_set(x_40, 2, x_34);
-lean_ctor_set(x_40, 3, x_38);
-lean_ctor_set(x_40, 4, x_35);
-lean_ctor_set(x_40, 5, x_36);
-lean_ctor_set(x_40, 6, x_37);
-lean_ctor_set_uint8(x_40, sizeof(void*)*7, x_32);
-lean_ctor_set(x_6, 0, x_40);
-if (lean_is_scalar(x_39)) {
- x_41 = lean_alloc_ctor(0, 8, 1);
+x_39 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_39, 0, x_31);
+lean_ctor_set(x_39, 1, x_33);
+lean_ctor_set(x_39, 2, x_34);
+lean_ctor_set(x_39, 3, x_37);
+lean_ctor_set(x_39, 4, x_35);
+lean_ctor_set(x_39, 5, x_36);
+lean_ctor_set_uint8(x_39, sizeof(void*)*6, x_32);
+lean_ctor_set(x_6, 0, x_39);
+if (lean_is_scalar(x_38)) {
+ x_40 = lean_alloc_ctor(0, 8, 1);
 } else {
- x_41 = x_39;
+ x_40 = x_38;
 }
-lean_ctor_set(x_41, 0, x_6);
-lean_ctor_set(x_41, 1, x_8);
-lean_ctor_set(x_41, 2, x_9);
-lean_ctor_set(x_41, 3, x_10);
-lean_ctor_set(x_41, 4, x_11);
-lean_ctor_set(x_41, 5, x_12);
-lean_ctor_set(x_41, 6, x_13);
-lean_ctor_set(x_41, 7, x_14);
-lean_ctor_set_uint8(x_41, sizeof(void*)*8, x_16);
-return x_41;
+lean_ctor_set(x_40, 0, x_6);
+lean_ctor_set(x_40, 1, x_8);
+lean_ctor_set(x_40, 2, x_9);
+lean_ctor_set(x_40, 3, x_10);
+lean_ctor_set(x_40, 4, x_11);
+lean_ctor_set(x_40, 5, x_12);
+lean_ctor_set(x_40, 6, x_13);
+lean_ctor_set(x_40, 7, x_14);
+lean_ctor_set_uint8(x_40, sizeof(void*)*8, x_16);
+return x_40;
 }
 }
 else
 {
-uint8_t x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_42 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_43 = lean_ctor_get(x_6, 1);
-lean_inc(x_43);
+uint8_t x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_41 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_42 = lean_ctor_get(x_6, 1);
+lean_inc(x_42);
 lean_dec(x_6);
-x_44 = lean_ctor_get(x_7, 0);
-lean_inc_ref(x_44);
-x_45 = lean_ctor_get_uint8(x_7, sizeof(void*)*7);
-x_46 = lean_ctor_get(x_7, 1);
+x_43 = lean_ctor_get(x_7, 0);
+lean_inc_ref(x_43);
+x_44 = lean_ctor_get_uint8(x_7, sizeof(void*)*6);
+x_45 = lean_ctor_get(x_7, 1);
+lean_inc_ref(x_45);
+x_46 = lean_ctor_get(x_7, 2);
 lean_inc_ref(x_46);
-x_47 = lean_ctor_get(x_7, 2);
+x_47 = lean_ctor_get(x_7, 4);
 lean_inc_ref(x_47);
-x_48 = lean_ctor_get(x_7, 4);
+x_48 = lean_ctor_get(x_7, 5);
 lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_7, 5);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_7, 6);
-lean_inc_ref(x_50);
 if (lean_is_exclusive(x_7)) {
  lean_ctor_release(x_7, 0);
  lean_ctor_release(x_7, 1);
@@ -14073,14 +13972,13 @@ if (lean_is_exclusive(x_7)) {
  lean_ctor_release(x_7, 3);
  lean_ctor_release(x_7, 4);
  lean_ctor_release(x_7, 5);
- lean_ctor_release(x_7, 6);
- x_51 = x_7;
+ x_49 = x_7;
 } else {
  lean_dec_ref(x_7);
- x_51 = lean_box(0);
+ x_49 = lean_box(0);
 }
 lean_inc_ref(x_2);
-x_52 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_3);
+x_50 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_3);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14091,144 +13989,141 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_53 = x_2;
+ x_51 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_53 = lean_box(0);
+ x_51 = lean_box(0);
 }
+if (lean_is_scalar(x_49)) {
+ x_52 = lean_alloc_ctor(0, 6, 1);
+} else {
+ x_52 = x_49;
+}
+lean_ctor_set(x_52, 0, x_43);
+lean_ctor_set(x_52, 1, x_45);
+lean_ctor_set(x_52, 2, x_46);
+lean_ctor_set(x_52, 3, x_50);
+lean_ctor_set(x_52, 4, x_47);
+lean_ctor_set(x_52, 5, x_48);
+lean_ctor_set_uint8(x_52, sizeof(void*)*6, x_44);
+x_53 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_42);
 if (lean_is_scalar(x_51)) {
- x_54 = lean_alloc_ctor(0, 7, 1);
+ x_54 = lean_alloc_ctor(0, 8, 1);
 } else {
  x_54 = x_51;
 }
-lean_ctor_set(x_54, 0, x_44);
-lean_ctor_set(x_54, 1, x_46);
-lean_ctor_set(x_54, 2, x_47);
-lean_ctor_set(x_54, 3, x_52);
-lean_ctor_set(x_54, 4, x_48);
-lean_ctor_set(x_54, 5, x_49);
-lean_ctor_set(x_54, 6, x_50);
-lean_ctor_set_uint8(x_54, sizeof(void*)*7, x_45);
-x_55 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_43);
-if (lean_is_scalar(x_53)) {
- x_56 = lean_alloc_ctor(0, 8, 1);
-} else {
- x_56 = x_53;
-}
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_8);
-lean_ctor_set(x_56, 2, x_9);
-lean_ctor_set(x_56, 3, x_10);
-lean_ctor_set(x_56, 4, x_11);
-lean_ctor_set(x_56, 5, x_12);
-lean_ctor_set(x_56, 6, x_13);
-lean_ctor_set(x_56, 7, x_14);
-lean_ctor_set_uint8(x_56, sizeof(void*)*8, x_42);
-return x_56;
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_54, 1, x_8);
+lean_ctor_set(x_54, 2, x_9);
+lean_ctor_set(x_54, 3, x_10);
+lean_ctor_set(x_54, 4, x_11);
+lean_ctor_set(x_54, 5, x_12);
+lean_ctor_set(x_54, 6, x_13);
+lean_ctor_set(x_54, 7, x_14);
+lean_ctor_set_uint8(x_54, sizeof(void*)*8, x_41);
+return x_54;
 }
 }
 case 2:
 {
-lean_object* x_57; 
-x_57 = lean_ctor_get(x_2, 4);
+lean_object* x_55; 
+x_55 = lean_ctor_get(x_2, 4);
+lean_inc(x_55);
+if (lean_obj_tag(x_55) == 0)
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
+x_56 = lean_ctor_get(x_2, 0);
+lean_inc_ref(x_56);
+x_57 = lean_ctor_get(x_56, 0);
 lean_inc(x_57);
-if (lean_obj_tag(x_57) == 0)
-{
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; 
-x_58 = lean_ctor_get(x_2, 0);
+x_58 = lean_ctor_get(x_2, 1);
 lean_inc_ref(x_58);
-x_59 = lean_ctor_get(x_58, 0);
-lean_inc(x_59);
-x_60 = lean_ctor_get(x_2, 1);
+x_59 = lean_ctor_get(x_2, 2);
+lean_inc_ref(x_59);
+x_60 = lean_ctor_get(x_2, 3);
 lean_inc_ref(x_60);
-x_61 = lean_ctor_get(x_2, 2);
-lean_inc_ref(x_61);
-x_62 = lean_ctor_get(x_2, 3);
-lean_inc_ref(x_62);
-x_63 = lean_ctor_get(x_2, 5);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_2, 6);
-lean_inc(x_64);
-x_65 = lean_ctor_get(x_2, 7);
-lean_inc_ref(x_65);
-x_66 = !lean_is_exclusive(x_58);
-if (x_66 == 0)
+x_61 = lean_ctor_get(x_2, 5);
+lean_inc(x_61);
+x_62 = lean_ctor_get(x_2, 6);
+lean_inc(x_62);
+x_63 = lean_ctor_get(x_2, 7);
+lean_inc_ref(x_63);
+x_64 = !lean_is_exclusive(x_56);
+if (x_64 == 0)
 {
-uint8_t x_67; lean_object* x_68; uint8_t x_69; 
-x_67 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_68 = lean_ctor_get(x_58, 0);
+uint8_t x_65; lean_object* x_66; uint8_t x_67; 
+x_65 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_66 = lean_ctor_get(x_56, 0);
+lean_dec(x_66);
+x_67 = !lean_is_exclusive(x_57);
+if (x_67 == 0)
+{
+lean_object* x_68; lean_object* x_69; uint8_t x_70; 
+x_68 = lean_ctor_get(x_57, 3);
 lean_dec(x_68);
-x_69 = !lean_is_exclusive(x_59);
-if (x_69 == 0)
-{
-lean_object* x_70; lean_object* x_71; uint8_t x_72; 
-x_70 = lean_ctor_get(x_59, 3);
-lean_dec(x_70);
 lean_inc_ref(x_2);
-x_71 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_3);
+x_69 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_3);
 lean_dec_ref(x_1);
-x_72 = !lean_is_exclusive(x_2);
-if (x_72 == 0)
+x_70 = !lean_is_exclusive(x_2);
+if (x_70 == 0)
 {
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_73 = lean_ctor_get(x_2, 7);
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_71 = lean_ctor_get(x_2, 7);
+lean_dec(x_71);
+x_72 = lean_ctor_get(x_2, 6);
+lean_dec(x_72);
+x_73 = lean_ctor_get(x_2, 5);
 lean_dec(x_73);
-x_74 = lean_ctor_get(x_2, 6);
+x_74 = lean_ctor_get(x_2, 4);
 lean_dec(x_74);
-x_75 = lean_ctor_get(x_2, 5);
+x_75 = lean_ctor_get(x_2, 3);
 lean_dec(x_75);
-x_76 = lean_ctor_get(x_2, 4);
+x_76 = lean_ctor_get(x_2, 2);
 lean_dec(x_76);
-x_77 = lean_ctor_get(x_2, 3);
+x_77 = lean_ctor_get(x_2, 1);
 lean_dec(x_77);
-x_78 = lean_ctor_get(x_2, 2);
+x_78 = lean_ctor_get(x_2, 0);
 lean_dec(x_78);
-x_79 = lean_ctor_get(x_2, 1);
-lean_dec(x_79);
-x_80 = lean_ctor_get(x_2, 0);
-lean_dec(x_80);
-lean_ctor_set(x_59, 3, x_71);
+lean_ctor_set(x_57, 3, x_69);
 return x_2;
 }
 else
 {
-lean_object* x_81; 
+lean_object* x_79; 
 lean_dec(x_2);
-lean_ctor_set(x_59, 3, x_71);
-x_81 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_81, 0, x_58);
-lean_ctor_set(x_81, 1, x_60);
-lean_ctor_set(x_81, 2, x_61);
-lean_ctor_set(x_81, 3, x_62);
-lean_ctor_set(x_81, 4, x_57);
-lean_ctor_set(x_81, 5, x_63);
-lean_ctor_set(x_81, 6, x_64);
-lean_ctor_set(x_81, 7, x_65);
-lean_ctor_set_uint8(x_81, sizeof(void*)*8, x_67);
-return x_81;
+lean_ctor_set(x_57, 3, x_69);
+x_79 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_79, 0, x_56);
+lean_ctor_set(x_79, 1, x_58);
+lean_ctor_set(x_79, 2, x_59);
+lean_ctor_set(x_79, 3, x_60);
+lean_ctor_set(x_79, 4, x_55);
+lean_ctor_set(x_79, 5, x_61);
+lean_ctor_set(x_79, 6, x_62);
+lean_ctor_set(x_79, 7, x_63);
+lean_ctor_set_uint8(x_79, sizeof(void*)*8, x_65);
+return x_79;
 }
 }
 else
 {
-lean_object* x_82; uint8_t x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_82 = lean_ctor_get(x_59, 0);
-x_83 = lean_ctor_get_uint8(x_59, sizeof(void*)*7);
-x_84 = lean_ctor_get(x_59, 1);
-x_85 = lean_ctor_get(x_59, 2);
-x_86 = lean_ctor_get(x_59, 4);
-x_87 = lean_ctor_get(x_59, 5);
-x_88 = lean_ctor_get(x_59, 6);
-lean_inc(x_88);
-lean_inc(x_87);
-lean_inc(x_86);
+lean_object* x_80; uint8_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_80 = lean_ctor_get(x_57, 0);
+x_81 = lean_ctor_get_uint8(x_57, sizeof(void*)*6);
+x_82 = lean_ctor_get(x_57, 1);
+x_83 = lean_ctor_get(x_57, 2);
+x_84 = lean_ctor_get(x_57, 4);
+x_85 = lean_ctor_get(x_57, 5);
 lean_inc(x_85);
 lean_inc(x_84);
+lean_inc(x_83);
 lean_inc(x_82);
-lean_dec(x_59);
+lean_inc(x_80);
+lean_dec(x_57);
 lean_inc_ref(x_2);
-x_89 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_3);
+x_86 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_3);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14239,73 +14134,69 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_90 = x_2;
+ x_87 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_90 = lean_box(0);
+ x_87 = lean_box(0);
 }
-x_91 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_91, 0, x_82);
-lean_ctor_set(x_91, 1, x_84);
-lean_ctor_set(x_91, 2, x_85);
-lean_ctor_set(x_91, 3, x_89);
-lean_ctor_set(x_91, 4, x_86);
-lean_ctor_set(x_91, 5, x_87);
-lean_ctor_set(x_91, 6, x_88);
-lean_ctor_set_uint8(x_91, sizeof(void*)*7, x_83);
-lean_ctor_set(x_58, 0, x_91);
-if (lean_is_scalar(x_90)) {
- x_92 = lean_alloc_ctor(0, 8, 1);
+x_88 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_88, 0, x_80);
+lean_ctor_set(x_88, 1, x_82);
+lean_ctor_set(x_88, 2, x_83);
+lean_ctor_set(x_88, 3, x_86);
+lean_ctor_set(x_88, 4, x_84);
+lean_ctor_set(x_88, 5, x_85);
+lean_ctor_set_uint8(x_88, sizeof(void*)*6, x_81);
+lean_ctor_set(x_56, 0, x_88);
+if (lean_is_scalar(x_87)) {
+ x_89 = lean_alloc_ctor(0, 8, 1);
 } else {
- x_92 = x_90;
+ x_89 = x_87;
 }
-lean_ctor_set(x_92, 0, x_58);
-lean_ctor_set(x_92, 1, x_60);
-lean_ctor_set(x_92, 2, x_61);
-lean_ctor_set(x_92, 3, x_62);
-lean_ctor_set(x_92, 4, x_57);
-lean_ctor_set(x_92, 5, x_63);
-lean_ctor_set(x_92, 6, x_64);
-lean_ctor_set(x_92, 7, x_65);
-lean_ctor_set_uint8(x_92, sizeof(void*)*8, x_67);
-return x_92;
+lean_ctor_set(x_89, 0, x_56);
+lean_ctor_set(x_89, 1, x_58);
+lean_ctor_set(x_89, 2, x_59);
+lean_ctor_set(x_89, 3, x_60);
+lean_ctor_set(x_89, 4, x_55);
+lean_ctor_set(x_89, 5, x_61);
+lean_ctor_set(x_89, 6, x_62);
+lean_ctor_set(x_89, 7, x_63);
+lean_ctor_set_uint8(x_89, sizeof(void*)*8, x_65);
+return x_89;
 }
 }
 else
 {
-uint8_t x_93; lean_object* x_94; lean_object* x_95; uint8_t x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_93 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_94 = lean_ctor_get(x_58, 1);
-lean_inc(x_94);
-lean_dec(x_58);
-x_95 = lean_ctor_get(x_59, 0);
+uint8_t x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_90 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_91 = lean_ctor_get(x_56, 1);
+lean_inc(x_91);
+lean_dec(x_56);
+x_92 = lean_ctor_get(x_57, 0);
+lean_inc_ref(x_92);
+x_93 = lean_ctor_get_uint8(x_57, sizeof(void*)*6);
+x_94 = lean_ctor_get(x_57, 1);
+lean_inc_ref(x_94);
+x_95 = lean_ctor_get(x_57, 2);
 lean_inc_ref(x_95);
-x_96 = lean_ctor_get_uint8(x_59, sizeof(void*)*7);
-x_97 = lean_ctor_get(x_59, 1);
+x_96 = lean_ctor_get(x_57, 4);
+lean_inc_ref(x_96);
+x_97 = lean_ctor_get(x_57, 5);
 lean_inc_ref(x_97);
-x_98 = lean_ctor_get(x_59, 2);
-lean_inc_ref(x_98);
-x_99 = lean_ctor_get(x_59, 4);
-lean_inc_ref(x_99);
-x_100 = lean_ctor_get(x_59, 5);
-lean_inc(x_100);
-x_101 = lean_ctor_get(x_59, 6);
-lean_inc_ref(x_101);
-if (lean_is_exclusive(x_59)) {
- lean_ctor_release(x_59, 0);
- lean_ctor_release(x_59, 1);
- lean_ctor_release(x_59, 2);
- lean_ctor_release(x_59, 3);
- lean_ctor_release(x_59, 4);
- lean_ctor_release(x_59, 5);
- lean_ctor_release(x_59, 6);
- x_102 = x_59;
+if (lean_is_exclusive(x_57)) {
+ lean_ctor_release(x_57, 0);
+ lean_ctor_release(x_57, 1);
+ lean_ctor_release(x_57, 2);
+ lean_ctor_release(x_57, 3);
+ lean_ctor_release(x_57, 4);
+ lean_ctor_release(x_57, 5);
+ x_98 = x_57;
 } else {
- lean_dec_ref(x_59);
- x_102 = lean_box(0);
+ lean_dec_ref(x_57);
+ x_98 = lean_box(0);
 }
 lean_inc_ref(x_2);
-x_103 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_3);
+x_99 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_3);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14316,163 +14207,162 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_104 = x_2;
+ x_100 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_104 = lean_box(0);
+ x_100 = lean_box(0);
 }
-if (lean_is_scalar(x_102)) {
- x_105 = lean_alloc_ctor(0, 7, 1);
+if (lean_is_scalar(x_98)) {
+ x_101 = lean_alloc_ctor(0, 6, 1);
 } else {
- x_105 = x_102;
+ x_101 = x_98;
 }
-lean_ctor_set(x_105, 0, x_95);
-lean_ctor_set(x_105, 1, x_97);
-lean_ctor_set(x_105, 2, x_98);
-lean_ctor_set(x_105, 3, x_103);
-lean_ctor_set(x_105, 4, x_99);
-lean_ctor_set(x_105, 5, x_100);
-lean_ctor_set(x_105, 6, x_101);
-lean_ctor_set_uint8(x_105, sizeof(void*)*7, x_96);
-x_106 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_106, 0, x_105);
-lean_ctor_set(x_106, 1, x_94);
-if (lean_is_scalar(x_104)) {
- x_107 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_101, 0, x_92);
+lean_ctor_set(x_101, 1, x_94);
+lean_ctor_set(x_101, 2, x_95);
+lean_ctor_set(x_101, 3, x_99);
+lean_ctor_set(x_101, 4, x_96);
+lean_ctor_set(x_101, 5, x_97);
+lean_ctor_set_uint8(x_101, sizeof(void*)*6, x_93);
+x_102 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_102, 0, x_101);
+lean_ctor_set(x_102, 1, x_91);
+if (lean_is_scalar(x_100)) {
+ x_103 = lean_alloc_ctor(0, 8, 1);
 } else {
- x_107 = x_104;
+ x_103 = x_100;
 }
-lean_ctor_set(x_107, 0, x_106);
-lean_ctor_set(x_107, 1, x_60);
-lean_ctor_set(x_107, 2, x_61);
-lean_ctor_set(x_107, 3, x_62);
-lean_ctor_set(x_107, 4, x_57);
-lean_ctor_set(x_107, 5, x_63);
-lean_ctor_set(x_107, 6, x_64);
-lean_ctor_set(x_107, 7, x_65);
-lean_ctor_set_uint8(x_107, sizeof(void*)*8, x_93);
-return x_107;
+lean_ctor_set(x_103, 0, x_102);
+lean_ctor_set(x_103, 1, x_58);
+lean_ctor_set(x_103, 2, x_59);
+lean_ctor_set(x_103, 3, x_60);
+lean_ctor_set(x_103, 4, x_55);
+lean_ctor_set(x_103, 5, x_61);
+lean_ctor_set(x_103, 6, x_62);
+lean_ctor_set(x_103, 7, x_63);
+lean_ctor_set_uint8(x_103, sizeof(void*)*8, x_90);
+return x_103;
 }
 }
 else
 {
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_128; 
+lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; uint8_t x_124; 
 lean_dec_ref(x_3);
 lean_dec_ref(x_1);
-x_108 = lean_ctor_get(x_57, 0);
-lean_inc(x_108);
-lean_dec_ref(x_57);
-x_109 = l_Lean_Environment_addDeclCore___closed__0;
-x_110 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
-x_111 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
-x_112 = lean_unsigned_to_nat(1359u);
-x_113 = lean_unsigned_to_nat(13u);
-x_114 = l_Lean_EnvExtension_modifyState___redArg___closed__1;
-x_128 = l_Lean_Environment_isRealizing(x_2);
-if (x_128 == 0)
+x_104 = lean_ctor_get(x_55, 0);
+lean_inc(x_104);
+lean_dec_ref(x_55);
+x_105 = l_Lean_Environment_addDeclCore___closed__0;
+x_106 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
+x_107 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
+x_108 = lean_unsigned_to_nat(1340u);
+x_109 = lean_unsigned_to_nat(13u);
+x_110 = l_Lean_EnvExtension_modifyState___redArg___closed__1;
+x_124 = l_Lean_Environment_isRealizing(x_2);
+if (x_124 == 0)
 {
-lean_object* x_129; 
-x_129 = l_Lean_EnvExtension_modifyState___redArg___closed__4;
-x_115 = x_129;
-goto block_127;
+lean_object* x_125; 
+x_125 = l_Lean_EnvExtension_modifyState___redArg___closed__4;
+x_111 = x_125;
+goto block_123;
 }
 else
 {
-lean_object* x_130; 
-x_130 = l_Lean_EnvExtension_modifyState___redArg___closed__5;
-x_115 = x_130;
-goto block_127;
+lean_object* x_126; 
+x_126 = l_Lean_EnvExtension_modifyState___redArg___closed__5;
+x_111 = x_126;
+goto block_123;
 }
-block_127:
+block_123:
 {
-lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; uint8_t x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
-x_116 = lean_ctor_get(x_108, 0);
-lean_inc(x_116);
-lean_dec(x_108);
-x_117 = lean_string_append(x_114, x_115);
-lean_dec_ref(x_115);
-x_118 = l_Lean_EnvExtension_modifyState___redArg___closed__2;
-x_119 = lean_string_append(x_117, x_118);
-x_120 = 1;
-x_121 = l_Lean_Name_toString(x_116, x_120, x_109);
-x_122 = lean_string_append(x_119, x_121);
-lean_dec_ref(x_121);
-x_123 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
-x_124 = lean_string_append(x_122, x_123);
-x_125 = l_mkPanicMessageWithDecl(x_110, x_111, x_112, x_113, x_124);
-lean_dec_ref(x_124);
-x_126 = l_panic___redArg(x_2, x_125);
-return x_126;
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
+x_112 = lean_ctor_get(x_104, 0);
+lean_inc(x_112);
+lean_dec(x_104);
+x_113 = lean_string_append(x_110, x_111);
+lean_dec_ref(x_111);
+x_114 = l_Lean_EnvExtension_modifyState___redArg___closed__2;
+x_115 = lean_string_append(x_113, x_114);
+x_116 = 1;
+x_117 = l_Lean_Name_toString(x_112, x_116, x_105);
+x_118 = lean_string_append(x_115, x_117);
+lean_dec_ref(x_117);
+x_119 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
+x_120 = lean_string_append(x_118, x_119);
+x_121 = l_mkPanicMessageWithDecl(x_106, x_107, x_108, x_109, x_120);
+lean_dec_ref(x_120);
+x_122 = l_panic___redArg(x_2, x_121);
+return x_122;
 }
 }
 }
 default: 
 {
-lean_object* x_131; lean_object* x_132; 
+lean_object* x_127; lean_object* x_128; 
 lean_dec(x_5);
-x_131 = lean_ctor_get(x_1, 2);
+x_127 = lean_ctor_get(x_1, 2);
+lean_inc(x_127);
+x_128 = lean_alloc_closure((void*)(l_Lean_EnvExtension_modifyState___redArg___lam__1___boxed), 3, 2);
+lean_closure_set(x_128, 0, x_1);
+lean_closure_set(x_128, 1, x_3);
+if (lean_obj_tag(x_127) == 0)
+{
+lean_object* x_129; 
+x_129 = lean_ctor_get(x_2, 4);
+lean_inc(x_129);
+if (lean_obj_tag(x_129) == 0)
+{
+lean_object* x_130; 
+x_130 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_128);
+return x_130;
+}
+else
+{
+lean_object* x_131; lean_object* x_132; 
+x_131 = lean_ctor_get(x_129, 0);
 lean_inc(x_131);
-x_132 = lean_alloc_closure((void*)(l_Lean_EnvExtension_modifyState___redArg___lam__1___boxed), 3, 2);
-lean_closure_set(x_132, 0, x_1);
-lean_closure_set(x_132, 1, x_3);
-if (lean_obj_tag(x_131) == 0)
+lean_dec_ref(x_129);
+x_132 = lean_ctor_get(x_131, 1);
+lean_inc(x_132);
+lean_dec(x_131);
+if (lean_obj_tag(x_132) == 0)
 {
 lean_object* x_133; 
-x_133 = lean_ctor_get(x_2, 4);
-lean_inc(x_133);
-if (lean_obj_tag(x_133) == 0)
-{
-lean_object* x_134; 
-x_134 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_132);
-return x_134;
+x_133 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_128);
+return x_133;
 }
 else
 {
-lean_object* x_135; lean_object* x_136; 
-x_135 = lean_ctor_get(x_133, 0);
-lean_inc(x_135);
-lean_dec_ref(x_133);
-x_136 = lean_ctor_get(x_135, 1);
-lean_inc(x_136);
-lean_dec(x_135);
-if (lean_obj_tag(x_136) == 0)
-{
-lean_object* x_137; 
-x_137 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_132);
-return x_137;
-}
-else
-{
-lean_object* x_138; lean_object* x_139; uint8_t x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+lean_object* x_134; lean_object* x_135; uint8_t x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+lean_dec_ref(x_128);
+x_134 = lean_ctor_get(x_132, 0);
+lean_inc(x_134);
 lean_dec_ref(x_132);
-x_138 = lean_ctor_get(x_136, 0);
-lean_inc(x_138);
-lean_dec_ref(x_136);
-x_139 = l_Lean_Environment_addDeclCore___closed__0;
-x_140 = 1;
-x_141 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
-x_142 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
-x_143 = lean_unsigned_to_nat(1367u);
-x_144 = lean_unsigned_to_nat(15u);
-x_145 = l_Lean_EnvExtension_modifyState___redArg___closed__6;
-x_146 = l_Lean_Name_toString(x_138, x_140, x_139);
-x_147 = lean_string_append(x_145, x_146);
-lean_dec_ref(x_146);
-x_148 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
-x_149 = lean_string_append(x_147, x_148);
-x_150 = l_mkPanicMessageWithDecl(x_141, x_142, x_143, x_144, x_149);
-lean_dec_ref(x_149);
-x_151 = l_panic___redArg(x_2, x_150);
-return x_151;
+x_135 = l_Lean_Environment_addDeclCore___closed__0;
+x_136 = 1;
+x_137 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
+x_138 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
+x_139 = lean_unsigned_to_nat(1348u);
+x_140 = lean_unsigned_to_nat(15u);
+x_141 = l_Lean_EnvExtension_modifyState___redArg___closed__6;
+x_142 = l_Lean_Name_toString(x_134, x_136, x_135);
+x_143 = lean_string_append(x_141, x_142);
+lean_dec_ref(x_142);
+x_144 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
+x_145 = lean_string_append(x_143, x_144);
+x_146 = l_mkPanicMessageWithDecl(x_137, x_138, x_139, x_140, x_145);
+lean_dec_ref(x_145);
+x_147 = l_panic___redArg(x_2, x_146);
+return x_147;
 }
 }
 }
 else
 {
-lean_object* x_152; 
-lean_dec_ref(x_131);
-x_152 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_132);
-return x_152;
+lean_object* x_148; 
+lean_dec_ref(x_127);
+x_148 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_128);
+return x_148;
 }
 }
 }
@@ -14523,10 +14413,10 @@ return x_1;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_setState___redArg___lam__2(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; uint8_t x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+lean_object* x_4; uint8_t x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
 x_4 = lean_ctor_get(x_3, 0);
 lean_inc_ref(x_4);
-x_5 = lean_ctor_get_uint8(x_3, sizeof(void*)*7);
+x_5 = lean_ctor_get_uint8(x_3, sizeof(void*)*6);
 x_6 = lean_ctor_get(x_3, 1);
 lean_inc_ref(x_6);
 x_7 = lean_ctor_get(x_3, 2);
@@ -14534,46 +14424,41 @@ lean_inc_ref(x_7);
 x_8 = lean_ctor_get(x_3, 4);
 lean_inc_ref(x_8);
 x_9 = lean_ctor_get(x_3, 5);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_3, 6);
-lean_inc_ref(x_10);
+lean_inc_ref(x_9);
 lean_inc_ref(x_3);
-x_11 = l_Lean_EnvExtension_modifyState_unsafe__9___redArg(x_1, x_2, x_3);
-x_12 = !lean_is_exclusive(x_3);
-if (x_12 == 0)
+x_10 = l_Lean_EnvExtension_modifyState_unsafe__9___redArg(x_1, x_2, x_3);
+x_11 = !lean_is_exclusive(x_3);
+if (x_11 == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_13 = lean_ctor_get(x_3, 6);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_12 = lean_ctor_get(x_3, 5);
+lean_dec(x_12);
+x_13 = lean_ctor_get(x_3, 4);
 lean_dec(x_13);
-x_14 = lean_ctor_get(x_3, 5);
+x_14 = lean_ctor_get(x_3, 3);
 lean_dec(x_14);
-x_15 = lean_ctor_get(x_3, 4);
+x_15 = lean_ctor_get(x_3, 2);
 lean_dec(x_15);
-x_16 = lean_ctor_get(x_3, 3);
+x_16 = lean_ctor_get(x_3, 1);
 lean_dec(x_16);
-x_17 = lean_ctor_get(x_3, 2);
+x_17 = lean_ctor_get(x_3, 0);
 lean_dec(x_17);
-x_18 = lean_ctor_get(x_3, 1);
-lean_dec(x_18);
-x_19 = lean_ctor_get(x_3, 0);
-lean_dec(x_19);
-lean_ctor_set(x_3, 3, x_11);
+lean_ctor_set(x_3, 3, x_10);
 return x_3;
 }
 else
 {
-lean_object* x_20; 
+lean_object* x_18; 
 lean_dec(x_3);
-x_20 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_20, 0, x_4);
-lean_ctor_set(x_20, 1, x_6);
-lean_ctor_set(x_20, 2, x_7);
-lean_ctor_set(x_20, 3, x_11);
-lean_ctor_set(x_20, 4, x_8);
-lean_ctor_set(x_20, 5, x_9);
-lean_ctor_set(x_20, 6, x_10);
-lean_ctor_set_uint8(x_20, sizeof(void*)*7, x_5);
-return x_20;
+x_18 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_18, 0, x_4);
+lean_ctor_set(x_18, 1, x_6);
+lean_ctor_set(x_18, 2, x_7);
+lean_ctor_set(x_18, 3, x_10);
+lean_ctor_set(x_18, 4, x_8);
+lean_ctor_set(x_18, 5, x_9);
+lean_ctor_set_uint8(x_18, sizeof(void*)*6, x_5);
+return x_18;
 }
 }
 }
@@ -14669,15 +14554,13 @@ return x_32;
 }
 else
 {
-lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 x_33 = lean_ctor_get(x_9, 0);
-x_34 = lean_ctor_get_uint8(x_9, sizeof(void*)*7);
+x_34 = lean_ctor_get_uint8(x_9, sizeof(void*)*6);
 x_35 = lean_ctor_get(x_9, 1);
 x_36 = lean_ctor_get(x_9, 2);
 x_37 = lean_ctor_get(x_9, 4);
 x_38 = lean_ctor_get(x_9, 5);
-x_39 = lean_ctor_get(x_9, 6);
-lean_inc(x_39);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
@@ -14685,7 +14568,7 @@ lean_inc(x_35);
 lean_inc(x_33);
 lean_dec(x_9);
 lean_inc_ref(x_2);
-x_40 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_6);
+x_39 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_6);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14696,58 +14579,55 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_41 = x_2;
+ x_40 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_41 = lean_box(0);
+ x_40 = lean_box(0);
 }
-x_42 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_42, 0, x_33);
-lean_ctor_set(x_42, 1, x_35);
-lean_ctor_set(x_42, 2, x_36);
-lean_ctor_set(x_42, 3, x_40);
-lean_ctor_set(x_42, 4, x_37);
-lean_ctor_set(x_42, 5, x_38);
-lean_ctor_set(x_42, 6, x_39);
-lean_ctor_set_uint8(x_42, sizeof(void*)*7, x_34);
-lean_ctor_set(x_8, 0, x_42);
-if (lean_is_scalar(x_41)) {
- x_43 = lean_alloc_ctor(0, 8, 1);
+x_41 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_41, 0, x_33);
+lean_ctor_set(x_41, 1, x_35);
+lean_ctor_set(x_41, 2, x_36);
+lean_ctor_set(x_41, 3, x_39);
+lean_ctor_set(x_41, 4, x_37);
+lean_ctor_set(x_41, 5, x_38);
+lean_ctor_set_uint8(x_41, sizeof(void*)*6, x_34);
+lean_ctor_set(x_8, 0, x_41);
+if (lean_is_scalar(x_40)) {
+ x_42 = lean_alloc_ctor(0, 8, 1);
 } else {
- x_43 = x_41;
+ x_42 = x_40;
 }
-lean_ctor_set(x_43, 0, x_8);
-lean_ctor_set(x_43, 1, x_10);
-lean_ctor_set(x_43, 2, x_11);
-lean_ctor_set(x_43, 3, x_12);
-lean_ctor_set(x_43, 4, x_13);
-lean_ctor_set(x_43, 5, x_14);
-lean_ctor_set(x_43, 6, x_15);
-lean_ctor_set(x_43, 7, x_16);
-lean_ctor_set_uint8(x_43, sizeof(void*)*8, x_18);
-return x_43;
+lean_ctor_set(x_42, 0, x_8);
+lean_ctor_set(x_42, 1, x_10);
+lean_ctor_set(x_42, 2, x_11);
+lean_ctor_set(x_42, 3, x_12);
+lean_ctor_set(x_42, 4, x_13);
+lean_ctor_set(x_42, 5, x_14);
+lean_ctor_set(x_42, 6, x_15);
+lean_ctor_set(x_42, 7, x_16);
+lean_ctor_set_uint8(x_42, sizeof(void*)*8, x_18);
+return x_42;
 }
 }
 else
 {
-uint8_t x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_44 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_45 = lean_ctor_get(x_8, 1);
-lean_inc(x_45);
+uint8_t x_43; lean_object* x_44; lean_object* x_45; uint8_t x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_43 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_44 = lean_ctor_get(x_8, 1);
+lean_inc(x_44);
 lean_dec(x_8);
-x_46 = lean_ctor_get(x_9, 0);
-lean_inc_ref(x_46);
-x_47 = lean_ctor_get_uint8(x_9, sizeof(void*)*7);
-x_48 = lean_ctor_get(x_9, 1);
+x_45 = lean_ctor_get(x_9, 0);
+lean_inc_ref(x_45);
+x_46 = lean_ctor_get_uint8(x_9, sizeof(void*)*6);
+x_47 = lean_ctor_get(x_9, 1);
+lean_inc_ref(x_47);
+x_48 = lean_ctor_get(x_9, 2);
 lean_inc_ref(x_48);
-x_49 = lean_ctor_get(x_9, 2);
+x_49 = lean_ctor_get(x_9, 4);
 lean_inc_ref(x_49);
-x_50 = lean_ctor_get(x_9, 4);
+x_50 = lean_ctor_get(x_9, 5);
 lean_inc_ref(x_50);
-x_51 = lean_ctor_get(x_9, 5);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_9, 6);
-lean_inc_ref(x_52);
 if (lean_is_exclusive(x_9)) {
  lean_ctor_release(x_9, 0);
  lean_ctor_release(x_9, 1);
@@ -14755,14 +14635,13 @@ if (lean_is_exclusive(x_9)) {
  lean_ctor_release(x_9, 3);
  lean_ctor_release(x_9, 4);
  lean_ctor_release(x_9, 5);
- lean_ctor_release(x_9, 6);
- x_53 = x_9;
+ x_51 = x_9;
 } else {
  lean_dec_ref(x_9);
- x_53 = lean_box(0);
+ x_51 = lean_box(0);
 }
 lean_inc_ref(x_2);
-x_54 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_6);
+x_52 = l_Lean_EnvExtension_modifyState_unsafe__4___redArg(x_1, x_2, x_6);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14773,145 +14652,142 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_55 = x_2;
+ x_53 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_55 = lean_box(0);
+ x_53 = lean_box(0);
 }
+if (lean_is_scalar(x_51)) {
+ x_54 = lean_alloc_ctor(0, 6, 1);
+} else {
+ x_54 = x_51;
+}
+lean_ctor_set(x_54, 0, x_45);
+lean_ctor_set(x_54, 1, x_47);
+lean_ctor_set(x_54, 2, x_48);
+lean_ctor_set(x_54, 3, x_52);
+lean_ctor_set(x_54, 4, x_49);
+lean_ctor_set(x_54, 5, x_50);
+lean_ctor_set_uint8(x_54, sizeof(void*)*6, x_46);
+x_55 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_55, 0, x_54);
+lean_ctor_set(x_55, 1, x_44);
 if (lean_is_scalar(x_53)) {
- x_56 = lean_alloc_ctor(0, 7, 1);
+ x_56 = lean_alloc_ctor(0, 8, 1);
 } else {
  x_56 = x_53;
 }
-lean_ctor_set(x_56, 0, x_46);
-lean_ctor_set(x_56, 1, x_48);
-lean_ctor_set(x_56, 2, x_49);
-lean_ctor_set(x_56, 3, x_54);
-lean_ctor_set(x_56, 4, x_50);
-lean_ctor_set(x_56, 5, x_51);
-lean_ctor_set(x_56, 6, x_52);
-lean_ctor_set_uint8(x_56, sizeof(void*)*7, x_47);
-x_57 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_45);
-if (lean_is_scalar(x_55)) {
- x_58 = lean_alloc_ctor(0, 8, 1);
-} else {
- x_58 = x_55;
-}
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_10);
-lean_ctor_set(x_58, 2, x_11);
-lean_ctor_set(x_58, 3, x_12);
-lean_ctor_set(x_58, 4, x_13);
-lean_ctor_set(x_58, 5, x_14);
-lean_ctor_set(x_58, 6, x_15);
-lean_ctor_set(x_58, 7, x_16);
-lean_ctor_set_uint8(x_58, sizeof(void*)*8, x_44);
-return x_58;
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_10);
+lean_ctor_set(x_56, 2, x_11);
+lean_ctor_set(x_56, 3, x_12);
+lean_ctor_set(x_56, 4, x_13);
+lean_ctor_set(x_56, 5, x_14);
+lean_ctor_set(x_56, 6, x_15);
+lean_ctor_set(x_56, 7, x_16);
+lean_ctor_set_uint8(x_56, sizeof(void*)*8, x_43);
+return x_56;
 }
 }
 case 2:
 {
-lean_object* x_59; 
+lean_object* x_57; 
 lean_dec(x_5);
-x_59 = lean_ctor_get(x_2, 4);
+x_57 = lean_ctor_get(x_2, 4);
+lean_inc(x_57);
+if (lean_obj_tag(x_57) == 0)
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; uint8_t x_66; 
+x_58 = lean_ctor_get(x_2, 0);
+lean_inc_ref(x_58);
+x_59 = lean_ctor_get(x_58, 0);
 lean_inc(x_59);
-if (lean_obj_tag(x_59) == 0)
-{
-lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; 
-x_60 = lean_ctor_get(x_2, 0);
+x_60 = lean_ctor_get(x_2, 1);
 lean_inc_ref(x_60);
-x_61 = lean_ctor_get(x_60, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get(x_2, 1);
+x_61 = lean_ctor_get(x_2, 2);
+lean_inc_ref(x_61);
+x_62 = lean_ctor_get(x_2, 3);
 lean_inc_ref(x_62);
-x_63 = lean_ctor_get(x_2, 2);
-lean_inc_ref(x_63);
-x_64 = lean_ctor_get(x_2, 3);
-lean_inc_ref(x_64);
-x_65 = lean_ctor_get(x_2, 5);
-lean_inc(x_65);
-x_66 = lean_ctor_get(x_2, 6);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_2, 7);
-lean_inc_ref(x_67);
-x_68 = !lean_is_exclusive(x_60);
-if (x_68 == 0)
+x_63 = lean_ctor_get(x_2, 5);
+lean_inc(x_63);
+x_64 = lean_ctor_get(x_2, 6);
+lean_inc(x_64);
+x_65 = lean_ctor_get(x_2, 7);
+lean_inc_ref(x_65);
+x_66 = !lean_is_exclusive(x_58);
+if (x_66 == 0)
 {
-uint8_t x_69; lean_object* x_70; uint8_t x_71; 
-x_69 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_70 = lean_ctor_get(x_60, 0);
+uint8_t x_67; lean_object* x_68; uint8_t x_69; 
+x_67 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_68 = lean_ctor_get(x_58, 0);
+lean_dec(x_68);
+x_69 = !lean_is_exclusive(x_59);
+if (x_69 == 0)
+{
+lean_object* x_70; lean_object* x_71; uint8_t x_72; 
+x_70 = lean_ctor_get(x_59, 3);
 lean_dec(x_70);
-x_71 = !lean_is_exclusive(x_61);
-if (x_71 == 0)
-{
-lean_object* x_72; lean_object* x_73; uint8_t x_74; 
-x_72 = lean_ctor_get(x_61, 3);
-lean_dec(x_72);
 lean_inc_ref(x_2);
-x_73 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_6);
+x_71 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_6);
 lean_dec_ref(x_1);
-x_74 = !lean_is_exclusive(x_2);
-if (x_74 == 0)
+x_72 = !lean_is_exclusive(x_2);
+if (x_72 == 0)
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_75 = lean_ctor_get(x_2, 7);
+lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_73 = lean_ctor_get(x_2, 7);
+lean_dec(x_73);
+x_74 = lean_ctor_get(x_2, 6);
+lean_dec(x_74);
+x_75 = lean_ctor_get(x_2, 5);
 lean_dec(x_75);
-x_76 = lean_ctor_get(x_2, 6);
+x_76 = lean_ctor_get(x_2, 4);
 lean_dec(x_76);
-x_77 = lean_ctor_get(x_2, 5);
+x_77 = lean_ctor_get(x_2, 3);
 lean_dec(x_77);
-x_78 = lean_ctor_get(x_2, 4);
+x_78 = lean_ctor_get(x_2, 2);
 lean_dec(x_78);
-x_79 = lean_ctor_get(x_2, 3);
+x_79 = lean_ctor_get(x_2, 1);
 lean_dec(x_79);
-x_80 = lean_ctor_get(x_2, 2);
+x_80 = lean_ctor_get(x_2, 0);
 lean_dec(x_80);
-x_81 = lean_ctor_get(x_2, 1);
-lean_dec(x_81);
-x_82 = lean_ctor_get(x_2, 0);
-lean_dec(x_82);
-lean_ctor_set(x_61, 3, x_73);
+lean_ctor_set(x_59, 3, x_71);
 return x_2;
 }
 else
 {
-lean_object* x_83; 
+lean_object* x_81; 
 lean_dec(x_2);
-lean_ctor_set(x_61, 3, x_73);
-x_83 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_83, 0, x_60);
-lean_ctor_set(x_83, 1, x_62);
-lean_ctor_set(x_83, 2, x_63);
-lean_ctor_set(x_83, 3, x_64);
-lean_ctor_set(x_83, 4, x_59);
-lean_ctor_set(x_83, 5, x_65);
-lean_ctor_set(x_83, 6, x_66);
-lean_ctor_set(x_83, 7, x_67);
-lean_ctor_set_uint8(x_83, sizeof(void*)*8, x_69);
-return x_83;
+lean_ctor_set(x_59, 3, x_71);
+x_81 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_81, 0, x_58);
+lean_ctor_set(x_81, 1, x_60);
+lean_ctor_set(x_81, 2, x_61);
+lean_ctor_set(x_81, 3, x_62);
+lean_ctor_set(x_81, 4, x_57);
+lean_ctor_set(x_81, 5, x_63);
+lean_ctor_set(x_81, 6, x_64);
+lean_ctor_set(x_81, 7, x_65);
+lean_ctor_set_uint8(x_81, sizeof(void*)*8, x_67);
+return x_81;
 }
 }
 else
 {
-lean_object* x_84; uint8_t x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_84 = lean_ctor_get(x_61, 0);
-x_85 = lean_ctor_get_uint8(x_61, sizeof(void*)*7);
-x_86 = lean_ctor_get(x_61, 1);
-x_87 = lean_ctor_get(x_61, 2);
-x_88 = lean_ctor_get(x_61, 4);
-x_89 = lean_ctor_get(x_61, 5);
-x_90 = lean_ctor_get(x_61, 6);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_inc(x_88);
+lean_object* x_82; uint8_t x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_82 = lean_ctor_get(x_59, 0);
+x_83 = lean_ctor_get_uint8(x_59, sizeof(void*)*6);
+x_84 = lean_ctor_get(x_59, 1);
+x_85 = lean_ctor_get(x_59, 2);
+x_86 = lean_ctor_get(x_59, 4);
+x_87 = lean_ctor_get(x_59, 5);
 lean_inc(x_87);
 lean_inc(x_86);
+lean_inc(x_85);
 lean_inc(x_84);
-lean_dec(x_61);
+lean_inc(x_82);
+lean_dec(x_59);
 lean_inc_ref(x_2);
-x_91 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_6);
+x_88 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_6);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14922,73 +14798,69 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_92 = x_2;
+ x_89 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_92 = lean_box(0);
+ x_89 = lean_box(0);
 }
-x_93 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_93, 0, x_84);
-lean_ctor_set(x_93, 1, x_86);
-lean_ctor_set(x_93, 2, x_87);
-lean_ctor_set(x_93, 3, x_91);
-lean_ctor_set(x_93, 4, x_88);
-lean_ctor_set(x_93, 5, x_89);
-lean_ctor_set(x_93, 6, x_90);
-lean_ctor_set_uint8(x_93, sizeof(void*)*7, x_85);
-lean_ctor_set(x_60, 0, x_93);
-if (lean_is_scalar(x_92)) {
- x_94 = lean_alloc_ctor(0, 8, 1);
+x_90 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_90, 0, x_82);
+lean_ctor_set(x_90, 1, x_84);
+lean_ctor_set(x_90, 2, x_85);
+lean_ctor_set(x_90, 3, x_88);
+lean_ctor_set(x_90, 4, x_86);
+lean_ctor_set(x_90, 5, x_87);
+lean_ctor_set_uint8(x_90, sizeof(void*)*6, x_83);
+lean_ctor_set(x_58, 0, x_90);
+if (lean_is_scalar(x_89)) {
+ x_91 = lean_alloc_ctor(0, 8, 1);
 } else {
- x_94 = x_92;
+ x_91 = x_89;
 }
-lean_ctor_set(x_94, 0, x_60);
-lean_ctor_set(x_94, 1, x_62);
-lean_ctor_set(x_94, 2, x_63);
-lean_ctor_set(x_94, 3, x_64);
-lean_ctor_set(x_94, 4, x_59);
-lean_ctor_set(x_94, 5, x_65);
-lean_ctor_set(x_94, 6, x_66);
-lean_ctor_set(x_94, 7, x_67);
-lean_ctor_set_uint8(x_94, sizeof(void*)*8, x_69);
-return x_94;
+lean_ctor_set(x_91, 0, x_58);
+lean_ctor_set(x_91, 1, x_60);
+lean_ctor_set(x_91, 2, x_61);
+lean_ctor_set(x_91, 3, x_62);
+lean_ctor_set(x_91, 4, x_57);
+lean_ctor_set(x_91, 5, x_63);
+lean_ctor_set(x_91, 6, x_64);
+lean_ctor_set(x_91, 7, x_65);
+lean_ctor_set_uint8(x_91, sizeof(void*)*8, x_67);
+return x_91;
 }
 }
 else
 {
-uint8_t x_95; lean_object* x_96; lean_object* x_97; uint8_t x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_95 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_96 = lean_ctor_get(x_60, 1);
-lean_inc(x_96);
-lean_dec(x_60);
-x_97 = lean_ctor_get(x_61, 0);
+uint8_t x_92; lean_object* x_93; lean_object* x_94; uint8_t x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+x_92 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_93 = lean_ctor_get(x_58, 1);
+lean_inc(x_93);
+lean_dec(x_58);
+x_94 = lean_ctor_get(x_59, 0);
+lean_inc_ref(x_94);
+x_95 = lean_ctor_get_uint8(x_59, sizeof(void*)*6);
+x_96 = lean_ctor_get(x_59, 1);
+lean_inc_ref(x_96);
+x_97 = lean_ctor_get(x_59, 2);
 lean_inc_ref(x_97);
-x_98 = lean_ctor_get_uint8(x_61, sizeof(void*)*7);
-x_99 = lean_ctor_get(x_61, 1);
+x_98 = lean_ctor_get(x_59, 4);
+lean_inc_ref(x_98);
+x_99 = lean_ctor_get(x_59, 5);
 lean_inc_ref(x_99);
-x_100 = lean_ctor_get(x_61, 2);
-lean_inc_ref(x_100);
-x_101 = lean_ctor_get(x_61, 4);
-lean_inc_ref(x_101);
-x_102 = lean_ctor_get(x_61, 5);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_61, 6);
-lean_inc_ref(x_103);
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- lean_ctor_release(x_61, 1);
- lean_ctor_release(x_61, 2);
- lean_ctor_release(x_61, 3);
- lean_ctor_release(x_61, 4);
- lean_ctor_release(x_61, 5);
- lean_ctor_release(x_61, 6);
- x_104 = x_61;
+if (lean_is_exclusive(x_59)) {
+ lean_ctor_release(x_59, 0);
+ lean_ctor_release(x_59, 1);
+ lean_ctor_release(x_59, 2);
+ lean_ctor_release(x_59, 3);
+ lean_ctor_release(x_59, 4);
+ lean_ctor_release(x_59, 5);
+ x_100 = x_59;
 } else {
- lean_dec_ref(x_61);
- x_104 = lean_box(0);
+ lean_dec_ref(x_59);
+ x_100 = lean_box(0);
 }
 lean_inc_ref(x_2);
-x_105 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_6);
+x_101 = l_Lean_EnvExtension_modifyState_unsafe__1___redArg(x_1, x_2, x_6);
 lean_dec_ref(x_1);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
@@ -14999,161 +14871,160 @@ if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 5);
  lean_ctor_release(x_2, 6);
  lean_ctor_release(x_2, 7);
- x_106 = x_2;
+ x_102 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_106 = lean_box(0);
+ x_102 = lean_box(0);
 }
-if (lean_is_scalar(x_104)) {
- x_107 = lean_alloc_ctor(0, 7, 1);
+if (lean_is_scalar(x_100)) {
+ x_103 = lean_alloc_ctor(0, 6, 1);
 } else {
- x_107 = x_104;
+ x_103 = x_100;
 }
-lean_ctor_set(x_107, 0, x_97);
-lean_ctor_set(x_107, 1, x_99);
-lean_ctor_set(x_107, 2, x_100);
-lean_ctor_set(x_107, 3, x_105);
-lean_ctor_set(x_107, 4, x_101);
-lean_ctor_set(x_107, 5, x_102);
-lean_ctor_set(x_107, 6, x_103);
-lean_ctor_set_uint8(x_107, sizeof(void*)*7, x_98);
-x_108 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_108, 0, x_107);
-lean_ctor_set(x_108, 1, x_96);
-if (lean_is_scalar(x_106)) {
- x_109 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_103, 0, x_94);
+lean_ctor_set(x_103, 1, x_96);
+lean_ctor_set(x_103, 2, x_97);
+lean_ctor_set(x_103, 3, x_101);
+lean_ctor_set(x_103, 4, x_98);
+lean_ctor_set(x_103, 5, x_99);
+lean_ctor_set_uint8(x_103, sizeof(void*)*6, x_95);
+x_104 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_104, 0, x_103);
+lean_ctor_set(x_104, 1, x_93);
+if (lean_is_scalar(x_102)) {
+ x_105 = lean_alloc_ctor(0, 8, 1);
 } else {
- x_109 = x_106;
+ x_105 = x_102;
 }
-lean_ctor_set(x_109, 0, x_108);
-lean_ctor_set(x_109, 1, x_62);
-lean_ctor_set(x_109, 2, x_63);
-lean_ctor_set(x_109, 3, x_64);
-lean_ctor_set(x_109, 4, x_59);
-lean_ctor_set(x_109, 5, x_65);
-lean_ctor_set(x_109, 6, x_66);
-lean_ctor_set(x_109, 7, x_67);
-lean_ctor_set_uint8(x_109, sizeof(void*)*8, x_95);
-return x_109;
+lean_ctor_set(x_105, 0, x_104);
+lean_ctor_set(x_105, 1, x_60);
+lean_ctor_set(x_105, 2, x_61);
+lean_ctor_set(x_105, 3, x_62);
+lean_ctor_set(x_105, 4, x_57);
+lean_ctor_set(x_105, 5, x_63);
+lean_ctor_set(x_105, 6, x_64);
+lean_ctor_set(x_105, 7, x_65);
+lean_ctor_set_uint8(x_105, sizeof(void*)*8, x_92);
+return x_105;
 }
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; uint8_t x_130; 
+lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; uint8_t x_126; 
 lean_dec_ref(x_6);
 lean_dec_ref(x_1);
-x_110 = lean_ctor_get(x_59, 0);
-lean_inc(x_110);
-lean_dec_ref(x_59);
-x_111 = l_Lean_Environment_addDeclCore___closed__0;
-x_112 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
-x_113 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
-x_114 = lean_unsigned_to_nat(1359u);
-x_115 = lean_unsigned_to_nat(13u);
-x_116 = l_Lean_EnvExtension_modifyState___redArg___closed__1;
-x_130 = l_Lean_Environment_isRealizing(x_2);
-if (x_130 == 0)
+x_106 = lean_ctor_get(x_57, 0);
+lean_inc(x_106);
+lean_dec_ref(x_57);
+x_107 = l_Lean_Environment_addDeclCore___closed__0;
+x_108 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
+x_109 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
+x_110 = lean_unsigned_to_nat(1340u);
+x_111 = lean_unsigned_to_nat(13u);
+x_112 = l_Lean_EnvExtension_modifyState___redArg___closed__1;
+x_126 = l_Lean_Environment_isRealizing(x_2);
+if (x_126 == 0)
 {
-lean_object* x_131; 
-x_131 = l_Lean_EnvExtension_modifyState___redArg___closed__4;
-x_117 = x_131;
-goto block_129;
+lean_object* x_127; 
+x_127 = l_Lean_EnvExtension_modifyState___redArg___closed__4;
+x_113 = x_127;
+goto block_125;
 }
 else
 {
-lean_object* x_132; 
-x_132 = l_Lean_EnvExtension_modifyState___redArg___closed__5;
-x_117 = x_132;
-goto block_129;
+lean_object* x_128; 
+x_128 = l_Lean_EnvExtension_modifyState___redArg___closed__5;
+x_113 = x_128;
+goto block_125;
 }
-block_129:
+block_125:
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; uint8_t x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; 
-x_118 = lean_ctor_get(x_110, 0);
-lean_inc(x_118);
-lean_dec(x_110);
-x_119 = lean_string_append(x_116, x_117);
-lean_dec_ref(x_117);
-x_120 = l_Lean_EnvExtension_modifyState___redArg___closed__2;
-x_121 = lean_string_append(x_119, x_120);
-x_122 = 1;
-x_123 = l_Lean_Name_toString(x_118, x_122, x_111);
-x_124 = lean_string_append(x_121, x_123);
-lean_dec_ref(x_123);
-x_125 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
-x_126 = lean_string_append(x_124, x_125);
-x_127 = l_mkPanicMessageWithDecl(x_112, x_113, x_114, x_115, x_126);
-lean_dec_ref(x_126);
-x_128 = l_panic___redArg(x_2, x_127);
-return x_128;
+lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; uint8_t x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+x_114 = lean_ctor_get(x_106, 0);
+lean_inc(x_114);
+lean_dec(x_106);
+x_115 = lean_string_append(x_112, x_113);
+lean_dec_ref(x_113);
+x_116 = l_Lean_EnvExtension_modifyState___redArg___closed__2;
+x_117 = lean_string_append(x_115, x_116);
+x_118 = 1;
+x_119 = l_Lean_Name_toString(x_114, x_118, x_107);
+x_120 = lean_string_append(x_117, x_119);
+lean_dec_ref(x_119);
+x_121 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
+x_122 = lean_string_append(x_120, x_121);
+x_123 = l_mkPanicMessageWithDecl(x_108, x_109, x_110, x_111, x_122);
+lean_dec_ref(x_122);
+x_124 = l_panic___redArg(x_2, x_123);
+return x_124;
 }
 }
 }
 default: 
 {
-lean_object* x_133; 
+lean_object* x_129; 
 lean_dec(x_7);
-x_133 = lean_alloc_closure((void*)(l_Lean_EnvExtension_setState___redArg___lam__2___boxed), 3, 2);
-lean_closure_set(x_133, 0, x_1);
-lean_closure_set(x_133, 1, x_6);
+x_129 = lean_alloc_closure((void*)(l_Lean_EnvExtension_setState___redArg___lam__2___boxed), 3, 2);
+lean_closure_set(x_129, 0, x_1);
+lean_closure_set(x_129, 1, x_6);
 if (lean_obj_tag(x_5) == 0)
 {
+lean_object* x_130; 
+x_130 = lean_ctor_get(x_2, 4);
+lean_inc(x_130);
+if (lean_obj_tag(x_130) == 0)
+{
+lean_object* x_131; 
+x_131 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_129);
+return x_131;
+}
+else
+{
+lean_object* x_132; lean_object* x_133; 
+x_132 = lean_ctor_get(x_130, 0);
+lean_inc(x_132);
+lean_dec_ref(x_130);
+x_133 = lean_ctor_get(x_132, 1);
+lean_inc(x_133);
+lean_dec(x_132);
+if (lean_obj_tag(x_133) == 0)
+{
 lean_object* x_134; 
-x_134 = lean_ctor_get(x_2, 4);
-lean_inc(x_134);
-if (lean_obj_tag(x_134) == 0)
-{
-lean_object* x_135; 
-x_135 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_133);
-return x_135;
+x_134 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_129);
+return x_134;
 }
 else
 {
-lean_object* x_136; lean_object* x_137; 
-x_136 = lean_ctor_get(x_134, 0);
-lean_inc(x_136);
-lean_dec_ref(x_134);
-x_137 = lean_ctor_get(x_136, 1);
-lean_inc(x_137);
-lean_dec(x_136);
-if (lean_obj_tag(x_137) == 0)
-{
-lean_object* x_138; 
-x_138 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_133);
-return x_138;
-}
-else
-{
-lean_object* x_139; lean_object* x_140; uint8_t x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
+lean_object* x_135; lean_object* x_136; uint8_t x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
+lean_dec_ref(x_129);
+x_135 = lean_ctor_get(x_133, 0);
+lean_inc(x_135);
 lean_dec_ref(x_133);
-x_139 = lean_ctor_get(x_137, 0);
-lean_inc(x_139);
-lean_dec_ref(x_137);
-x_140 = l_Lean_Environment_addDeclCore___closed__0;
-x_141 = 1;
-x_142 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
-x_143 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
-x_144 = lean_unsigned_to_nat(1367u);
-x_145 = lean_unsigned_to_nat(15u);
-x_146 = l_Lean_EnvExtension_modifyState___redArg___closed__6;
-x_147 = l_Lean_Name_toString(x_139, x_141, x_140);
-x_148 = lean_string_append(x_146, x_147);
-lean_dec_ref(x_147);
-x_149 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
-x_150 = lean_string_append(x_148, x_149);
-x_151 = l_mkPanicMessageWithDecl(x_142, x_143, x_144, x_145, x_150);
-lean_dec_ref(x_150);
-x_152 = l_panic___redArg(x_2, x_151);
-return x_152;
+x_136 = l_Lean_Environment_addDeclCore___closed__0;
+x_137 = 1;
+x_138 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
+x_139 = l_Lean_EnvExtension_modifyState___redArg___closed__0;
+x_140 = lean_unsigned_to_nat(1348u);
+x_141 = lean_unsigned_to_nat(15u);
+x_142 = l_Lean_EnvExtension_modifyState___redArg___closed__6;
+x_143 = l_Lean_Name_toString(x_135, x_137, x_136);
+x_144 = lean_string_append(x_142, x_143);
+lean_dec_ref(x_143);
+x_145 = l_Lean_EnvExtension_modifyState___redArg___closed__3;
+x_146 = lean_string_append(x_144, x_145);
+x_147 = l_mkPanicMessageWithDecl(x_138, x_139, x_140, x_141, x_146);
+lean_dec_ref(x_146);
+x_148 = l_panic___redArg(x_2, x_147);
+return x_148;
 }
 }
 }
 else
 {
-lean_object* x_153; 
+lean_object* x_149; 
 lean_dec_ref(x_5);
-x_153 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_133);
-return x_153;
+x_149 = l___private_Lean_Environment_0__Lean_Environment_modifyCheckedAsync(x_2, x_129);
+return x_149;
 }
 }
 }
@@ -15208,7 +15079,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg___closed__1;
 x_2 = lean_unsigned_to_nat(17u);
-x_3 = lean_unsigned_to_nat(1385u);
+x_3 = lean_unsigned_to_nat(1366u);
 x_4 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -15327,7 +15198,7 @@ if (x_11 == 0)
 lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_8);
 lean_dec(x_1);
-x_12 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_12 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_13 = lean_task_get_own(x_9);
 x_14 = l___private_Init_Dynamic_0__Dynamic_get_x3fImpl___redArg(x_13, x_12);
 lean_dec(x_13);
@@ -15888,7 +15759,7 @@ uint8_t x_8;
 x_8 = !lean_is_exclusive(x_7);
 if (x_8 == 0)
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
 x_9 = lean_ctor_get(x_7, 0);
 x_10 = l_Lean_mkEmptyEnvironment___closed__4;
 x_11 = l_Lean_mkEmptyEnvironment___closed__7;
@@ -15897,46 +15768,45 @@ x_13 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_13, 0, x_12);
 x_14 = lean_unbox(x_4);
 lean_ctor_set_uint8(x_13, sizeof(void*)*1, x_14);
-x_15 = lean_box(1);
-x_16 = lean_box(0);
-x_17 = l_Lean_mkEmptyEnvironment___closed__9;
-x_18 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_18, 0, x_16);
-lean_ctor_set(x_18, 1, x_17);
-lean_ctor_set(x_18, 2, x_17);
-lean_ctor_set(x_18, 3, x_17);
-lean_ctor_set(x_18, 4, x_17);
-lean_ctor_set_uint32(x_18, sizeof(void*)*5, x_1);
-x_19 = lean_unbox(x_4);
-lean_ctor_set_uint8(x_18, sizeof(void*)*5 + 4, x_19);
+x_15 = lean_box(0);
+x_16 = l_Lean_mkEmptyEnvironment___closed__9;
+x_17 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set(x_17, 1, x_16);
+lean_ctor_set(x_17, 2, x_16);
+lean_ctor_set(x_17, 3, x_16);
+lean_ctor_set(x_17, 4, x_16);
+lean_ctor_set_uint32(x_17, sizeof(void*)*5, x_1);
+x_18 = lean_unbox(x_4);
+lean_ctor_set_uint8(x_17, sizeof(void*)*5 + 4, x_18);
 lean_inc_n(x_9, 2);
-x_20 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_20, 0, x_11);
-lean_ctor_set(x_20, 1, x_13);
-lean_ctor_set(x_20, 2, x_10);
-lean_ctor_set(x_20, 3, x_9);
-lean_ctor_set(x_20, 4, x_9);
-lean_ctor_set(x_20, 5, x_15);
-lean_ctor_set(x_20, 6, x_18);
-x_21 = lean_unbox(x_4);
-lean_ctor_set_uint8(x_20, sizeof(void*)*7, x_21);
-lean_inc_ref_n(x_20, 2);
-x_22 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_20);
-x_23 = lean_task_pure(x_20);
+x_19 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_19, 0, x_11);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_10);
+lean_ctor_set(x_19, 3, x_9);
+lean_ctor_set(x_19, 4, x_9);
+lean_ctor_set(x_19, 5, x_17);
+x_20 = lean_unbox(x_4);
+lean_ctor_set_uint8(x_19, sizeof(void*)*6, x_20);
+lean_inc_ref_n(x_19, 2);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_19);
+x_22 = lean_task_pure(x_19);
+x_23 = lean_box(1);
 x_24 = l_Lean_Environment_ofKernelEnv___closed__0;
 x_25 = lean_box(0);
 x_26 = lean_box(0);
 x_27 = l_Lean_Environment_ofKernelEnv___closed__1;
 x_28 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_28, 0, x_22);
+lean_ctor_set(x_28, 0, x_21);
 lean_ctor_set(x_28, 1, x_9);
-lean_ctor_set(x_28, 2, x_23);
+lean_ctor_set(x_28, 2, x_22);
 lean_ctor_set(x_28, 3, x_24);
 lean_ctor_set(x_28, 4, x_25);
 lean_ctor_set(x_28, 5, x_26);
-lean_ctor_set(x_28, 6, x_15);
+lean_ctor_set(x_28, 6, x_23);
 lean_ctor_set(x_28, 7, x_27);
 x_29 = lean_unbox(x_4);
 lean_dec(x_4);
@@ -15946,7 +15816,7 @@ return x_7;
 }
 else
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; 
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; lean_object* x_52; 
 x_30 = lean_ctor_get(x_7, 0);
 x_31 = lean_ctor_get(x_7, 1);
 lean_inc(x_31);
@@ -15959,46 +15829,45 @@ x_35 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_35, 0, x_34);
 x_36 = lean_unbox(x_4);
 lean_ctor_set_uint8(x_35, sizeof(void*)*1, x_36);
-x_37 = lean_box(1);
-x_38 = lean_box(0);
-x_39 = l_Lean_mkEmptyEnvironment___closed__9;
-x_40 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-lean_ctor_set(x_40, 2, x_39);
-lean_ctor_set(x_40, 3, x_39);
-lean_ctor_set(x_40, 4, x_39);
-lean_ctor_set_uint32(x_40, sizeof(void*)*5, x_1);
-x_41 = lean_unbox(x_4);
-lean_ctor_set_uint8(x_40, sizeof(void*)*5 + 4, x_41);
+x_37 = lean_box(0);
+x_38 = l_Lean_mkEmptyEnvironment___closed__9;
+x_39 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_39, 0, x_37);
+lean_ctor_set(x_39, 1, x_38);
+lean_ctor_set(x_39, 2, x_38);
+lean_ctor_set(x_39, 3, x_38);
+lean_ctor_set(x_39, 4, x_38);
+lean_ctor_set_uint32(x_39, sizeof(void*)*5, x_1);
+x_40 = lean_unbox(x_4);
+lean_ctor_set_uint8(x_39, sizeof(void*)*5 + 4, x_40);
 lean_inc_n(x_30, 2);
-x_42 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_42, 0, x_33);
-lean_ctor_set(x_42, 1, x_35);
-lean_ctor_set(x_42, 2, x_32);
-lean_ctor_set(x_42, 3, x_30);
-lean_ctor_set(x_42, 4, x_30);
-lean_ctor_set(x_42, 5, x_37);
-lean_ctor_set(x_42, 6, x_40);
-x_43 = lean_unbox(x_4);
-lean_ctor_set_uint8(x_42, sizeof(void*)*7, x_43);
-lean_inc_ref_n(x_42, 2);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_42);
-x_45 = lean_task_pure(x_42);
+x_41 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_41, 0, x_33);
+lean_ctor_set(x_41, 1, x_35);
+lean_ctor_set(x_41, 2, x_32);
+lean_ctor_set(x_41, 3, x_30);
+lean_ctor_set(x_41, 4, x_30);
+lean_ctor_set(x_41, 5, x_39);
+x_42 = lean_unbox(x_4);
+lean_ctor_set_uint8(x_41, sizeof(void*)*6, x_42);
+lean_inc_ref_n(x_41, 2);
+x_43 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_41);
+x_44 = lean_task_pure(x_41);
+x_45 = lean_box(1);
 x_46 = l_Lean_Environment_ofKernelEnv___closed__0;
 x_47 = lean_box(0);
 x_48 = lean_box(0);
 x_49 = l_Lean_Environment_ofKernelEnv___closed__1;
 x_50 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_50, 0, x_44);
+lean_ctor_set(x_50, 0, x_43);
 lean_ctor_set(x_50, 1, x_30);
-lean_ctor_set(x_50, 2, x_45);
+lean_ctor_set(x_50, 2, x_44);
 lean_ctor_set(x_50, 3, x_46);
 lean_ctor_set(x_50, 4, x_47);
 lean_ctor_set(x_50, 5, x_48);
-lean_ctor_set(x_50, 6, x_37);
+lean_ctor_set(x_50, 6, x_45);
 lean_ctor_set(x_50, 7, x_49);
 x_51 = lean_unbox(x_4);
 lean_dec(x_4);
@@ -16207,7 +16076,7 @@ x_6 = lean_box(x_5);
 return x_6;
 }
 }
-LEAN_EXPORT uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(uint8_t x_1, uint8_t x_2) {
+LEAN_EXPORT uint8_t l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(uint8_t x_1, uint8_t x_2) {
 _start:
 {
 switch (x_1) {
@@ -16273,13 +16142,13 @@ return x_11;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069____boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024____boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; uint8_t x_4; uint8_t x_5; lean_object* x_6; 
 x_3 = lean_unbox(x_1);
 x_4 = lean_unbox(x_2);
-x_5 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(x_3, x_4);
+x_5 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
 }
@@ -16288,7 +16157,7 @@ static lean_object* _init_l_Lean_instOrdOLeanLevel___closed__0() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069____boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024____boxed), 2, 0);
 return x_1;
 }
 }
@@ -16300,7 +16169,7 @@ x_1 = l_Lean_instOrdOLeanLevel___closed__0;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9162_() {
+static lean_object* _init_l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9117_() {
 _start:
 {
 lean_object* x_1; 
@@ -16308,17 +16177,17 @@ x_1 = lean_mk_string_unchecked("Lean.OLeanLevel.exported", 24, 24);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9162_() {
+static lean_object* _init_l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9117_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9162_;
+x_1 = l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9117_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9162_() {
+static lean_object* _init_l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9117_() {
 _start:
 {
 lean_object* x_1; 
@@ -16326,17 +16195,17 @@ x_1 = lean_mk_string_unchecked("Lean.OLeanLevel.server", 22, 22);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9162_() {
+static lean_object* _init_l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9117_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9162_;
+x_1 = l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9117_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9162_() {
+static lean_object* _init_l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9117_() {
 _start:
 {
 lean_object* x_1; 
@@ -16344,17 +16213,17 @@ x_1 = lean_mk_string_unchecked("Lean.OLeanLevel.private", 23, 23);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9162_() {
+static lean_object* _init_l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9117_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9162_;
+x_1 = l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9117_;
 x_2 = lean_alloc_ctor(3, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9162_(uint8_t x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9117_(uint8_t x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_10; lean_object* x_17; 
@@ -16423,7 +16292,7 @@ goto block_23;
 block_9:
 {
 lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; 
-x_4 = l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9162_;
+x_4 = l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9117_;
 x_5 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_5, 0, x_3);
 lean_ctor_set(x_5, 1, x_4);
@@ -16437,7 +16306,7 @@ return x_8;
 block_16:
 {
 lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; 
-x_11 = l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9162_;
+x_11 = l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9117_;
 x_12 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
@@ -16451,7 +16320,7 @@ return x_15;
 block_23:
 {
 lean_object* x_18; lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; 
-x_18 = l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9162_;
+x_18 = l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9117_;
 x_19 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_19, 0, x_17);
 lean_ctor_set(x_19, 1, x_18);
@@ -16464,12 +16333,12 @@ return x_22;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9162____boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9117____boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
 x_3 = lean_unbox(x_1);
-x_4 = l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9162_(x_3, x_2);
+x_4 = l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9117_(x_3, x_2);
 lean_dec(x_2);
 return x_4;
 }
@@ -16478,7 +16347,7 @@ static lean_object* _init_l_Lean_instReprOLeanLevel___closed__0() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9162____boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_reprOLeanLevel____x40_Lean_Environment___hyg_9117____boxed), 2, 0);
 return x_1;
 }
 }
@@ -17103,7 +16972,7 @@ lean_dec_ref(x_5);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9655_() {
+static lean_object* _init_l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9610_() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -17112,11 +16981,11 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_9655_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_9610_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
-x_2 = l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9655_;
+x_2 = l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9610_;
 x_3 = lean_st_mk_ref(x_2, x_1);
 x_4 = !lean_is_exclusive(x_3);
 if (x_4 == 0)
@@ -18279,7 +18148,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_readModuleData___closed__2;
 x_2 = lean_unsigned_to_nat(2u);
-x_3 = lean_unsigned_to_nat(1711u);
+x_3 = lean_unsigned_to_nat(1691u);
 x_4 = l_Lean_readModuleData___closed__1;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -18292,7 +18161,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1___redArg___closed__1;
 x_2 = lean_unsigned_to_nat(31u);
-x_3 = lean_unsigned_to_nat(1712u);
+x_3 = lean_unsigned_to_nat(1692u);
 x_4 = l_Lean_readModuleData___closed__1;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -19168,35 +19037,35 @@ return x_24;
 block_32:
 {
 lean_object* x_31; 
-lean_dec(x_29);
-x_31 = l_Array_qsort_sort___at___Lean_mkModuleData_spec__5___redArg(x_26, x_27, x_30);
+lean_dec(x_26);
+x_31 = l_Array_qsort_sort___at___Lean_mkModuleData_spec__5___redArg(x_29, x_28, x_30);
 lean_dec(x_30);
-x_15 = x_28;
+x_15 = x_27;
 x_16 = x_31;
 goto block_25;
 }
 block_39:
 {
 uint8_t x_38; 
-x_38 = lean_nat_dec_le(x_37, x_34);
+x_38 = lean_nat_dec_le(x_37, x_35);
 if (x_38 == 0)
 {
-lean_dec(x_34);
+lean_dec(x_35);
 lean_inc(x_37);
 x_26 = x_33;
-x_27 = x_37;
-x_28 = x_36;
-x_29 = x_35;
+x_27 = x_34;
+x_28 = x_37;
+x_29 = x_36;
 x_30 = x_37;
 goto block_32;
 }
 else
 {
 x_26 = x_33;
-x_27 = x_37;
-x_28 = x_36;
-x_29 = x_35;
-x_30 = x_34;
+x_27 = x_34;
+x_28 = x_37;
+x_29 = x_36;
+x_30 = x_35;
 goto block_32;
 }
 }
@@ -19234,19 +19103,19 @@ x_56 = lean_nat_dec_le(x_46, x_55);
 if (x_56 == 0)
 {
 lean_inc(x_55);
-x_33 = x_51;
-x_34 = x_55;
-x_35 = x_52;
-x_36 = x_45;
+x_33 = x_52;
+x_34 = x_45;
+x_35 = x_55;
+x_36 = x_51;
 x_37 = x_55;
 goto block_39;
 }
 else
 {
-x_33 = x_51;
-x_34 = x_55;
-x_35 = x_52;
-x_36 = x_45;
+x_33 = x_52;
+x_34 = x_45;
+x_35 = x_55;
+x_36 = x_51;
 x_37 = x_46;
 goto block_39;
 }
@@ -20538,31 +20407,28 @@ return x_2;
 }
 else
 {
-lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_5 = lean_ctor_get(x_2, 0);
-x_6 = lean_ctor_get_uint8(x_2, sizeof(void*)*7);
+x_6 = lean_ctor_get_uint8(x_2, sizeof(void*)*6);
 x_7 = lean_ctor_get(x_2, 1);
 x_8 = lean_ctor_get(x_2, 2);
 x_9 = lean_ctor_get(x_2, 4);
 x_10 = lean_ctor_get(x_2, 5);
-x_11 = lean_ctor_get(x_2, 6);
-lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_5);
 lean_dec(x_2);
-x_12 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_12, 0, x_5);
-lean_ctor_set(x_12, 1, x_7);
-lean_ctor_set(x_12, 2, x_8);
-lean_ctor_set(x_12, 3, x_1);
-lean_ctor_set(x_12, 4, x_9);
-lean_ctor_set(x_12, 5, x_10);
-lean_ctor_set(x_12, 6, x_11);
-lean_ctor_set_uint8(x_12, sizeof(void*)*7, x_6);
-return x_12;
+x_11 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_11, 0, x_5);
+lean_ctor_set(x_11, 1, x_7);
+lean_ctor_set(x_11, 2, x_8);
+lean_ctor_set(x_11, 3, x_1);
+lean_ctor_set(x_11, 4, x_9);
+lean_ctor_set(x_11, 5, x_10);
+lean_ctor_set_uint8(x_11, sizeof(void*)*6, x_6);
+return x_11;
 }
 }
 }
@@ -20765,7 +20631,7 @@ lean_dec_ref(x_42);
 x_45 = lean_get_num_attributes(x_44);
 if (lean_obj_tag(x_45) == 0)
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_78; uint8_t x_79; 
+lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_77; uint8_t x_78; 
 x_46 = lean_ctor_get(x_45, 0);
 lean_inc(x_46);
 x_47 = lean_ctor_get(x_45, 1);
@@ -20773,27 +20639,27 @@ lean_inc(x_47);
 lean_dec_ref(x_45);
 x_48 = lean_array_get_size(x_21);
 lean_dec(x_21);
-x_78 = lean_array_get_size(x_43);
+x_77 = lean_array_get_size(x_43);
 lean_dec(x_43);
-x_79 = lean_nat_dec_lt(x_48, x_78);
-lean_dec(x_78);
-if (x_79 == 0)
+x_78 = lean_nat_dec_lt(x_48, x_77);
+lean_dec(x_77);
+if (x_78 == 0)
 {
-uint8_t x_80; 
-x_80 = lean_nat_dec_lt(x_24, x_46);
+uint8_t x_79; 
+x_79 = lean_nat_dec_lt(x_24, x_46);
 lean_dec(x_46);
 lean_dec(x_24);
-x_49 = x_80;
-goto block_77;
+x_49 = x_79;
+goto block_76;
 }
 else
 {
 lean_dec(x_46);
 lean_dec(x_24);
-x_49 = x_79;
-goto block_77;
+x_49 = x_78;
+goto block_76;
 }
-block_77:
+block_76:
 {
 if (x_49 == 0)
 {
@@ -20847,16 +20713,14 @@ return x_58;
 }
 else
 {
-lean_object* x_61; uint8_t x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+lean_object* x_61; uint8_t x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
 x_61 = lean_ctor_get(x_51, 0);
-x_62 = lean_ctor_get_uint8(x_51, sizeof(void*)*7);
+x_62 = lean_ctor_get_uint8(x_51, sizeof(void*)*6);
 x_63 = lean_ctor_get(x_51, 1);
 x_64 = lean_ctor_get(x_51, 2);
 x_65 = lean_ctor_get(x_51, 3);
 x_66 = lean_ctor_get(x_51, 4);
 x_67 = lean_ctor_get(x_51, 5);
-x_68 = lean_ctor_get(x_51, 6);
-lean_inc(x_68);
 lean_inc(x_67);
 lean_inc(x_66);
 lean_inc(x_65);
@@ -20865,33 +20729,32 @@ lean_inc(x_63);
 lean_inc(x_61);
 lean_dec(x_51);
 lean_inc_ref(x_1);
-x_69 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_65, x_1, x_48, x_47);
-x_70 = lean_ctor_get(x_69, 0);
+x_68 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_65, x_1, x_48, x_47);
+x_69 = lean_ctor_get(x_68, 0);
+lean_inc(x_69);
+x_70 = lean_ctor_get(x_68, 1);
 lean_inc(x_70);
-x_71 = lean_ctor_get(x_69, 1);
-lean_inc(x_71);
-lean_dec_ref(x_69);
-x_72 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_72, 0, x_61);
-lean_ctor_set(x_72, 1, x_63);
-lean_ctor_set(x_72, 2, x_64);
-lean_ctor_set(x_72, 3, x_70);
-lean_ctor_set(x_72, 4, x_66);
-lean_ctor_set(x_72, 5, x_67);
-lean_ctor_set(x_72, 6, x_68);
-lean_ctor_set_uint8(x_72, sizeof(void*)*7, x_62);
-x_73 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_40, x_72);
-x_74 = lean_update_env_attributes(x_73, x_71);
-if (lean_obj_tag(x_74) == 0)
+lean_dec_ref(x_68);
+x_71 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_71, 0, x_61);
+lean_ctor_set(x_71, 1, x_63);
+lean_ctor_set(x_71, 2, x_64);
+lean_ctor_set(x_71, 3, x_69);
+lean_ctor_set(x_71, 4, x_66);
+lean_ctor_set(x_71, 5, x_67);
+lean_ctor_set_uint8(x_71, sizeof(void*)*6, x_62);
+x_72 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_40, x_71);
+x_73 = lean_update_env_attributes(x_72, x_70);
+if (lean_obj_tag(x_73) == 0)
 {
-lean_object* x_75; lean_object* x_76; 
-x_75 = lean_ctor_get(x_74, 0);
+lean_object* x_74; lean_object* x_75; 
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_73, 1);
 lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-lean_dec_ref(x_74);
-x_6 = x_75;
-x_7 = x_76;
+lean_dec_ref(x_73);
+x_6 = x_74;
+x_7 = x_75;
 goto block_11;
 }
 else
@@ -20899,7 +20762,7 @@ else
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-return x_74;
+return x_73;
 }
 }
 }
@@ -20907,7 +20770,7 @@ return x_74;
 }
 else
 {
-uint8_t x_81; 
+uint8_t x_80; 
 lean_dec(x_43);
 lean_dec(x_40);
 lean_dec(x_24);
@@ -20915,23 +20778,23 @@ lean_dec(x_21);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_81 = !lean_is_exclusive(x_45);
-if (x_81 == 0)
+x_80 = !lean_is_exclusive(x_45);
+if (x_80 == 0)
 {
 return x_45;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_45, 0);
-x_83 = lean_ctor_get(x_45, 1);
-lean_inc(x_83);
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_45, 0);
+x_82 = lean_ctor_get(x_45, 1);
 lean_inc(x_82);
+lean_inc(x_81);
 lean_dec(x_45);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_83);
-return x_84;
+x_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 }
@@ -20947,7 +20810,7 @@ return x_39;
 }
 else
 {
-uint8_t x_85; 
+uint8_t x_84; 
 lean_free_object(x_31);
 lean_dec_ref(x_33);
 lean_dec_ref(x_27);
@@ -20957,173 +20820,169 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_85 = !lean_is_exclusive(x_35);
-if (x_85 == 0)
+x_84 = !lean_is_exclusive(x_35);
+if (x_84 == 0)
 {
 return x_35;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_35, 0);
-x_87 = lean_ctor_get(x_35, 1);
-lean_inc(x_87);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+x_85 = lean_ctor_get(x_35, 0);
+x_86 = lean_ctor_get(x_35, 1);
 lean_inc(x_86);
+lean_inc(x_85);
 lean_dec(x_35);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_86);
-lean_ctor_set(x_88, 1, x_87);
-return x_88;
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_85);
+lean_ctor_set(x_87, 1, x_86);
+return x_87;
 }
 }
 }
 else
 {
-lean_object* x_89; lean_object* x_90; 
-x_89 = lean_ctor_get(x_31, 0);
-lean_inc(x_89);
+lean_object* x_88; lean_object* x_89; 
+x_88 = lean_ctor_get(x_31, 0);
+lean_inc(x_88);
 lean_dec(x_31);
 lean_inc(x_2);
 lean_inc_ref(x_4);
 lean_ctor_set(x_19, 1, x_2);
 lean_ctor_set(x_19, 0, x_4);
-lean_inc_ref(x_89);
-x_90 = lean_apply_3(x_28, x_89, x_19, x_25);
-if (lean_obj_tag(x_90) == 0)
+lean_inc_ref(x_88);
+x_89 = lean_apply_3(x_28, x_88, x_19, x_25);
+if (lean_obj_tag(x_89) == 0)
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_91 = lean_ctor_get(x_90, 0);
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_90 = lean_ctor_get(x_89, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_89, 1);
 lean_inc(x_91);
-x_92 = lean_ctor_get(x_90, 1);
-lean_inc(x_92);
-lean_dec_ref(x_90);
-x_93 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_93, 0, x_89);
-lean_ctor_set(x_93, 1, x_91);
-x_94 = l_Lean_EnvExtension_setState___redArg(x_27, x_4, x_93);
-x_95 = l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize(x_94, x_92);
-if (lean_obj_tag(x_95) == 0)
+lean_dec_ref(x_89);
+x_92 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_92, 0, x_88);
+lean_ctor_set(x_92, 1, x_90);
+x_93 = l_Lean_EnvExtension_setState___redArg(x_27, x_4, x_92);
+x_94 = l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize(x_93, x_91);
+if (lean_obj_tag(x_94) == 0)
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_96 = lean_ctor_get(x_95, 0);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_95 = lean_ctor_get(x_94, 0);
+lean_inc(x_95);
+x_96 = lean_ctor_get(x_94, 1);
 lean_inc(x_96);
-x_97 = lean_ctor_get(x_95, 1);
-lean_inc(x_97);
-lean_dec_ref(x_95);
-x_98 = lean_st_ref_get(x_12, x_97);
-x_99 = lean_ctor_get(x_98, 0);
+lean_dec_ref(x_94);
+x_97 = lean_st_ref_get(x_12, x_96);
+x_98 = lean_ctor_get(x_97, 0);
+lean_inc(x_98);
+x_99 = lean_ctor_get(x_97, 1);
 lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
-lean_inc(x_100);
-lean_dec_ref(x_98);
-x_101 = lean_get_num_attributes(x_100);
-if (lean_obj_tag(x_101) == 0)
+lean_dec_ref(x_97);
+x_100 = lean_get_num_attributes(x_99);
+if (lean_obj_tag(x_100) == 0)
 {
-lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; lean_object* x_126; uint8_t x_127; 
-x_102 = lean_ctor_get(x_101, 0);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; uint8_t x_104; lean_object* x_124; uint8_t x_125; 
+x_101 = lean_ctor_get(x_100, 0);
+lean_inc(x_101);
+x_102 = lean_ctor_get(x_100, 1);
 lean_inc(x_102);
-x_103 = lean_ctor_get(x_101, 1);
-lean_inc(x_103);
-lean_dec_ref(x_101);
-x_104 = lean_array_get_size(x_21);
+lean_dec_ref(x_100);
+x_103 = lean_array_get_size(x_21);
 lean_dec(x_21);
-x_126 = lean_array_get_size(x_99);
-lean_dec(x_99);
-x_127 = lean_nat_dec_lt(x_104, x_126);
-lean_dec(x_126);
-if (x_127 == 0)
+x_124 = lean_array_get_size(x_98);
+lean_dec(x_98);
+x_125 = lean_nat_dec_lt(x_103, x_124);
+lean_dec(x_124);
+if (x_125 == 0)
 {
-uint8_t x_128; 
-x_128 = lean_nat_dec_lt(x_24, x_102);
-lean_dec(x_102);
+uint8_t x_126; 
+x_126 = lean_nat_dec_lt(x_24, x_101);
+lean_dec(x_101);
 lean_dec(x_24);
-x_105 = x_128;
-goto block_125;
+x_104 = x_126;
+goto block_123;
 }
 else
 {
-lean_dec(x_102);
+lean_dec(x_101);
 lean_dec(x_24);
-x_105 = x_127;
-goto block_125;
+x_104 = x_125;
+goto block_123;
 }
-block_125:
+block_123:
 {
-if (x_105 == 0)
+if (x_104 == 0)
 {
-lean_dec(x_104);
-x_6 = x_96;
-x_7 = x_103;
+lean_dec(x_103);
+x_6 = x_95;
+x_7 = x_102;
 goto block_11;
 }
 else
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-x_106 = lean_ctor_get(x_96, 0);
-lean_inc_ref(x_106);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+x_105 = lean_ctor_get(x_95, 0);
+lean_inc_ref(x_105);
+x_106 = lean_ctor_get(x_105, 0);
+lean_inc(x_106);
+lean_dec_ref(x_105);
 x_107 = lean_ctor_get(x_106, 0);
-lean_inc(x_107);
-lean_dec_ref(x_106);
-x_108 = lean_ctor_get(x_107, 0);
-lean_inc_ref(x_108);
-x_109 = lean_ctor_get_uint8(x_107, sizeof(void*)*7);
-x_110 = lean_ctor_get(x_107, 1);
+lean_inc_ref(x_107);
+x_108 = lean_ctor_get_uint8(x_106, sizeof(void*)*6);
+x_109 = lean_ctor_get(x_106, 1);
+lean_inc_ref(x_109);
+x_110 = lean_ctor_get(x_106, 2);
 lean_inc_ref(x_110);
-x_111 = lean_ctor_get(x_107, 2);
+x_111 = lean_ctor_get(x_106, 3);
 lean_inc_ref(x_111);
-x_112 = lean_ctor_get(x_107, 3);
+x_112 = lean_ctor_get(x_106, 4);
 lean_inc_ref(x_112);
-x_113 = lean_ctor_get(x_107, 4);
+x_113 = lean_ctor_get(x_106, 5);
 lean_inc_ref(x_113);
-x_114 = lean_ctor_get(x_107, 5);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_107, 6);
-lean_inc_ref(x_115);
-if (lean_is_exclusive(x_107)) {
- lean_ctor_release(x_107, 0);
- lean_ctor_release(x_107, 1);
- lean_ctor_release(x_107, 2);
- lean_ctor_release(x_107, 3);
- lean_ctor_release(x_107, 4);
- lean_ctor_release(x_107, 5);
- lean_ctor_release(x_107, 6);
- x_116 = x_107;
+if (lean_is_exclusive(x_106)) {
+ lean_ctor_release(x_106, 0);
+ lean_ctor_release(x_106, 1);
+ lean_ctor_release(x_106, 2);
+ lean_ctor_release(x_106, 3);
+ lean_ctor_release(x_106, 4);
+ lean_ctor_release(x_106, 5);
+ x_114 = x_106;
 } else {
- lean_dec_ref(x_107);
- x_116 = lean_box(0);
+ lean_dec_ref(x_106);
+ x_114 = lean_box(0);
 }
 lean_inc_ref(x_1);
-x_117 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_112, x_1, x_104, x_103);
-x_118 = lean_ctor_get(x_117, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_117, 1);
-lean_inc(x_119);
-lean_dec_ref(x_117);
-if (lean_is_scalar(x_116)) {
- x_120 = lean_alloc_ctor(0, 7, 1);
+x_115 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_111, x_1, x_103, x_102);
+x_116 = lean_ctor_get(x_115, 0);
+lean_inc(x_116);
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc(x_117);
+lean_dec_ref(x_115);
+if (lean_is_scalar(x_114)) {
+ x_118 = lean_alloc_ctor(0, 6, 1);
 } else {
- x_120 = x_116;
+ x_118 = x_114;
 }
-lean_ctor_set(x_120, 0, x_108);
-lean_ctor_set(x_120, 1, x_110);
-lean_ctor_set(x_120, 2, x_111);
-lean_ctor_set(x_120, 3, x_118);
-lean_ctor_set(x_120, 4, x_113);
-lean_ctor_set(x_120, 5, x_114);
-lean_ctor_set(x_120, 6, x_115);
-lean_ctor_set_uint8(x_120, sizeof(void*)*7, x_109);
-x_121 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_96, x_120);
-x_122 = lean_update_env_attributes(x_121, x_119);
-if (lean_obj_tag(x_122) == 0)
+lean_ctor_set(x_118, 0, x_107);
+lean_ctor_set(x_118, 1, x_109);
+lean_ctor_set(x_118, 2, x_110);
+lean_ctor_set(x_118, 3, x_116);
+lean_ctor_set(x_118, 4, x_112);
+lean_ctor_set(x_118, 5, x_113);
+lean_ctor_set_uint8(x_118, sizeof(void*)*6, x_108);
+x_119 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_95, x_118);
+x_120 = lean_update_env_attributes(x_119, x_117);
+if (lean_obj_tag(x_120) == 0)
 {
-lean_object* x_123; lean_object* x_124; 
-x_123 = lean_ctor_get(x_122, 0);
-lean_inc(x_123);
-x_124 = lean_ctor_get(x_122, 1);
-lean_inc(x_124);
-lean_dec_ref(x_122);
-x_6 = x_123;
-x_7 = x_124;
+lean_object* x_121; lean_object* x_122; 
+x_121 = lean_ctor_get(x_120, 0);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_120, 1);
+lean_inc(x_122);
+lean_dec_ref(x_120);
+x_6 = x_121;
+x_7 = x_122;
 goto block_11;
 }
 else
@@ -21131,41 +20990,41 @@ else
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-return x_122;
+return x_120;
 }
 }
 }
 }
 else
 {
-lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; 
-lean_dec(x_99);
-lean_dec(x_96);
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
+lean_dec(x_98);
+lean_dec(x_95);
 lean_dec(x_24);
 lean_dec(x_21);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_129 = lean_ctor_get(x_101, 0);
-lean_inc(x_129);
-x_130 = lean_ctor_get(x_101, 1);
-lean_inc(x_130);
-if (lean_is_exclusive(x_101)) {
- lean_ctor_release(x_101, 0);
- lean_ctor_release(x_101, 1);
- x_131 = x_101;
+x_127 = lean_ctor_get(x_100, 0);
+lean_inc(x_127);
+x_128 = lean_ctor_get(x_100, 1);
+lean_inc(x_128);
+if (lean_is_exclusive(x_100)) {
+ lean_ctor_release(x_100, 0);
+ lean_ctor_release(x_100, 1);
+ x_129 = x_100;
 } else {
- lean_dec_ref(x_101);
- x_131 = lean_box(0);
+ lean_dec_ref(x_100);
+ x_129 = lean_box(0);
 }
-if (lean_is_scalar(x_131)) {
- x_132 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_129)) {
+ x_130 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_132 = x_131;
+ x_130 = x_129;
 }
-lean_ctor_set(x_132, 0, x_129);
-lean_ctor_set(x_132, 1, x_130);
-return x_132;
+lean_ctor_set(x_130, 0, x_127);
+lean_ctor_set(x_130, 1, x_128);
+return x_130;
 }
 }
 else
@@ -21175,13 +21034,13 @@ lean_dec(x_21);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-return x_95;
+return x_94;
 }
 }
 else
 {
-lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; 
-lean_dec_ref(x_89);
+lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+lean_dec_ref(x_88);
 lean_dec_ref(x_27);
 lean_dec(x_24);
 lean_dec(x_21);
@@ -21189,32 +21048,32 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_133 = lean_ctor_get(x_90, 0);
-lean_inc(x_133);
-x_134 = lean_ctor_get(x_90, 1);
-lean_inc(x_134);
-if (lean_is_exclusive(x_90)) {
- lean_ctor_release(x_90, 0);
- lean_ctor_release(x_90, 1);
- x_135 = x_90;
+x_131 = lean_ctor_get(x_89, 0);
+lean_inc(x_131);
+x_132 = lean_ctor_get(x_89, 1);
+lean_inc(x_132);
+if (lean_is_exclusive(x_89)) {
+ lean_ctor_release(x_89, 0);
+ lean_ctor_release(x_89, 1);
+ x_133 = x_89;
 } else {
- lean_dec_ref(x_90);
- x_135 = lean_box(0);
+ lean_dec_ref(x_89);
+ x_133 = lean_box(0);
 }
-if (lean_is_scalar(x_135)) {
- x_136 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_133)) {
+ x_134 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_136 = x_135;
+ x_134 = x_133;
 }
-lean_ctor_set(x_136, 0, x_133);
-lean_ctor_set(x_136, 1, x_134);
-return x_136;
+lean_ctor_set(x_134, 0, x_131);
+lean_ctor_set(x_134, 1, x_132);
+return x_134;
 }
 }
 }
 else
 {
-uint8_t x_137; 
+uint8_t x_135; 
 lean_free_object(x_19);
 lean_dec(x_21);
 lean_dec(x_15);
@@ -21222,210 +21081,206 @@ lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_137 = !lean_is_exclusive(x_23);
-if (x_137 == 0)
+x_135 = !lean_is_exclusive(x_23);
+if (x_135 == 0)
 {
 return x_23;
 }
 else
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_23, 0);
-x_139 = lean_ctor_get(x_23, 1);
-lean_inc(x_139);
-lean_inc(x_138);
+lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+x_136 = lean_ctor_get(x_23, 0);
+x_137 = lean_ctor_get(x_23, 1);
+lean_inc(x_137);
+lean_inc(x_136);
 lean_dec(x_23);
-x_140 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_140, 0, x_138);
-lean_ctor_set(x_140, 1, x_139);
-return x_140;
+x_138 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_138, 0, x_136);
+lean_ctor_set(x_138, 1, x_137);
+return x_138;
 }
 }
 }
 else
 {
-lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_141 = lean_ctor_get(x_19, 0);
-x_142 = lean_ctor_get(x_19, 1);
-lean_inc(x_142);
-lean_inc(x_141);
+lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+x_139 = lean_ctor_get(x_19, 0);
+x_140 = lean_ctor_get(x_19, 1);
+lean_inc(x_140);
+lean_inc(x_139);
 lean_dec(x_19);
-x_143 = lean_get_num_attributes(x_142);
-if (lean_obj_tag(x_143) == 0)
+x_141 = lean_get_num_attributes(x_140);
+if (lean_obj_tag(x_141) == 0)
 {
-lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; uint8_t x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
-x_144 = lean_ctor_get(x_143, 0);
-lean_inc(x_144);
-x_145 = lean_ctor_get(x_143, 1);
-lean_inc(x_145);
-lean_dec_ref(x_143);
-x_146 = lean_array_fget(x_15, x_3);
+lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; uint8_t x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+x_142 = lean_ctor_get(x_141, 0);
+lean_inc(x_142);
+x_143 = lean_ctor_get(x_141, 1);
+lean_inc(x_143);
+lean_dec_ref(x_141);
+x_144 = lean_array_fget(x_15, x_3);
 lean_dec(x_15);
-x_147 = lean_ctor_get(x_146, 0);
-lean_inc_ref(x_147);
-x_148 = lean_ctor_get(x_146, 2);
-lean_inc_ref(x_148);
-lean_dec_ref(x_146);
-x_149 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___closed__0;
-x_150 = 1;
+x_145 = lean_ctor_get(x_144, 0);
+lean_inc_ref(x_145);
+x_146 = lean_ctor_get(x_144, 2);
+lean_inc_ref(x_146);
+lean_dec_ref(x_144);
+x_147 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___closed__0;
+x_148 = 1;
 lean_inc_ref(x_4);
-x_151 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg(x_149, x_147, x_4, x_150);
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc_ref(x_152);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- x_153 = x_151;
+x_149 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg(x_147, x_145, x_4, x_148);
+x_150 = lean_ctor_get(x_149, 0);
+lean_inc_ref(x_150);
+if (lean_is_exclusive(x_149)) {
+ lean_ctor_release(x_149, 0);
+ lean_ctor_release(x_149, 1);
+ x_151 = x_149;
 } else {
- lean_dec_ref(x_151);
- x_153 = lean_box(0);
+ lean_dec_ref(x_149);
+ x_151 = lean_box(0);
 }
 lean_inc(x_2);
 lean_inc_ref(x_4);
-x_154 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_154, 0, x_4);
-lean_ctor_set(x_154, 1, x_2);
-lean_inc_ref(x_152);
-x_155 = lean_apply_3(x_148, x_152, x_154, x_145);
-if (lean_obj_tag(x_155) == 0)
+x_152 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_152, 0, x_4);
+lean_ctor_set(x_152, 1, x_2);
+lean_inc_ref(x_150);
+x_153 = lean_apply_3(x_146, x_150, x_152, x_143);
+if (lean_obj_tag(x_153) == 0)
 {
-lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
-x_156 = lean_ctor_get(x_155, 0);
-lean_inc(x_156);
-x_157 = lean_ctor_get(x_155, 1);
-lean_inc(x_157);
-lean_dec_ref(x_155);
-if (lean_is_scalar(x_153)) {
- x_158 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
+x_154 = lean_ctor_get(x_153, 0);
+lean_inc(x_154);
+x_155 = lean_ctor_get(x_153, 1);
+lean_inc(x_155);
+lean_dec_ref(x_153);
+if (lean_is_scalar(x_151)) {
+ x_156 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_158 = x_153;
+ x_156 = x_151;
 }
-lean_ctor_set(x_158, 0, x_152);
-lean_ctor_set(x_158, 1, x_156);
-x_159 = l_Lean_EnvExtension_setState___redArg(x_147, x_4, x_158);
-x_160 = l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize(x_159, x_157);
-if (lean_obj_tag(x_160) == 0)
+lean_ctor_set(x_156, 0, x_150);
+lean_ctor_set(x_156, 1, x_154);
+x_157 = l_Lean_EnvExtension_setState___redArg(x_145, x_4, x_156);
+x_158 = l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize(x_157, x_155);
+if (lean_obj_tag(x_158) == 0)
 {
-lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
-x_161 = lean_ctor_get(x_160, 0);
-lean_inc(x_161);
-x_162 = lean_ctor_get(x_160, 1);
+lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_159 = lean_ctor_get(x_158, 0);
+lean_inc(x_159);
+x_160 = lean_ctor_get(x_158, 1);
+lean_inc(x_160);
+lean_dec_ref(x_158);
+x_161 = lean_st_ref_get(x_12, x_160);
+x_162 = lean_ctor_get(x_161, 0);
 lean_inc(x_162);
-lean_dec_ref(x_160);
-x_163 = lean_st_ref_get(x_12, x_162);
-x_164 = lean_ctor_get(x_163, 0);
-lean_inc(x_164);
-x_165 = lean_ctor_get(x_163, 1);
+x_163 = lean_ctor_get(x_161, 1);
+lean_inc(x_163);
+lean_dec_ref(x_161);
+x_164 = lean_get_num_attributes(x_163);
+if (lean_obj_tag(x_164) == 0)
+{
+lean_object* x_165; lean_object* x_166; lean_object* x_167; uint8_t x_168; lean_object* x_188; uint8_t x_189; 
+x_165 = lean_ctor_get(x_164, 0);
 lean_inc(x_165);
-lean_dec_ref(x_163);
-x_166 = lean_get_num_attributes(x_165);
-if (lean_obj_tag(x_166) == 0)
+x_166 = lean_ctor_get(x_164, 1);
+lean_inc(x_166);
+lean_dec_ref(x_164);
+x_167 = lean_array_get_size(x_139);
+lean_dec(x_139);
+x_188 = lean_array_get_size(x_162);
+lean_dec(x_162);
+x_189 = lean_nat_dec_lt(x_167, x_188);
+lean_dec(x_188);
+if (x_189 == 0)
 {
-lean_object* x_167; lean_object* x_168; lean_object* x_169; uint8_t x_170; lean_object* x_191; uint8_t x_192; 
-x_167 = lean_ctor_get(x_166, 0);
-lean_inc(x_167);
-x_168 = lean_ctor_get(x_166, 1);
-lean_inc(x_168);
-lean_dec_ref(x_166);
-x_169 = lean_array_get_size(x_141);
-lean_dec(x_141);
-x_191 = lean_array_get_size(x_164);
-lean_dec(x_164);
-x_192 = lean_nat_dec_lt(x_169, x_191);
-lean_dec(x_191);
-if (x_192 == 0)
-{
-uint8_t x_193; 
-x_193 = lean_nat_dec_lt(x_144, x_167);
-lean_dec(x_167);
-lean_dec(x_144);
-x_170 = x_193;
-goto block_190;
+uint8_t x_190; 
+x_190 = lean_nat_dec_lt(x_142, x_165);
+lean_dec(x_165);
+lean_dec(x_142);
+x_168 = x_190;
+goto block_187;
 }
 else
 {
-lean_dec(x_167);
-lean_dec(x_144);
-x_170 = x_192;
-goto block_190;
+lean_dec(x_165);
+lean_dec(x_142);
+x_168 = x_189;
+goto block_187;
 }
-block_190:
+block_187:
 {
-if (x_170 == 0)
+if (x_168 == 0)
 {
-lean_dec(x_169);
-x_6 = x_161;
-x_7 = x_168;
+lean_dec(x_167);
+x_6 = x_159;
+x_7 = x_166;
 goto block_11;
 }
 else
 {
-lean_object* x_171; lean_object* x_172; lean_object* x_173; uint8_t x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
-x_171 = lean_ctor_get(x_161, 0);
+lean_object* x_169; lean_object* x_170; lean_object* x_171; uint8_t x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; 
+x_169 = lean_ctor_get(x_159, 0);
+lean_inc_ref(x_169);
+x_170 = lean_ctor_get(x_169, 0);
+lean_inc(x_170);
+lean_dec_ref(x_169);
+x_171 = lean_ctor_get(x_170, 0);
 lean_inc_ref(x_171);
-x_172 = lean_ctor_get(x_171, 0);
-lean_inc(x_172);
-lean_dec_ref(x_171);
-x_173 = lean_ctor_get(x_172, 0);
+x_172 = lean_ctor_get_uint8(x_170, sizeof(void*)*6);
+x_173 = lean_ctor_get(x_170, 1);
 lean_inc_ref(x_173);
-x_174 = lean_ctor_get_uint8(x_172, sizeof(void*)*7);
-x_175 = lean_ctor_get(x_172, 1);
+x_174 = lean_ctor_get(x_170, 2);
+lean_inc_ref(x_174);
+x_175 = lean_ctor_get(x_170, 3);
 lean_inc_ref(x_175);
-x_176 = lean_ctor_get(x_172, 2);
+x_176 = lean_ctor_get(x_170, 4);
 lean_inc_ref(x_176);
-x_177 = lean_ctor_get(x_172, 3);
+x_177 = lean_ctor_get(x_170, 5);
 lean_inc_ref(x_177);
-x_178 = lean_ctor_get(x_172, 4);
-lean_inc_ref(x_178);
-x_179 = lean_ctor_get(x_172, 5);
-lean_inc(x_179);
-x_180 = lean_ctor_get(x_172, 6);
-lean_inc_ref(x_180);
-if (lean_is_exclusive(x_172)) {
- lean_ctor_release(x_172, 0);
- lean_ctor_release(x_172, 1);
- lean_ctor_release(x_172, 2);
- lean_ctor_release(x_172, 3);
- lean_ctor_release(x_172, 4);
- lean_ctor_release(x_172, 5);
- lean_ctor_release(x_172, 6);
- x_181 = x_172;
+if (lean_is_exclusive(x_170)) {
+ lean_ctor_release(x_170, 0);
+ lean_ctor_release(x_170, 1);
+ lean_ctor_release(x_170, 2);
+ lean_ctor_release(x_170, 3);
+ lean_ctor_release(x_170, 4);
+ lean_ctor_release(x_170, 5);
+ x_178 = x_170;
 } else {
- lean_dec_ref(x_172);
- x_181 = lean_box(0);
+ lean_dec_ref(x_170);
+ x_178 = lean_box(0);
 }
 lean_inc_ref(x_1);
-x_182 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_177, x_1, x_169, x_168);
-x_183 = lean_ctor_get(x_182, 0);
-lean_inc(x_183);
-x_184 = lean_ctor_get(x_182, 1);
-lean_inc(x_184);
-lean_dec_ref(x_182);
-if (lean_is_scalar(x_181)) {
- x_185 = lean_alloc_ctor(0, 7, 1);
+x_179 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_175, x_1, x_167, x_166);
+x_180 = lean_ctor_get(x_179, 0);
+lean_inc(x_180);
+x_181 = lean_ctor_get(x_179, 1);
+lean_inc(x_181);
+lean_dec_ref(x_179);
+if (lean_is_scalar(x_178)) {
+ x_182 = lean_alloc_ctor(0, 6, 1);
 } else {
- x_185 = x_181;
+ x_182 = x_178;
 }
-lean_ctor_set(x_185, 0, x_173);
-lean_ctor_set(x_185, 1, x_175);
-lean_ctor_set(x_185, 2, x_176);
-lean_ctor_set(x_185, 3, x_183);
-lean_ctor_set(x_185, 4, x_178);
-lean_ctor_set(x_185, 5, x_179);
-lean_ctor_set(x_185, 6, x_180);
-lean_ctor_set_uint8(x_185, sizeof(void*)*7, x_174);
-x_186 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_161, x_185);
-x_187 = lean_update_env_attributes(x_186, x_184);
-if (lean_obj_tag(x_187) == 0)
+lean_ctor_set(x_182, 0, x_171);
+lean_ctor_set(x_182, 1, x_173);
+lean_ctor_set(x_182, 2, x_174);
+lean_ctor_set(x_182, 3, x_180);
+lean_ctor_set(x_182, 4, x_176);
+lean_ctor_set(x_182, 5, x_177);
+lean_ctor_set_uint8(x_182, sizeof(void*)*6, x_172);
+x_183 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_159, x_182);
+x_184 = lean_update_env_attributes(x_183, x_181);
+if (lean_obj_tag(x_184) == 0)
 {
-lean_object* x_188; lean_object* x_189; 
-x_188 = lean_ctor_get(x_187, 0);
-lean_inc(x_188);
-x_189 = lean_ctor_get(x_187, 1);
-lean_inc(x_189);
-lean_dec_ref(x_187);
-x_6 = x_188;
-x_7 = x_189;
+lean_object* x_185; lean_object* x_186; 
+x_185 = lean_ctor_get(x_184, 0);
+lean_inc(x_185);
+x_186 = lean_ctor_get(x_184, 1);
+lean_inc(x_186);
+lean_dec_ref(x_184);
+x_6 = x_185;
+x_7 = x_186;
 goto block_11;
 }
 else
@@ -21433,339 +21288,335 @@ else
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-return x_187;
+return x_184;
 }
 }
 }
 }
 else
 {
-lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; 
-lean_dec(x_164);
-lean_dec(x_161);
-lean_dec(x_144);
-lean_dec(x_141);
+lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+lean_dec(x_162);
+lean_dec(x_159);
+lean_dec(x_142);
+lean_dec(x_139);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_194 = lean_ctor_get(x_166, 0);
-lean_inc(x_194);
-x_195 = lean_ctor_get(x_166, 1);
-lean_inc(x_195);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_196 = x_166;
+x_191 = lean_ctor_get(x_164, 0);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_164, 1);
+lean_inc(x_192);
+if (lean_is_exclusive(x_164)) {
+ lean_ctor_release(x_164, 0);
+ lean_ctor_release(x_164, 1);
+ x_193 = x_164;
 } else {
- lean_dec_ref(x_166);
- x_196 = lean_box(0);
+ lean_dec_ref(x_164);
+ x_193 = lean_box(0);
 }
-if (lean_is_scalar(x_196)) {
- x_197 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_193)) {
+ x_194 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_197 = x_196;
+ x_194 = x_193;
 }
-lean_ctor_set(x_197, 0, x_194);
-lean_ctor_set(x_197, 1, x_195);
-return x_197;
+lean_ctor_set(x_194, 0, x_191);
+lean_ctor_set(x_194, 1, x_192);
+return x_194;
 }
 }
 else
 {
-lean_dec(x_144);
-lean_dec(x_141);
+lean_dec(x_142);
+lean_dec(x_139);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-return x_160;
+return x_158;
 }
 }
 else
 {
-lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; 
-lean_dec(x_153);
-lean_dec_ref(x_152);
-lean_dec_ref(x_147);
-lean_dec(x_144);
-lean_dec(x_141);
+lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+lean_dec(x_151);
+lean_dec_ref(x_150);
+lean_dec_ref(x_145);
+lean_dec(x_142);
+lean_dec(x_139);
 lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_198 = lean_ctor_get(x_155, 0);
-lean_inc(x_198);
-x_199 = lean_ctor_get(x_155, 1);
-lean_inc(x_199);
-if (lean_is_exclusive(x_155)) {
- lean_ctor_release(x_155, 0);
- lean_ctor_release(x_155, 1);
- x_200 = x_155;
+x_195 = lean_ctor_get(x_153, 0);
+lean_inc(x_195);
+x_196 = lean_ctor_get(x_153, 1);
+lean_inc(x_196);
+if (lean_is_exclusive(x_153)) {
+ lean_ctor_release(x_153, 0);
+ lean_ctor_release(x_153, 1);
+ x_197 = x_153;
 } else {
- lean_dec_ref(x_155);
- x_200 = lean_box(0);
+ lean_dec_ref(x_153);
+ x_197 = lean_box(0);
 }
-if (lean_is_scalar(x_200)) {
- x_201 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_197)) {
+ x_198 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_201 = x_200;
+ x_198 = x_197;
 }
-lean_ctor_set(x_201, 0, x_198);
-lean_ctor_set(x_201, 1, x_199);
-return x_201;
+lean_ctor_set(x_198, 0, x_195);
+lean_ctor_set(x_198, 1, x_196);
+return x_198;
 }
 }
 else
 {
-lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; 
-lean_dec(x_141);
+lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+lean_dec(x_139);
 lean_dec(x_15);
 lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_202 = lean_ctor_get(x_143, 0);
-lean_inc(x_202);
-x_203 = lean_ctor_get(x_143, 1);
-lean_inc(x_203);
-if (lean_is_exclusive(x_143)) {
- lean_ctor_release(x_143, 0);
- lean_ctor_release(x_143, 1);
- x_204 = x_143;
+x_199 = lean_ctor_get(x_141, 0);
+lean_inc(x_199);
+x_200 = lean_ctor_get(x_141, 1);
+lean_inc(x_200);
+if (lean_is_exclusive(x_141)) {
+ lean_ctor_release(x_141, 0);
+ lean_ctor_release(x_141, 1);
+ x_201 = x_141;
 } else {
- lean_dec_ref(x_143);
- x_204 = lean_box(0);
+ lean_dec_ref(x_141);
+ x_201 = lean_box(0);
 }
-if (lean_is_scalar(x_204)) {
- x_205 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_201)) {
+ x_202 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_205 = x_204;
+ x_202 = x_201;
 }
-lean_ctor_set(x_205, 0, x_202);
-lean_ctor_set(x_205, 1, x_203);
-return x_205;
+lean_ctor_set(x_202, 0, x_199);
+lean_ctor_set(x_202, 1, x_200);
+return x_202;
 }
 }
 }
 }
 else
 {
-lean_object* x_206; lean_object* x_207; lean_object* x_208; uint8_t x_209; 
-x_206 = lean_ctor_get(x_13, 0);
-x_207 = lean_ctor_get(x_13, 1);
-lean_inc(x_207);
-lean_inc(x_206);
+lean_object* x_203; lean_object* x_204; lean_object* x_205; uint8_t x_206; 
+x_203 = lean_ctor_get(x_13, 0);
+x_204 = lean_ctor_get(x_13, 1);
+lean_inc(x_204);
+lean_inc(x_203);
 lean_dec(x_13);
-x_208 = lean_array_get_size(x_206);
-x_209 = lean_nat_dec_lt(x_3, x_208);
-lean_dec(x_208);
-if (x_209 == 0)
+x_205 = lean_array_get_size(x_203);
+x_206 = lean_nat_dec_lt(x_3, x_205);
+lean_dec(x_205);
+if (x_206 == 0)
 {
-lean_object* x_210; 
-lean_dec(x_206);
+lean_object* x_207; 
+lean_dec(x_203);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_210 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_210, 0, x_4);
-lean_ctor_set(x_210, 1, x_207);
-return x_210;
+x_207 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_207, 0, x_4);
+lean_ctor_set(x_207, 1, x_204);
+return x_207;
 }
 else
 {
-lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; 
-x_211 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lam__0(x_12, x_207);
-x_212 = lean_ctor_get(x_211, 0);
-lean_inc(x_212);
-x_213 = lean_ctor_get(x_211, 1);
-lean_inc(x_213);
-if (lean_is_exclusive(x_211)) {
- lean_ctor_release(x_211, 0);
- lean_ctor_release(x_211, 1);
- x_214 = x_211;
+lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; 
+x_208 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___lam__0(x_12, x_204);
+x_209 = lean_ctor_get(x_208, 0);
+lean_inc(x_209);
+x_210 = lean_ctor_get(x_208, 1);
+lean_inc(x_210);
+if (lean_is_exclusive(x_208)) {
+ lean_ctor_release(x_208, 0);
+ lean_ctor_release(x_208, 1);
+ x_211 = x_208;
 } else {
- lean_dec_ref(x_211);
- x_214 = lean_box(0);
+ lean_dec_ref(x_208);
+ x_211 = lean_box(0);
 }
-x_215 = lean_get_num_attributes(x_213);
-if (lean_obj_tag(x_215) == 0)
+x_212 = lean_get_num_attributes(x_210);
+if (lean_obj_tag(x_212) == 0)
 {
-lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; uint8_t x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; 
+lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; uint8_t x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; 
+x_213 = lean_ctor_get(x_212, 0);
+lean_inc(x_213);
+x_214 = lean_ctor_get(x_212, 1);
+lean_inc(x_214);
+lean_dec_ref(x_212);
+x_215 = lean_array_fget(x_203, x_3);
+lean_dec(x_203);
 x_216 = lean_ctor_get(x_215, 0);
-lean_inc(x_216);
-x_217 = lean_ctor_get(x_215, 1);
-lean_inc(x_217);
+lean_inc_ref(x_216);
+x_217 = lean_ctor_get(x_215, 2);
+lean_inc_ref(x_217);
 lean_dec_ref(x_215);
-x_218 = lean_array_fget(x_206, x_3);
-lean_dec(x_206);
-x_219 = lean_ctor_get(x_218, 0);
-lean_inc_ref(x_219);
-x_220 = lean_ctor_get(x_218, 2);
-lean_inc_ref(x_220);
-lean_dec_ref(x_218);
-x_221 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___closed__0;
-x_222 = 1;
+x_218 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop___closed__0;
+x_219 = 1;
 lean_inc_ref(x_4);
-x_223 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg(x_221, x_219, x_4, x_222);
-x_224 = lean_ctor_get(x_223, 0);
-lean_inc_ref(x_224);
-if (lean_is_exclusive(x_223)) {
- lean_ctor_release(x_223, 0);
- lean_ctor_release(x_223, 1);
- x_225 = x_223;
+x_220 = l___private_Lean_Environment_0__Lean_EnvExtension_getStateUnsafe___redArg(x_218, x_216, x_4, x_219);
+x_221 = lean_ctor_get(x_220, 0);
+lean_inc_ref(x_221);
+if (lean_is_exclusive(x_220)) {
+ lean_ctor_release(x_220, 0);
+ lean_ctor_release(x_220, 1);
+ x_222 = x_220;
 } else {
- lean_dec_ref(x_223);
- x_225 = lean_box(0);
+ lean_dec_ref(x_220);
+ x_222 = lean_box(0);
 }
 lean_inc(x_2);
 lean_inc_ref(x_4);
-if (lean_is_scalar(x_214)) {
- x_226 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_211)) {
+ x_223 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_226 = x_214;
+ x_223 = x_211;
 }
-lean_ctor_set(x_226, 0, x_4);
-lean_ctor_set(x_226, 1, x_2);
-lean_inc_ref(x_224);
-x_227 = lean_apply_3(x_220, x_224, x_226, x_217);
-if (lean_obj_tag(x_227) == 0)
+lean_ctor_set(x_223, 0, x_4);
+lean_ctor_set(x_223, 1, x_2);
+lean_inc_ref(x_221);
+x_224 = lean_apply_3(x_217, x_221, x_223, x_214);
+if (lean_obj_tag(x_224) == 0)
 {
-lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; 
-x_228 = lean_ctor_get(x_227, 0);
-lean_inc(x_228);
-x_229 = lean_ctor_get(x_227, 1);
-lean_inc(x_229);
-lean_dec_ref(x_227);
-if (lean_is_scalar(x_225)) {
- x_230 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; 
+x_225 = lean_ctor_get(x_224, 0);
+lean_inc(x_225);
+x_226 = lean_ctor_get(x_224, 1);
+lean_inc(x_226);
+lean_dec_ref(x_224);
+if (lean_is_scalar(x_222)) {
+ x_227 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_230 = x_225;
+ x_227 = x_222;
 }
-lean_ctor_set(x_230, 0, x_224);
-lean_ctor_set(x_230, 1, x_228);
-x_231 = l_Lean_EnvExtension_setState___redArg(x_219, x_4, x_230);
-x_232 = l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize(x_231, x_229);
-if (lean_obj_tag(x_232) == 0)
+lean_ctor_set(x_227, 0, x_221);
+lean_ctor_set(x_227, 1, x_225);
+x_228 = l_Lean_EnvExtension_setState___redArg(x_216, x_4, x_227);
+x_229 = l___private_Lean_Environment_0__Lean_ensureExtensionsArraySize(x_228, x_226);
+if (lean_obj_tag(x_229) == 0)
 {
-lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; 
+lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; 
+x_230 = lean_ctor_get(x_229, 0);
+lean_inc(x_230);
+x_231 = lean_ctor_get(x_229, 1);
+lean_inc(x_231);
+lean_dec_ref(x_229);
+x_232 = lean_st_ref_get(x_12, x_231);
 x_233 = lean_ctor_get(x_232, 0);
 lean_inc(x_233);
 x_234 = lean_ctor_get(x_232, 1);
 lean_inc(x_234);
 lean_dec_ref(x_232);
-x_235 = lean_st_ref_get(x_12, x_234);
+x_235 = lean_get_num_attributes(x_234);
+if (lean_obj_tag(x_235) == 0)
+{
+lean_object* x_236; lean_object* x_237; lean_object* x_238; uint8_t x_239; lean_object* x_259; uint8_t x_260; 
 x_236 = lean_ctor_get(x_235, 0);
 lean_inc(x_236);
 x_237 = lean_ctor_get(x_235, 1);
 lean_inc(x_237);
 lean_dec_ref(x_235);
-x_238 = lean_get_num_attributes(x_237);
-if (lean_obj_tag(x_238) == 0)
+x_238 = lean_array_get_size(x_209);
+lean_dec(x_209);
+x_259 = lean_array_get_size(x_233);
+lean_dec(x_233);
+x_260 = lean_nat_dec_lt(x_238, x_259);
+lean_dec(x_259);
+if (x_260 == 0)
 {
-lean_object* x_239; lean_object* x_240; lean_object* x_241; uint8_t x_242; lean_object* x_263; uint8_t x_264; 
-x_239 = lean_ctor_get(x_238, 0);
-lean_inc(x_239);
-x_240 = lean_ctor_get(x_238, 1);
-lean_inc(x_240);
-lean_dec_ref(x_238);
-x_241 = lean_array_get_size(x_212);
-lean_dec(x_212);
-x_263 = lean_array_get_size(x_236);
+uint8_t x_261; 
+x_261 = lean_nat_dec_lt(x_213, x_236);
 lean_dec(x_236);
-x_264 = lean_nat_dec_lt(x_241, x_263);
-lean_dec(x_263);
-if (x_264 == 0)
-{
-uint8_t x_265; 
-x_265 = lean_nat_dec_lt(x_216, x_239);
-lean_dec(x_239);
-lean_dec(x_216);
-x_242 = x_265;
-goto block_262;
+lean_dec(x_213);
+x_239 = x_261;
+goto block_258;
 }
 else
 {
-lean_dec(x_239);
-lean_dec(x_216);
-x_242 = x_264;
-goto block_262;
+lean_dec(x_236);
+lean_dec(x_213);
+x_239 = x_260;
+goto block_258;
 }
-block_262:
+block_258:
 {
-if (x_242 == 0)
+if (x_239 == 0)
 {
-lean_dec(x_241);
-x_6 = x_233;
-x_7 = x_240;
+lean_dec(x_238);
+x_6 = x_230;
+x_7 = x_237;
 goto block_11;
 }
 else
 {
-lean_object* x_243; lean_object* x_244; lean_object* x_245; uint8_t x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; 
-x_243 = lean_ctor_get(x_233, 0);
-lean_inc_ref(x_243);
-x_244 = lean_ctor_get(x_243, 0);
-lean_inc(x_244);
-lean_dec_ref(x_243);
-x_245 = lean_ctor_get(x_244, 0);
+lean_object* x_240; lean_object* x_241; lean_object* x_242; uint8_t x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; 
+x_240 = lean_ctor_get(x_230, 0);
+lean_inc_ref(x_240);
+x_241 = lean_ctor_get(x_240, 0);
+lean_inc(x_241);
+lean_dec_ref(x_240);
+x_242 = lean_ctor_get(x_241, 0);
+lean_inc_ref(x_242);
+x_243 = lean_ctor_get_uint8(x_241, sizeof(void*)*6);
+x_244 = lean_ctor_get(x_241, 1);
+lean_inc_ref(x_244);
+x_245 = lean_ctor_get(x_241, 2);
 lean_inc_ref(x_245);
-x_246 = lean_ctor_get_uint8(x_244, sizeof(void*)*7);
-x_247 = lean_ctor_get(x_244, 1);
+x_246 = lean_ctor_get(x_241, 3);
+lean_inc_ref(x_246);
+x_247 = lean_ctor_get(x_241, 4);
 lean_inc_ref(x_247);
-x_248 = lean_ctor_get(x_244, 2);
+x_248 = lean_ctor_get(x_241, 5);
 lean_inc_ref(x_248);
-x_249 = lean_ctor_get(x_244, 3);
-lean_inc_ref(x_249);
-x_250 = lean_ctor_get(x_244, 4);
-lean_inc_ref(x_250);
-x_251 = lean_ctor_get(x_244, 5);
-lean_inc(x_251);
-x_252 = lean_ctor_get(x_244, 6);
-lean_inc_ref(x_252);
-if (lean_is_exclusive(x_244)) {
- lean_ctor_release(x_244, 0);
- lean_ctor_release(x_244, 1);
- lean_ctor_release(x_244, 2);
- lean_ctor_release(x_244, 3);
- lean_ctor_release(x_244, 4);
- lean_ctor_release(x_244, 5);
- lean_ctor_release(x_244, 6);
- x_253 = x_244;
+if (lean_is_exclusive(x_241)) {
+ lean_ctor_release(x_241, 0);
+ lean_ctor_release(x_241, 1);
+ lean_ctor_release(x_241, 2);
+ lean_ctor_release(x_241, 3);
+ lean_ctor_release(x_241, 4);
+ lean_ctor_release(x_241, 5);
+ x_249 = x_241;
 } else {
- lean_dec_ref(x_244);
- x_253 = lean_box(0);
+ lean_dec_ref(x_241);
+ x_249 = lean_box(0);
 }
 lean_inc_ref(x_1);
-x_254 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_249, x_1, x_241, x_240);
-x_255 = lean_ctor_get(x_254, 0);
-lean_inc(x_255);
-x_256 = lean_ctor_get(x_254, 1);
-lean_inc(x_256);
-lean_dec_ref(x_254);
-if (lean_is_scalar(x_253)) {
- x_257 = lean_alloc_ctor(0, 7, 1);
+x_250 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_246, x_1, x_238, x_237);
+x_251 = lean_ctor_get(x_250, 0);
+lean_inc(x_251);
+x_252 = lean_ctor_get(x_250, 1);
+lean_inc(x_252);
+lean_dec_ref(x_250);
+if (lean_is_scalar(x_249)) {
+ x_253 = lean_alloc_ctor(0, 6, 1);
 } else {
- x_257 = x_253;
+ x_253 = x_249;
 }
-lean_ctor_set(x_257, 0, x_245);
-lean_ctor_set(x_257, 1, x_247);
-lean_ctor_set(x_257, 2, x_248);
-lean_ctor_set(x_257, 3, x_255);
-lean_ctor_set(x_257, 4, x_250);
-lean_ctor_set(x_257, 5, x_251);
-lean_ctor_set(x_257, 6, x_252);
-lean_ctor_set_uint8(x_257, sizeof(void*)*7, x_246);
-x_258 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_233, x_257);
-x_259 = lean_update_env_attributes(x_258, x_256);
-if (lean_obj_tag(x_259) == 0)
+lean_ctor_set(x_253, 0, x_242);
+lean_ctor_set(x_253, 1, x_244);
+lean_ctor_set(x_253, 2, x_245);
+lean_ctor_set(x_253, 3, x_251);
+lean_ctor_set(x_253, 4, x_247);
+lean_ctor_set(x_253, 5, x_248);
+lean_ctor_set_uint8(x_253, sizeof(void*)*6, x_243);
+x_254 = l___private_Lean_Environment_0__Lean_Environment_setCheckedSync(x_230, x_253);
+x_255 = lean_update_env_attributes(x_254, x_252);
+if (lean_obj_tag(x_255) == 0)
 {
-lean_object* x_260; lean_object* x_261; 
-x_260 = lean_ctor_get(x_259, 0);
-lean_inc(x_260);
-x_261 = lean_ctor_get(x_259, 1);
-lean_inc(x_261);
-lean_dec_ref(x_259);
-x_6 = x_260;
-x_7 = x_261;
+lean_object* x_256; lean_object* x_257; 
+x_256 = lean_ctor_get(x_255, 0);
+lean_inc(x_256);
+x_257 = lean_ctor_get(x_255, 1);
+lean_inc(x_257);
+lean_dec_ref(x_255);
+x_6 = x_256;
+x_7 = x_257;
 goto block_11;
 }
 else
@@ -21773,31 +21624,75 @@ else
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-return x_259;
+return x_255;
 }
 }
 }
 }
 else
 {
+lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; 
+lean_dec(x_233);
+lean_dec(x_230);
+lean_dec(x_213);
+lean_dec(x_209);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec_ref(x_1);
+x_262 = lean_ctor_get(x_235, 0);
+lean_inc(x_262);
+x_263 = lean_ctor_get(x_235, 1);
+lean_inc(x_263);
+if (lean_is_exclusive(x_235)) {
+ lean_ctor_release(x_235, 0);
+ lean_ctor_release(x_235, 1);
+ x_264 = x_235;
+} else {
+ lean_dec_ref(x_235);
+ x_264 = lean_box(0);
+}
+if (lean_is_scalar(x_264)) {
+ x_265 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_265 = x_264;
+}
+lean_ctor_set(x_265, 0, x_262);
+lean_ctor_set(x_265, 1, x_263);
+return x_265;
+}
+}
+else
+{
+lean_dec(x_213);
+lean_dec(x_209);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec_ref(x_1);
+return x_229;
+}
+}
+else
+{
 lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
-lean_dec(x_236);
-lean_dec(x_233);
-lean_dec(x_216);
-lean_dec(x_212);
+lean_dec(x_222);
+lean_dec_ref(x_221);
+lean_dec_ref(x_216);
+lean_dec(x_213);
+lean_dec(x_209);
+lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_266 = lean_ctor_get(x_238, 0);
+x_266 = lean_ctor_get(x_224, 0);
 lean_inc(x_266);
-x_267 = lean_ctor_get(x_238, 1);
+x_267 = lean_ctor_get(x_224, 1);
 lean_inc(x_267);
-if (lean_is_exclusive(x_238)) {
- lean_ctor_release(x_238, 0);
- lean_ctor_release(x_238, 1);
- x_268 = x_238;
+if (lean_is_exclusive(x_224)) {
+ lean_ctor_release(x_224, 0);
+ lean_ctor_release(x_224, 1);
+ x_268 = x_224;
 } else {
- lean_dec_ref(x_238);
+ lean_dec_ref(x_224);
  x_268 = lean_box(0);
 }
 if (lean_is_scalar(x_268)) {
@@ -21812,36 +21707,24 @@ return x_269;
 }
 else
 {
-lean_dec(x_216);
-lean_dec(x_212);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec_ref(x_1);
-return x_232;
-}
-}
-else
-{
 lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; 
-lean_dec(x_225);
-lean_dec_ref(x_224);
-lean_dec_ref(x_219);
-lean_dec(x_216);
-lean_dec(x_212);
+lean_dec(x_211);
+lean_dec(x_209);
+lean_dec(x_203);
 lean_dec_ref(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec_ref(x_1);
-x_270 = lean_ctor_get(x_227, 0);
+x_270 = lean_ctor_get(x_212, 0);
 lean_inc(x_270);
-x_271 = lean_ctor_get(x_227, 1);
+x_271 = lean_ctor_get(x_212, 1);
 lean_inc(x_271);
-if (lean_is_exclusive(x_227)) {
- lean_ctor_release(x_227, 0);
- lean_ctor_release(x_227, 1);
- x_272 = x_227;
+if (lean_is_exclusive(x_212)) {
+ lean_ctor_release(x_212, 0);
+ lean_ctor_release(x_212, 1);
+ x_272 = x_212;
 } else {
- lean_dec_ref(x_227);
+ lean_dec_ref(x_212);
  x_272 = lean_box(0);
 }
 if (lean_is_scalar(x_272)) {
@@ -21854,38 +21737,6 @@ lean_ctor_set(x_273, 1, x_271);
 return x_273;
 }
 }
-else
-{
-lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; 
-lean_dec(x_214);
-lean_dec(x_212);
-lean_dec(x_206);
-lean_dec_ref(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec_ref(x_1);
-x_274 = lean_ctor_get(x_215, 0);
-lean_inc(x_274);
-x_275 = lean_ctor_get(x_215, 1);
-lean_inc(x_275);
-if (lean_is_exclusive(x_215)) {
- lean_ctor_release(x_215, 0);
- lean_ctor_release(x_215, 1);
- x_276 = x_215;
-} else {
- lean_dec_ref(x_215);
- x_276 = lean_box(0);
-}
-if (lean_is_scalar(x_276)) {
- x_277 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_277 = x_276;
-}
-lean_ctor_set(x_277, 0, x_274);
-lean_ctor_set(x_277, 1, x_275);
-return x_277;
-}
-}
 }
 block_11:
 {
@@ -22062,7 +21913,7 @@ _start:
 {
 uint8_t x_3; uint8_t x_4; lean_object* x_5; 
 x_3 = 1;
-x_4 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(x_3, x_2);
+x_4 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(x_3, x_2);
 x_5 = lean_box(x_4);
 if (lean_obj_tag(x_5) == 2)
 {
@@ -22095,7 +21946,7 @@ _start:
 {
 lean_object* x_19; lean_object* x_20; uint8_t x_88; uint8_t x_89; lean_object* x_90; 
 x_88 = 1;
-x_89 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9069_(x_3, x_88);
+x_89 = l_Lean_ordOLeanLevel____x40_Lean_Environment___hyg_9024_(x_3, x_88);
 x_90 = lean_box(x_89);
 if (lean_obj_tag(x_90) == 0)
 {
@@ -23404,7 +23255,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_List_forIn_x27_loop___at___Lean_Environment_addDeclCore_spec__1___redArg___closed__1;
 x_2 = lean_unsigned_to_nat(41u);
-x_3 = lean_unsigned_to_nat(2035u);
+x_3 = lean_unsigned_to_nat(2015u);
 x_4 = l_Array_forIn_x27Unsafe_loop___at___Lean_importModulesCore_go_spec__1___redArg___closed__0;
 x_5 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_6 = l_mkPanicMessageWithDecl(x_5, x_4, x_3, x_2, x_1);
@@ -23414,7 +23265,7 @@ return x_6;
 LEAN_EXPORT lean_object* l_Array_forIn_x27Unsafe_loop___at___Lean_importModulesCore_go_spec__1___redArg(lean_object* x_1, uint8_t x_2, uint8_t x_3, lean_object* x_4, uint8_t x_5, uint8_t x_6, lean_object* x_7, size_t x_8, size_t x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_43; size_t x_44; lean_object* x_45; uint8_t x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; size_t x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; size_t x_180; uint8_t x_181; lean_object* x_182; uint8_t x_183; uint8_t x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; uint8_t x_188; size_t x_189; lean_object* x_190; lean_object* x_191; lean_object* x_194; uint8_t x_195; lean_object* x_196; size_t x_197; uint8_t x_198; lean_object* x_199; lean_object* x_200; uint8_t x_201; lean_object* x_202; size_t x_203; lean_object* x_204; uint8_t x_205; uint8_t x_206; size_t x_210; lean_object* x_211; uint8_t x_212; uint8_t x_213; lean_object* x_214; uint8_t x_215; lean_object* x_216; lean_object* x_217; uint8_t x_218; uint8_t x_219; size_t x_220; lean_object* x_221; lean_object* x_222; uint8_t x_223; lean_object* x_227; size_t x_228; uint8_t x_229; lean_object* x_230; lean_object* x_231; uint8_t x_232; lean_object* x_233; uint8_t x_234; lean_object* x_235; uint8_t x_236; size_t x_237; uint8_t x_238; lean_object* x_239; uint8_t x_240; size_t x_244; lean_object* x_245; uint8_t x_246; lean_object* x_247; uint8_t x_248; lean_object* x_249; uint8_t x_250; size_t x_251; uint8_t x_252; lean_object* x_253; uint8_t x_254; uint8_t x_265; 
+lean_object* x_13; lean_object* x_14; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; size_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; size_t x_49; lean_object* x_50; uint8_t x_51; uint8_t x_52; lean_object* x_53; size_t x_180; lean_object* x_181; uint8_t x_182; lean_object* x_183; uint8_t x_184; lean_object* x_185; uint8_t x_186; lean_object* x_187; size_t x_188; lean_object* x_189; uint8_t x_190; lean_object* x_191; size_t x_194; lean_object* x_195; lean_object* x_196; uint8_t x_197; uint8_t x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; size_t x_202; uint8_t x_203; lean_object* x_204; uint8_t x_205; uint8_t x_206; size_t x_210; lean_object* x_211; uint8_t x_212; lean_object* x_213; uint8_t x_214; lean_object* x_215; uint8_t x_216; lean_object* x_217; uint8_t x_218; size_t x_219; lean_object* x_220; uint8_t x_221; lean_object* x_222; uint8_t x_223; size_t x_227; lean_object* x_228; uint8_t x_229; uint8_t x_230; lean_object* x_231; lean_object* x_232; uint8_t x_233; size_t x_234; uint8_t x_235; lean_object* x_236; lean_object* x_237; uint8_t x_238; lean_object* x_239; uint8_t x_240; size_t x_244; lean_object* x_245; uint8_t x_246; lean_object* x_247; lean_object* x_248; uint8_t x_249; uint8_t x_250; size_t x_251; lean_object* x_252; uint8_t x_253; uint8_t x_254; uint8_t x_265; 
 x_265 = lean_usize_dec_lt(x_9, x_8);
 if (x_265 == 0)
 {
@@ -23428,7 +23279,7 @@ return x_266;
 }
 else
 {
-lean_object* x_267; lean_object* x_268; uint8_t x_269; uint8_t x_270; uint8_t x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_456; uint8_t x_457; uint8_t x_458; uint8_t x_459; uint8_t x_460; uint8_t x_461; lean_object* x_499; uint8_t x_500; uint8_t x_501; uint8_t x_502; uint8_t x_503; uint8_t x_506; uint8_t x_507; uint8_t x_508; uint8_t x_509; uint8_t x_519; uint8_t x_520; uint8_t x_521; uint8_t x_524; uint8_t x_528; 
+lean_object* x_267; uint8_t x_268; lean_object* x_269; uint8_t x_270; uint8_t x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_456; uint8_t x_457; uint8_t x_458; uint8_t x_459; uint8_t x_460; uint8_t x_461; lean_object* x_499; uint8_t x_500; uint8_t x_501; uint8_t x_502; uint8_t x_503; uint8_t x_506; uint8_t x_507; uint8_t x_508; uint8_t x_509; uint8_t x_519; uint8_t x_520; uint8_t x_521; uint8_t x_524; uint8_t x_528; 
 x_267 = lean_array_uget(x_7, x_9);
 x_528 = lean_ctor_get_uint8(x_267, sizeof(void*)*1 + 1);
 if (x_528 == 0)
@@ -23472,7 +23323,7 @@ if (x_280 == 0)
 {
 lean_object* x_281; lean_object* x_282; 
 lean_dec(x_276);
-lean_dec_ref(x_268);
+lean_dec_ref(x_269);
 lean_dec_ref(x_267);
 x_281 = l_Array_forIn_x27Unsafe_loop___at___Lean_importModulesCore_go_spec__1___redArg___closed__1;
 x_282 = l_panic___at___Lean_importModulesCore_go_spec__0(x_281, x_273, x_277);
@@ -23504,7 +23355,7 @@ x_286 = lean_ctor_get(x_285, 0);
 lean_inc_ref(x_286);
 lean_dec(x_285);
 lean_inc(x_273);
-x_287 = lean_apply_3(x_268, x_286, x_273, x_277);
+x_287 = lean_apply_3(x_269, x_286, x_273, x_277);
 if (lean_obj_tag(x_287) == 0)
 {
 lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; uint8_t x_293; 
@@ -23542,7 +23393,7 @@ lean_ctor_set_uint8(x_267, sizeof(void*)*1, x_271);
 lean_ctor_set_uint8(x_267, sizeof(void*)*1 + 1, x_270);
 x_301 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_301, 0, x_267);
-lean_ctor_set_uint8(x_301, sizeof(void*)*1, x_269);
+lean_ctor_set_uint8(x_301, sizeof(void*)*1, x_268);
 lean_ctor_set(x_290, 1, x_276);
 lean_ctor_set(x_290, 0, x_301);
 x_302 = lean_array_get_size(x_299);
@@ -23641,7 +23492,7 @@ lean_ctor_set_uint8(x_336, sizeof(void*)*1 + 1, x_270);
 lean_ctor_set_uint8(x_336, sizeof(void*)*1 + 2, x_335);
 x_337 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_337, 0, x_336);
-lean_ctor_set_uint8(x_337, sizeof(void*)*1, x_269);
+lean_ctor_set_uint8(x_337, sizeof(void*)*1, x_268);
 lean_ctor_set(x_290, 1, x_276);
 lean_ctor_set(x_290, 0, x_337);
 x_338 = lean_array_get_size(x_333);
@@ -23754,7 +23605,7 @@ lean_ctor_set_uint8(x_373, sizeof(void*)*1 + 1, x_270);
 lean_ctor_set_uint8(x_373, sizeof(void*)*1 + 2, x_371);
 x_374 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_374, 0, x_373);
-lean_ctor_set_uint8(x_374, sizeof(void*)*1, x_269);
+lean_ctor_set_uint8(x_374, sizeof(void*)*1, x_268);
 lean_ctor_set(x_290, 1, x_276);
 lean_ctor_set(x_290, 0, x_374);
 x_375 = lean_array_get_size(x_369);
@@ -23882,7 +23733,7 @@ lean_ctor_set_uint8(x_415, sizeof(void*)*1 + 1, x_270);
 lean_ctor_set_uint8(x_415, sizeof(void*)*1 + 2, x_413);
 x_416 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_416, 0, x_415);
-lean_ctor_set_uint8(x_416, sizeof(void*)*1, x_269);
+lean_ctor_set_uint8(x_416, sizeof(void*)*1, x_268);
 x_417 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_417, 0, x_416);
 lean_ctor_set(x_417, 1, x_276);
@@ -23998,7 +23849,7 @@ else
 {
 uint8_t x_451; 
 lean_dec(x_273);
-lean_dec_ref(x_268);
+lean_dec_ref(x_269);
 lean_dec_ref(x_267);
 lean_dec(x_11);
 lean_dec(x_4);
@@ -24074,10 +23925,10 @@ x_486 = lean_ctor_get(x_484, 1);
 lean_inc(x_486);
 lean_dec_ref(x_484);
 lean_inc(x_11);
-x_268 = x_456;
-x_269 = x_461;
+x_268 = x_461;
+x_269 = x_456;
 x_270 = x_458;
-x_271 = x_459;
+x_271 = x_460;
 x_272 = x_485;
 x_273 = x_11;
 x_274 = x_486;
@@ -24120,10 +23971,10 @@ lean_dec_ref(x_483);
 x_492 = l_Lean_ImportArtifacts_oleanParts(x_491);
 lean_dec(x_491);
 lean_inc(x_11);
-x_268 = x_456;
-x_269 = x_461;
+x_268 = x_461;
+x_269 = x_456;
 x_270 = x_458;
-x_271 = x_459;
+x_271 = x_460;
 x_272 = x_492;
 x_273 = x_11;
 x_274 = x_465;
@@ -24133,7 +23984,7 @@ goto block_455;
 else
 {
 lean_dec_ref(x_267);
-if (x_459 == 0)
+if (x_460 == 0)
 {
 lean_object* x_493; lean_object* x_494; lean_object* x_495; uint8_t x_496; 
 x_493 = lean_ctor_get(x_482, 0);
@@ -24146,16 +23997,16 @@ lean_inc_ref(x_495);
 lean_dec_ref(x_494);
 x_496 = lean_ctor_get_uint8(x_495, sizeof(void*)*1);
 lean_dec_ref(x_495);
-x_244 = x_476;
-x_245 = x_456;
+x_244 = x_478;
+x_245 = x_465;
 x_246 = x_461;
-x_247 = x_493;
-x_248 = x_458;
-x_249 = x_467;
+x_247 = x_467;
+x_248 = x_456;
+x_249 = x_458;
 x_250 = x_457;
-x_251 = x_478;
-x_252 = x_460;
-x_253 = x_465;
+x_251 = x_476;
+x_252 = x_493;
+x_253 = x_459;
 x_254 = x_496;
 goto block_264;
 }
@@ -24165,17 +24016,17 @@ lean_object* x_497;
 x_497 = lean_ctor_get(x_482, 0);
 lean_inc(x_497);
 lean_dec_ref(x_482);
-x_244 = x_476;
-x_245 = x_456;
+x_244 = x_478;
+x_245 = x_465;
 x_246 = x_461;
-x_247 = x_497;
-x_248 = x_458;
-x_249 = x_467;
+x_247 = x_467;
+x_248 = x_456;
+x_249 = x_458;
 x_250 = x_457;
-x_251 = x_478;
-x_252 = x_460;
-x_253 = x_465;
-x_254 = x_459;
+x_251 = x_476;
+x_252 = x_497;
+x_253 = x_459;
+x_254 = x_460;
 goto block_264;
 }
 }
@@ -24187,8 +24038,8 @@ x_504 = 1;
 x_456 = x_499;
 x_457 = x_501;
 x_458 = x_500;
-x_459 = x_502;
-x_460 = x_503;
+x_459 = x_503;
+x_460 = x_502;
 x_461 = x_504;
 goto block_498;
 }
@@ -24221,8 +24072,8 @@ x_516 = 0;
 x_456 = x_514;
 x_457 = x_507;
 x_458 = x_509;
-x_459 = x_508;
-x_460 = x_506;
+x_459 = x_506;
+x_460 = x_508;
 x_461 = x_516;
 goto block_498;
 }
@@ -24253,8 +24104,8 @@ x_517 = 2;
 x_456 = x_514;
 x_457 = x_507;
 x_458 = x_509;
-x_459 = x_508;
-x_460 = x_506;
+x_459 = x_506;
+x_460 = x_508;
 x_461 = x_517;
 goto block_498;
 }
@@ -24343,16 +24194,16 @@ block_42:
 lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
 x_34 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_31);
-x_35 = lean_st_ref_set(x_11, x_34, x_29);
+lean_ctor_set(x_34, 1, x_32);
+x_35 = lean_st_ref_set(x_11, x_34, x_31);
 x_36 = lean_ctor_get(x_35, 1);
 lean_inc(x_36);
 lean_dec_ref(x_35);
-x_37 = l___private_Lean_Environment_0__Lean_ImportedModule_mainModule_x3f(x_32);
-lean_dec_ref(x_32);
+x_37 = l___private_Lean_Environment_0__Lean_ImportedModule_mainModule_x3f(x_30);
+lean_dec_ref(x_30);
 if (lean_obj_tag(x_37) == 0)
 {
-lean_dec_ref(x_30);
+lean_dec_ref(x_29);
 x_13 = x_1;
 x_14 = x_36;
 goto block_18;
@@ -24367,7 +24218,7 @@ x_39 = lean_ctor_get(x_38, 0);
 lean_inc_ref(x_39);
 lean_dec(x_38);
 lean_inc(x_11);
-x_40 = lean_apply_3(x_30, x_39, x_11, x_36);
+x_40 = lean_apply_3(x_29, x_39, x_11, x_36);
 if (lean_obj_tag(x_40) == 0)
 {
 lean_object* x_41; 
@@ -24389,7 +24240,7 @@ return x_40;
 block_179:
 {
 lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; 
-x_54 = lean_st_ref_take(x_11, x_52);
+x_54 = lean_st_ref_take(x_11, x_45);
 x_55 = lean_ctor_get(x_54, 0);
 lean_inc(x_55);
 x_56 = lean_ctor_get(x_55, 0);
@@ -24408,26 +24259,26 @@ x_61 = !lean_is_exclusive(x_56);
 if (x_61 == 0)
 {
 uint8_t x_62; 
-x_62 = !lean_is_exclusive(x_43);
+x_62 = !lean_is_exclusive(x_44);
 if (x_62 == 0)
 {
 lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; size_t x_67; size_t x_68; size_t x_69; lean_object* x_70; uint8_t x_71; 
 x_63 = lean_ctor_get(x_56, 0);
 x_64 = lean_ctor_get(x_56, 1);
-lean_ctor_set_uint8(x_43, sizeof(void*)*1, x_49);
-lean_ctor_set_uint8(x_43, sizeof(void*)*1 + 1, x_53);
+lean_ctor_set_uint8(x_44, sizeof(void*)*1, x_47);
+lean_ctor_set_uint8(x_44, sizeof(void*)*1 + 1, x_51);
 x_65 = lean_alloc_ctor(0, 1, 1);
-lean_ctor_set(x_65, 0, x_43);
-lean_ctor_set_uint8(x_65, sizeof(void*)*1, x_46);
-lean_ctor_set(x_55, 1, x_51);
+lean_ctor_set(x_65, 0, x_44);
+lean_ctor_set_uint8(x_65, sizeof(void*)*1, x_52);
+lean_ctor_set(x_55, 1, x_50);
 lean_ctor_set(x_55, 0, x_65);
 x_66 = lean_array_get_size(x_64);
 x_67 = lean_usize_of_nat(x_66);
 lean_dec(x_66);
-x_68 = lean_usize_sub(x_67, x_50);
-x_69 = lean_usize_land(x_44, x_68);
+x_68 = lean_usize_sub(x_67, x_43);
+x_69 = lean_usize_land(x_49, x_68);
 x_70 = lean_array_uget(x_64, x_69);
-x_71 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_48, x_70);
+x_71 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_46, x_70);
 if (x_71 == 0)
 {
 lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; 
@@ -24435,7 +24286,7 @@ x_72 = lean_unsigned_to_nat(1u);
 x_73 = lean_nat_add(x_63, x_72);
 lean_dec(x_63);
 x_74 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_74, 0, x_48);
+lean_ctor_set(x_74, 0, x_46);
 lean_ctor_set(x_74, 1, x_55);
 lean_ctor_set(x_74, 2, x_70);
 x_75 = lean_array_uset(x_64, x_69, x_74);
@@ -24454,10 +24305,10 @@ lean_object* x_82;
 x_82 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_NameHashSet_insert_spec__1___redArg(x_75);
 lean_ctor_set(x_56, 1, x_82);
 lean_ctor_set(x_56, 0, x_73);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_56;
 goto block_42;
 }
@@ -24465,10 +24316,10 @@ else
 {
 lean_ctor_set(x_56, 1, x_75);
 lean_ctor_set(x_56, 0, x_73);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_56;
 goto block_42;
 }
@@ -24478,13 +24329,13 @@ else
 lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
 x_83 = lean_box(0);
 x_84 = lean_array_uset(x_64, x_69, x_83);
-x_85 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_48, x_55, x_70);
+x_85 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_46, x_55, x_70);
 x_86 = lean_array_uset(x_84, x_69, x_85);
 lean_ctor_set(x_56, 1, x_86);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_56;
 goto block_42;
 }
@@ -24494,27 +24345,27 @@ else
 lean_object* x_87; lean_object* x_88; lean_object* x_89; uint8_t x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; size_t x_94; size_t x_95; size_t x_96; lean_object* x_97; uint8_t x_98; 
 x_87 = lean_ctor_get(x_56, 0);
 x_88 = lean_ctor_get(x_56, 1);
-x_89 = lean_ctor_get(x_43, 0);
-x_90 = lean_ctor_get_uint8(x_43, sizeof(void*)*1 + 2);
+x_89 = lean_ctor_get(x_44, 0);
+x_90 = lean_ctor_get_uint8(x_44, sizeof(void*)*1 + 2);
 lean_inc(x_89);
-lean_dec(x_43);
+lean_dec(x_44);
 x_91 = lean_alloc_ctor(0, 1, 3);
 lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set_uint8(x_91, sizeof(void*)*1, x_49);
-lean_ctor_set_uint8(x_91, sizeof(void*)*1 + 1, x_53);
+lean_ctor_set_uint8(x_91, sizeof(void*)*1, x_47);
+lean_ctor_set_uint8(x_91, sizeof(void*)*1 + 1, x_51);
 lean_ctor_set_uint8(x_91, sizeof(void*)*1 + 2, x_90);
 x_92 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_92, 0, x_91);
-lean_ctor_set_uint8(x_92, sizeof(void*)*1, x_46);
-lean_ctor_set(x_55, 1, x_51);
+lean_ctor_set_uint8(x_92, sizeof(void*)*1, x_52);
+lean_ctor_set(x_55, 1, x_50);
 lean_ctor_set(x_55, 0, x_92);
 x_93 = lean_array_get_size(x_88);
 x_94 = lean_usize_of_nat(x_93);
 lean_dec(x_93);
-x_95 = lean_usize_sub(x_94, x_50);
-x_96 = lean_usize_land(x_44, x_95);
+x_95 = lean_usize_sub(x_94, x_43);
+x_96 = lean_usize_land(x_49, x_95);
 x_97 = lean_array_uget(x_88, x_96);
-x_98 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_48, x_97);
+x_98 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_46, x_97);
 if (x_98 == 0)
 {
 lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; 
@@ -24522,7 +24373,7 @@ x_99 = lean_unsigned_to_nat(1u);
 x_100 = lean_nat_add(x_87, x_99);
 lean_dec(x_87);
 x_101 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_101, 0, x_48);
+lean_ctor_set(x_101, 0, x_46);
 lean_ctor_set(x_101, 1, x_55);
 lean_ctor_set(x_101, 2, x_97);
 x_102 = lean_array_uset(x_88, x_96, x_101);
@@ -24541,10 +24392,10 @@ lean_object* x_109;
 x_109 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_NameHashSet_insert_spec__1___redArg(x_102);
 lean_ctor_set(x_56, 1, x_109);
 lean_ctor_set(x_56, 0, x_100);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_56;
 goto block_42;
 }
@@ -24552,10 +24403,10 @@ else
 {
 lean_ctor_set(x_56, 1, x_102);
 lean_ctor_set(x_56, 0, x_100);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_56;
 goto block_42;
 }
@@ -24565,13 +24416,13 @@ else
 lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
 x_110 = lean_box(0);
 x_111 = lean_array_uset(x_88, x_96, x_110);
-x_112 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_48, x_55, x_97);
+x_112 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_46, x_55, x_97);
 x_113 = lean_array_uset(x_111, x_96, x_112);
 lean_ctor_set(x_56, 1, x_113);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_56;
 goto block_42;
 }
@@ -24585,14 +24436,14 @@ x_115 = lean_ctor_get(x_56, 1);
 lean_inc(x_115);
 lean_inc(x_114);
 lean_dec(x_56);
-x_116 = lean_ctor_get(x_43, 0);
+x_116 = lean_ctor_get(x_44, 0);
 lean_inc(x_116);
-x_117 = lean_ctor_get_uint8(x_43, sizeof(void*)*1 + 2);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- x_118 = x_43;
+x_117 = lean_ctor_get_uint8(x_44, sizeof(void*)*1 + 2);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ x_118 = x_44;
 } else {
- lean_dec_ref(x_43);
+ lean_dec_ref(x_44);
  x_118 = lean_box(0);
 }
 if (lean_is_scalar(x_118)) {
@@ -24601,21 +24452,21 @@ if (lean_is_scalar(x_118)) {
  x_119 = x_118;
 }
 lean_ctor_set(x_119, 0, x_116);
-lean_ctor_set_uint8(x_119, sizeof(void*)*1, x_49);
-lean_ctor_set_uint8(x_119, sizeof(void*)*1 + 1, x_53);
+lean_ctor_set_uint8(x_119, sizeof(void*)*1, x_47);
+lean_ctor_set_uint8(x_119, sizeof(void*)*1 + 1, x_51);
 lean_ctor_set_uint8(x_119, sizeof(void*)*1 + 2, x_117);
 x_120 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_120, 0, x_119);
-lean_ctor_set_uint8(x_120, sizeof(void*)*1, x_46);
-lean_ctor_set(x_55, 1, x_51);
+lean_ctor_set_uint8(x_120, sizeof(void*)*1, x_52);
+lean_ctor_set(x_55, 1, x_50);
 lean_ctor_set(x_55, 0, x_120);
 x_121 = lean_array_get_size(x_115);
 x_122 = lean_usize_of_nat(x_121);
 lean_dec(x_121);
-x_123 = lean_usize_sub(x_122, x_50);
-x_124 = lean_usize_land(x_44, x_123);
+x_123 = lean_usize_sub(x_122, x_43);
+x_124 = lean_usize_land(x_49, x_123);
 x_125 = lean_array_uget(x_115, x_124);
-x_126 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_48, x_125);
+x_126 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_46, x_125);
 if (x_126 == 0)
 {
 lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; uint8_t x_136; 
@@ -24623,7 +24474,7 @@ x_127 = lean_unsigned_to_nat(1u);
 x_128 = lean_nat_add(x_114, x_127);
 lean_dec(x_114);
 x_129 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_129, 0, x_48);
+lean_ctor_set(x_129, 0, x_46);
 lean_ctor_set(x_129, 1, x_55);
 lean_ctor_set(x_129, 2, x_125);
 x_130 = lean_array_uset(x_115, x_124, x_129);
@@ -24643,10 +24494,10 @@ x_137 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_NameHashSet_insert_
 x_138 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_138, 0, x_128);
 lean_ctor_set(x_138, 1, x_137);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_138;
 goto block_42;
 }
@@ -24656,10 +24507,10 @@ lean_object* x_139;
 x_139 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_139, 0, x_128);
 lean_ctor_set(x_139, 1, x_130);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_139;
 goto block_42;
 }
@@ -24669,15 +24520,15 @@ else
 lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
 x_140 = lean_box(0);
 x_141 = lean_array_uset(x_115, x_124, x_140);
-x_142 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_48, x_55, x_125);
+x_142 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_46, x_55, x_125);
 x_143 = lean_array_uset(x_141, x_124, x_142);
 x_144 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_144, 0, x_114);
 lean_ctor_set(x_144, 1, x_143);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_59;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_59;
 x_33 = x_144;
 goto block_42;
 }
@@ -24701,14 +24552,14 @@ if (lean_is_exclusive(x_56)) {
  lean_dec_ref(x_56);
  x_148 = lean_box(0);
 }
-x_149 = lean_ctor_get(x_43, 0);
+x_149 = lean_ctor_get(x_44, 0);
 lean_inc(x_149);
-x_150 = lean_ctor_get_uint8(x_43, sizeof(void*)*1 + 2);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- x_151 = x_43;
+x_150 = lean_ctor_get_uint8(x_44, sizeof(void*)*1 + 2);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ x_151 = x_44;
 } else {
- lean_dec_ref(x_43);
+ lean_dec_ref(x_44);
  x_151 = lean_box(0);
 }
 if (lean_is_scalar(x_151)) {
@@ -24717,22 +24568,22 @@ if (lean_is_scalar(x_151)) {
  x_152 = x_151;
 }
 lean_ctor_set(x_152, 0, x_149);
-lean_ctor_set_uint8(x_152, sizeof(void*)*1, x_49);
-lean_ctor_set_uint8(x_152, sizeof(void*)*1 + 1, x_53);
+lean_ctor_set_uint8(x_152, sizeof(void*)*1, x_47);
+lean_ctor_set_uint8(x_152, sizeof(void*)*1 + 1, x_51);
 lean_ctor_set_uint8(x_152, sizeof(void*)*1 + 2, x_150);
 x_153 = lean_alloc_ctor(0, 1, 1);
 lean_ctor_set(x_153, 0, x_152);
-lean_ctor_set_uint8(x_153, sizeof(void*)*1, x_46);
+lean_ctor_set_uint8(x_153, sizeof(void*)*1, x_52);
 x_154 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_154, 0, x_153);
-lean_ctor_set(x_154, 1, x_51);
+lean_ctor_set(x_154, 1, x_50);
 x_155 = lean_array_get_size(x_147);
 x_156 = lean_usize_of_nat(x_155);
 lean_dec(x_155);
-x_157 = lean_usize_sub(x_156, x_50);
-x_158 = lean_usize_land(x_44, x_157);
+x_157 = lean_usize_sub(x_156, x_43);
+x_158 = lean_usize_land(x_49, x_157);
 x_159 = lean_array_uget(x_147, x_158);
-x_160 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_48, x_159);
+x_160 = l_Std_DHashMap_Internal_AssocList_contains___at___Lean_NameHashSet_insert_spec__0___redArg(x_46, x_159);
 if (x_160 == 0)
 {
 lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; uint8_t x_170; 
@@ -24740,7 +24591,7 @@ x_161 = lean_unsigned_to_nat(1u);
 x_162 = lean_nat_add(x_146, x_161);
 lean_dec(x_146);
 x_163 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_163, 0, x_48);
+lean_ctor_set(x_163, 0, x_46);
 lean_ctor_set(x_163, 1, x_154);
 lean_ctor_set(x_163, 2, x_159);
 x_164 = lean_array_uset(x_147, x_158, x_163);
@@ -24764,10 +24615,10 @@ if (lean_is_scalar(x_148)) {
 }
 lean_ctor_set(x_172, 0, x_162);
 lean_ctor_set(x_172, 1, x_171);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_145;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_145;
 x_33 = x_172;
 goto block_42;
 }
@@ -24781,10 +24632,10 @@ if (lean_is_scalar(x_148)) {
 }
 lean_ctor_set(x_173, 0, x_162);
 lean_ctor_set(x_173, 1, x_164);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_145;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_145;
 x_33 = x_173;
 goto block_42;
 }
@@ -24794,7 +24645,7 @@ else
 lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; 
 x_174 = lean_box(0);
 x_175 = lean_array_uset(x_147, x_158, x_174);
-x_176 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_48, x_154, x_159);
+x_176 = l_Std_DHashMap_Internal_AssocList_replace___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__1___redArg(x_46, x_154, x_159);
 x_177 = lean_array_uset(x_175, x_158, x_176);
 if (lean_is_scalar(x_148)) {
  x_178 = lean_alloc_ctor(0, 2, 0);
@@ -24803,10 +24654,10 @@ if (lean_is_scalar(x_148)) {
 }
 lean_ctor_set(x_178, 0, x_146);
 lean_ctor_set(x_178, 1, x_177);
-x_29 = x_57;
-x_30 = x_45;
-x_31 = x_145;
-x_32 = x_47;
+x_29 = x_48;
+x_30 = x_53;
+x_31 = x_57;
+x_32 = x_145;
 x_33 = x_178;
 goto block_42;
 }
@@ -24815,31 +24666,31 @@ goto block_42;
 block_193:
 {
 uint8_t x_192; 
-x_192 = l_Lean_beqIRPhases____x40_Lean_Environment___hyg_362_(x_181, x_184);
+x_192 = l_Lean_beqIRPhases____x40_Lean_Environment___hyg_362_(x_182, x_184);
 if (x_192 == 0)
 {
-x_43 = x_185;
-x_44 = x_180;
-x_45 = x_186;
-x_46 = x_181;
-x_47 = x_187;
-x_48 = x_182;
+x_43 = x_180;
+x_44 = x_183;
+x_45 = x_181;
+x_46 = x_185;
+x_47 = x_186;
+x_48 = x_187;
 x_49 = x_188;
 x_50 = x_189;
 x_51 = x_190;
-x_52 = x_191;
-x_53 = x_183;
+x_52 = x_182;
+x_53 = x_191;
 goto block_179;
 }
 else
 {
-lean_dec_ref(x_190);
+lean_dec_ref(x_191);
+lean_dec_ref(x_189);
 lean_dec_ref(x_187);
-lean_dec_ref(x_186);
-lean_dec_ref(x_185);
-lean_dec(x_182);
+lean_dec(x_185);
+lean_dec_ref(x_183);
 x_13 = x_1;
-x_14 = x_191;
+x_14 = x_181;
 goto block_18;
 }
 }
@@ -24847,74 +24698,74 @@ block_209:
 {
 if (x_206 == 0)
 {
-if (x_205 == 0)
+if (x_203 == 0)
 {
 uint8_t x_207; 
-x_207 = lean_ctor_get_uint8(x_194, sizeof(void*)*1 + 1);
+x_207 = lean_ctor_get_uint8(x_195, sizeof(void*)*1 + 1);
 if (x_207 == 0)
 {
-x_180 = x_197;
-x_181 = x_198;
-x_182 = x_200;
-x_183 = x_205;
-x_184 = x_195;
-x_185 = x_194;
-x_186 = x_196;
-x_187 = x_199;
-x_188 = x_201;
-x_189 = x_203;
-x_190 = x_202;
+x_180 = x_194;
+x_181 = x_196;
+x_182 = x_205;
+x_183 = x_195;
+x_184 = x_197;
+x_185 = x_199;
+x_186 = x_198;
+x_187 = x_200;
+x_188 = x_202;
+x_189 = x_201;
+x_190 = x_203;
 x_191 = x_204;
 goto block_193;
 }
 else
 {
 x_43 = x_194;
-x_44 = x_197;
+x_44 = x_195;
 x_45 = x_196;
-x_46 = x_198;
-x_47 = x_199;
+x_46 = x_199;
+x_47 = x_198;
 x_48 = x_200;
-x_49 = x_201;
-x_50 = x_203;
-x_51 = x_202;
-x_52 = x_204;
-x_53 = x_205;
+x_49 = x_202;
+x_50 = x_201;
+x_51 = x_203;
+x_52 = x_205;
+x_53 = x_204;
 goto block_179;
 }
 }
 else
 {
 uint8_t x_208; 
-x_208 = lean_ctor_get_uint8(x_194, sizeof(void*)*1 + 1);
+x_208 = lean_ctor_get_uint8(x_195, sizeof(void*)*1 + 1);
 if (x_208 == 0)
 {
 x_43 = x_194;
-x_44 = x_197;
+x_44 = x_195;
 x_45 = x_196;
-x_46 = x_198;
-x_47 = x_199;
+x_46 = x_199;
+x_47 = x_198;
 x_48 = x_200;
-x_49 = x_201;
-x_50 = x_203;
-x_51 = x_202;
-x_52 = x_204;
-x_53 = x_205;
+x_49 = x_202;
+x_50 = x_201;
+x_51 = x_203;
+x_52 = x_205;
+x_53 = x_204;
 goto block_179;
 }
 else
 {
-x_180 = x_197;
-x_181 = x_198;
-x_182 = x_200;
-x_183 = x_205;
-x_184 = x_195;
-x_185 = x_194;
-x_186 = x_196;
-x_187 = x_199;
-x_188 = x_201;
-x_189 = x_203;
-x_190 = x_202;
+x_180 = x_194;
+x_181 = x_196;
+x_182 = x_205;
+x_183 = x_195;
+x_184 = x_197;
+x_185 = x_199;
+x_186 = x_198;
+x_187 = x_200;
+x_188 = x_202;
+x_189 = x_201;
+x_190 = x_203;
 x_191 = x_204;
 goto block_193;
 }
@@ -24923,56 +24774,56 @@ goto block_193;
 else
 {
 x_43 = x_194;
-x_44 = x_197;
+x_44 = x_195;
 x_45 = x_196;
-x_46 = x_198;
-x_47 = x_199;
+x_46 = x_199;
+x_47 = x_198;
 x_48 = x_200;
-x_49 = x_201;
-x_50 = x_203;
-x_51 = x_202;
-x_52 = x_204;
-x_53 = x_205;
+x_49 = x_202;
+x_50 = x_201;
+x_51 = x_203;
+x_52 = x_205;
+x_53 = x_204;
 goto block_179;
 }
 }
 block_226:
 {
-if (x_219 == 0)
+if (x_216 == 0)
 {
 uint8_t x_224; 
-x_224 = lean_ctor_get_uint8(x_214, sizeof(void*)*1);
+x_224 = lean_ctor_get_uint8(x_213, sizeof(void*)*1);
 if (x_224 == 0)
 {
-x_194 = x_214;
-x_195 = x_215;
-x_196 = x_216;
-x_197 = x_210;
-x_198 = x_223;
-x_199 = x_217;
-x_200 = x_211;
-x_201 = x_219;
-x_202 = x_221;
-x_203 = x_220;
+x_194 = x_210;
+x_195 = x_213;
+x_196 = x_211;
+x_197 = x_214;
+x_198 = x_216;
+x_199 = x_215;
+x_200 = x_217;
+x_201 = x_220;
+x_202 = x_219;
+x_203 = x_221;
 x_204 = x_222;
-x_205 = x_213;
+x_205 = x_223;
 x_206 = x_212;
 goto block_209;
 }
 else
 {
-x_194 = x_214;
-x_195 = x_215;
-x_196 = x_216;
-x_197 = x_210;
-x_198 = x_223;
-x_199 = x_217;
-x_200 = x_211;
-x_201 = x_219;
-x_202 = x_221;
-x_203 = x_220;
+x_194 = x_210;
+x_195 = x_213;
+x_196 = x_211;
+x_197 = x_214;
+x_198 = x_216;
+x_199 = x_215;
+x_200 = x_217;
+x_201 = x_220;
+x_202 = x_219;
+x_203 = x_221;
 x_204 = x_222;
-x_205 = x_213;
+x_205 = x_223;
 x_206 = x_218;
 goto block_209;
 }
@@ -24980,38 +24831,38 @@ goto block_209;
 else
 {
 uint8_t x_225; 
-x_225 = lean_ctor_get_uint8(x_214, sizeof(void*)*1);
+x_225 = lean_ctor_get_uint8(x_213, sizeof(void*)*1);
 if (x_225 == 0)
 {
-x_194 = x_214;
-x_195 = x_215;
-x_196 = x_216;
-x_197 = x_210;
-x_198 = x_223;
-x_199 = x_217;
-x_200 = x_211;
-x_201 = x_219;
-x_202 = x_221;
-x_203 = x_220;
+x_194 = x_210;
+x_195 = x_213;
+x_196 = x_211;
+x_197 = x_214;
+x_198 = x_216;
+x_199 = x_215;
+x_200 = x_217;
+x_201 = x_220;
+x_202 = x_219;
+x_203 = x_221;
 x_204 = x_222;
-x_205 = x_213;
+x_205 = x_223;
 x_206 = x_218;
 goto block_209;
 }
 else
 {
-x_194 = x_214;
-x_195 = x_215;
-x_196 = x_216;
-x_197 = x_210;
-x_198 = x_223;
-x_199 = x_217;
-x_200 = x_211;
-x_201 = x_219;
-x_202 = x_221;
-x_203 = x_220;
+x_194 = x_210;
+x_195 = x_213;
+x_196 = x_211;
+x_197 = x_214;
+x_198 = x_216;
+x_199 = x_215;
+x_200 = x_217;
+x_201 = x_220;
+x_202 = x_219;
+x_203 = x_221;
 x_204 = x_222;
-x_205 = x_213;
+x_205 = x_223;
 x_206 = x_212;
 goto block_209;
 }
@@ -25020,101 +24871,101 @@ goto block_209;
 block_243:
 {
 uint8_t x_241; 
-x_241 = l_Lean_beqIRPhases____x40_Lean_Environment___hyg_362_(x_229, x_232);
+x_241 = l_Lean_beqIRPhases____x40_Lean_Environment___hyg_362_(x_229, x_238);
 if (x_241 == 0)
 {
 uint8_t x_242; 
 x_242 = 2;
-x_210 = x_228;
-x_211 = x_235;
-x_212 = x_238;
-x_213 = x_240;
-x_214 = x_231;
-x_215 = x_232;
-x_216 = x_227;
-x_217 = x_230;
-x_218 = x_234;
-x_219 = x_236;
-x_220 = x_237;
-x_221 = x_233;
-x_222 = x_239;
+x_210 = x_227;
+x_211 = x_228;
+x_212 = x_235;
+x_213 = x_237;
+x_214 = x_238;
+x_215 = x_231;
+x_216 = x_230;
+x_217 = x_232;
+x_218 = x_233;
+x_219 = x_234;
+x_220 = x_239;
+x_221 = x_240;
+x_222 = x_236;
 x_223 = x_242;
 goto block_226;
 }
 else
 {
-x_210 = x_228;
-x_211 = x_235;
-x_212 = x_238;
-x_213 = x_240;
-x_214 = x_231;
-x_215 = x_232;
-x_216 = x_227;
-x_217 = x_230;
-x_218 = x_234;
-x_219 = x_236;
-x_220 = x_237;
-x_221 = x_233;
-x_222 = x_239;
+x_210 = x_227;
+x_211 = x_228;
+x_212 = x_235;
+x_213 = x_237;
+x_214 = x_238;
+x_215 = x_231;
+x_216 = x_230;
+x_217 = x_232;
+x_218 = x_233;
+x_219 = x_234;
+x_220 = x_239;
+x_221 = x_240;
+x_222 = x_236;
 x_223 = x_229;
 goto block_226;
 }
 }
 block_264:
 {
-if (x_248 == 0)
+if (x_249 == 0)
 {
 lean_object* x_255; lean_object* x_256; lean_object* x_257; uint8_t x_258; uint8_t x_259; 
-x_255 = lean_ctor_get(x_247, 0);
+x_255 = lean_ctor_get(x_252, 0);
 lean_inc_ref(x_255);
 x_256 = lean_ctor_get(x_255, 0);
 lean_inc_ref(x_256);
-x_257 = lean_ctor_get(x_247, 1);
+x_257 = lean_ctor_get(x_252, 1);
 lean_inc_ref(x_257);
 x_258 = lean_ctor_get_uint8(x_255, sizeof(void*)*1);
 lean_dec_ref(x_255);
 x_259 = lean_ctor_get_uint8(x_256, sizeof(void*)*1 + 1);
-x_227 = x_245;
-x_228 = x_244;
+x_227 = x_244;
+x_228 = x_245;
 x_229 = x_246;
-x_230 = x_247;
-x_231 = x_256;
-x_232 = x_258;
-x_233 = x_257;
-x_234 = x_250;
-x_235 = x_249;
-x_236 = x_254;
-x_237 = x_251;
-x_238 = x_252;
-x_239 = x_253;
+x_230 = x_254;
+x_231 = x_247;
+x_232 = x_248;
+x_233 = x_250;
+x_234 = x_251;
+x_235 = x_253;
+x_236 = x_252;
+x_237 = x_256;
+x_238 = x_258;
+x_239 = x_257;
 x_240 = x_259;
 goto block_243;
 }
 else
 {
 lean_object* x_260; lean_object* x_261; lean_object* x_262; uint8_t x_263; 
-x_260 = lean_ctor_get(x_247, 0);
+x_260 = lean_ctor_get(x_252, 0);
 lean_inc_ref(x_260);
-x_261 = lean_ctor_get(x_247, 1);
+x_261 = lean_ctor_get(x_252, 1);
 lean_inc_ref(x_261);
 x_262 = lean_ctor_get(x_260, 0);
 lean_inc_ref(x_262);
 x_263 = lean_ctor_get_uint8(x_260, sizeof(void*)*1);
 lean_dec_ref(x_260);
-x_227 = x_245;
-x_228 = x_244;
+x_227 = x_244;
+x_228 = x_245;
 x_229 = x_246;
-x_230 = x_247;
-x_231 = x_262;
-x_232 = x_263;
-x_233 = x_261;
-x_234 = x_250;
-x_235 = x_249;
-x_236 = x_254;
-x_237 = x_251;
-x_238 = x_252;
-x_239 = x_253;
-x_240 = x_248;
+x_230 = x_254;
+x_231 = x_247;
+x_232 = x_248;
+x_233 = x_250;
+x_234 = x_251;
+x_235 = x_253;
+x_236 = x_252;
+x_237 = x_262;
+x_238 = x_263;
+x_239 = x_261;
+x_240 = x_249;
 goto block_243;
 }
 }
@@ -27366,7 +27217,7 @@ if (lean_is_scalar(x_15)) {
  x_36 = x_15;
 }
 lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_33);
+lean_ctor_set(x_36, 1, x_34);
 if (lean_is_scalar(x_12)) {
  x_37 = lean_alloc_ctor(0, 2, 0);
 } else {
@@ -27378,7 +27229,7 @@ x_38 = 1;
 x_39 = lean_usize_add(x_5, x_38);
 x_5 = x_39;
 x_6 = x_37;
-x_7 = x_34;
+x_7 = x_33;
 goto _start;
 }
 block_87:
@@ -27438,8 +27289,8 @@ lean_object* x_74;
 x_74 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_NameHashSet_insert_spec__1___redArg(x_67);
 lean_ctor_set(x_42, 1, x_74);
 lean_ctor_set(x_42, 0, x_65);
-x_33 = x_43;
-x_34 = x_44;
+x_33 = x_44;
+x_34 = x_43;
 x_35 = x_42;
 goto block_41;
 }
@@ -27447,8 +27298,8 @@ else
 {
 lean_ctor_set(x_42, 1, x_67);
 lean_ctor_set(x_42, 0, x_65);
-x_33 = x_43;
-x_34 = x_44;
+x_33 = x_44;
+x_34 = x_43;
 x_35 = x_42;
 goto block_41;
 }
@@ -27481,8 +27332,8 @@ x_84 = l_Std_DHashMap_Internal_Raw_u2080_expand___at___Lean_NameHashSet_insert_s
 x_85 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_85, 0, x_75);
 lean_ctor_set(x_85, 1, x_84);
-x_33 = x_43;
-x_34 = x_44;
+x_33 = x_44;
+x_34 = x_43;
 x_35 = x_85;
 goto block_41;
 }
@@ -27492,8 +27343,8 @@ lean_object* x_86;
 x_86 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_86, 0, x_75);
 lean_ctor_set(x_86, 1, x_77);
-x_33 = x_43;
-x_34 = x_44;
+x_33 = x_44;
+x_34 = x_43;
 x_35 = x_86;
 goto block_41;
 }
@@ -27505,8 +27356,8 @@ lean_dec(x_60);
 lean_dec_ref(x_46);
 lean_dec(x_45);
 lean_dec(x_29);
-x_33 = x_43;
-x_34 = x_44;
+x_33 = x_44;
+x_34 = x_43;
 x_35 = x_42;
 goto block_41;
 }
@@ -27868,7 +27719,7 @@ if (lean_is_scalar(x_15)) {
  x_217 = x_15;
 }
 lean_ctor_set(x_217, 0, x_216);
-lean_ctor_set(x_217, 1, x_214);
+lean_ctor_set(x_217, 1, x_215);
 if (lean_is_scalar(x_12)) {
  x_218 = lean_alloc_ctor(0, 2, 0);
 } else {
@@ -27880,7 +27731,7 @@ x_219 = 1;
 x_220 = lean_usize_add(x_5, x_219);
 x_5 = x_220;
 x_6 = x_218;
-x_7 = x_215;
+x_7 = x_214;
 goto _start;
 }
 block_256:
@@ -27945,8 +27796,8 @@ if (lean_is_scalar(x_243)) {
 }
 lean_ctor_set(x_254, 0, x_244);
 lean_ctor_set(x_254, 1, x_253);
-x_214 = x_224;
-x_215 = x_225;
+x_214 = x_225;
+x_215 = x_224;
 x_216 = x_254;
 goto block_222;
 }
@@ -27960,8 +27811,8 @@ if (lean_is_scalar(x_243)) {
 }
 lean_ctor_set(x_255, 0, x_244);
 lean_ctor_set(x_255, 1, x_246);
-x_214 = x_224;
-x_215 = x_225;
+x_214 = x_225;
+x_215 = x_224;
 x_216 = x_255;
 goto block_222;
 }
@@ -27972,8 +27823,8 @@ lean_dec(x_241);
 lean_dec_ref(x_227);
 lean_dec(x_226);
 lean_dec(x_209);
-x_214 = x_224;
-x_215 = x_225;
+x_214 = x_225;
+x_215 = x_224;
 x_216 = x_223;
 goto block_222;
 }
@@ -29377,26 +29228,26 @@ return x_1;
 LEAN_EXPORT lean_object* l_Lean_finalizeImport(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint32_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; uint8_t x_59; size_t x_60; uint8_t x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; size_t x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; uint8_t x_135; size_t x_136; uint8_t x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; size_t x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; uint8_t x_151; size_t x_162; size_t x_163; lean_object* x_164; uint8_t x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; size_t x_188; uint8_t x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; size_t x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; size_t x_207; size_t x_208; uint8_t x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; size_t x_226; size_t x_227; lean_object* x_228; uint8_t x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; size_t x_271; size_t x_272; uint8_t x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; size_t x_288; size_t x_289; uint8_t x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; uint8_t x_305; uint8_t x_335; uint8_t x_336; 
+lean_object* x_10; lean_object* x_11; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; size_t x_58; lean_object* x_59; lean_object* x_60; uint8_t x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; size_t x_67; uint8_t x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; lean_object* x_77; size_t x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; size_t x_141; uint8_t x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; uint8_t x_149; uint8_t x_150; size_t x_160; size_t x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; uint8_t x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; size_t x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; size_t x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; uint8_t x_198; lean_object* x_199; size_t x_205; lean_object* x_206; size_t x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; uint8_t x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; size_t x_224; lean_object* x_225; size_t x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; uint8_t x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; size_t x_269; lean_object* x_270; size_t x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; uint8_t x_277; lean_object* x_278; lean_object* x_279; size_t x_286; lean_object* x_287; size_t x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; uint8_t x_294; lean_object* x_295; lean_object* x_296; uint8_t x_303; uint8_t x_333; uint8_t x_334; 
 x_54 = l_Lean_Environment_addDeclCore___closed__0;
 x_55 = l_Lean_PersistentHashMap_find_x3f___at___Lean_SMap_find_x3f_x27___at___Lean_Kernel_Environment_find_x3f_spec__0_spec__1___redArg___closed__0;
 x_56 = l_Lean_PersistentHashMap_insert___at___Lean_SMap_insert___at_____private_Lean_Environment_0__Lean_Kernel_Environment_add_spec__0_spec__0___redArg___closed__0;
 x_57 = l_Lean_instInhabitedModuleData;
-x_335 = 2;
-x_336 = l_Lean_instDecidableEqOLeanLevel(x_7, x_335);
-if (x_336 == 0)
+x_333 = 2;
+x_334 = l_Lean_instDecidableEqOLeanLevel(x_7, x_333);
+if (x_334 == 0)
 {
-uint8_t x_337; 
-x_337 = 1;
-x_305 = x_337;
-goto block_334;
+uint8_t x_335; 
+x_335 = 1;
+x_303 = x_335;
+goto block_332;
 }
 else
 {
-uint8_t x_338; 
-x_338 = 0;
-x_305 = x_338;
-goto block_334;
+uint8_t x_336; 
+x_336 = 0;
+x_303 = x_336;
+goto block_332;
 }
 block_41:
 {
@@ -29541,957 +29392,947 @@ return x_45;
 }
 }
 }
-block_134:
+block_133:
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; uint8_t x_88; 
-lean_inc(x_76);
-lean_inc_ref(x_64);
-lean_inc_ref(x_62);
-x_79 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_62, x_64, x_76, x_66);
-x_80 = lean_ctor_get(x_79, 0);
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; uint8_t x_87; 
+lean_inc(x_65);
+lean_inc_ref(x_72);
+lean_inc_ref(x_73);
+x_78 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_73, x_72, x_65, x_69);
+x_79 = lean_ctor_get(x_78, 0);
+lean_inc(x_79);
+x_80 = lean_ctor_get(x_78, 1);
 lean_inc(x_80);
-x_81 = lean_ctor_get(x_79, 1);
-lean_inc(x_81);
-lean_dec_ref(x_79);
-lean_inc(x_76);
-lean_inc_ref(x_62);
-x_82 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_62, x_73, x_76, x_81);
-x_83 = lean_ctor_get(x_82, 0);
+lean_dec_ref(x_78);
+lean_inc(x_65);
+lean_inc_ref(x_73);
+x_81 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_73, x_70, x_65, x_80);
+x_82 = lean_ctor_get(x_81, 0);
+lean_inc(x_82);
+x_83 = lean_ctor_get(x_81, 1);
 lean_inc(x_83);
-x_84 = lean_ctor_get(x_82, 1);
-lean_inc(x_84);
-lean_dec_ref(x_82);
-x_85 = lean_mk_empty_array_with_capacity(x_63);
-lean_inc(x_76);
-x_86 = l_Array_mapFinIdxM_map___at___Lean_finalizeImport_spec__8___redArg(x_7, x_57, x_64, x_65, x_63, x_76, x_85);
-lean_inc(x_76);
-lean_inc(x_80);
-x_87 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_80, x_86, x_76, x_84);
-x_88 = !lean_is_exclusive(x_87);
-if (x_88 == 0)
+lean_dec_ref(x_81);
+x_84 = lean_mk_empty_array_with_capacity(x_66);
+lean_inc(x_65);
+x_85 = l_Array_mapFinIdxM_map___at___Lean_finalizeImport_spec__8___redArg(x_7, x_57, x_72, x_62, x_66, x_65, x_84);
+lean_inc(x_65);
+lean_inc(x_79);
+x_86 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_79, x_85, x_65, x_83);
+x_87 = !lean_is_exclusive(x_86);
+if (x_87 == 0)
 {
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_89 = lean_ctor_get(x_87, 0);
-x_90 = lean_ctor_get(x_87, 1);
-x_91 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__9(x_68, x_60, x_65);
-x_92 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_92, 0, x_71);
-lean_ctor_set(x_92, 1, x_77);
-lean_ctor_set_uint8(x_92, sizeof(void*)*2, x_59);
-x_93 = lean_mk_empty_array_with_capacity(x_76);
-lean_inc_ref(x_64);
-lean_inc_ref(x_91);
+lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+x_88 = lean_ctor_get(x_86, 0);
+x_89 = lean_ctor_get(x_86, 1);
+x_90 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__9(x_58, x_67, x_62);
+x_91 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_91, 0, x_59);
+lean_ctor_set(x_91, 1, x_75);
+lean_ctor_set_uint8(x_91, sizeof(void*)*2, x_68);
+x_92 = lean_mk_empty_array_with_capacity(x_65);
+lean_inc_ref(x_72);
+lean_inc_ref(x_90);
 lean_inc_ref(x_2);
-lean_inc(x_74);
-x_94 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_94, 0, x_74);
-lean_ctor_set(x_94, 1, x_2);
-lean_ctor_set(x_94, 2, x_93);
-lean_ctor_set(x_94, 3, x_91);
-lean_ctor_set(x_94, 4, x_64);
-lean_ctor_set_uint32(x_94, sizeof(void*)*5, x_4);
-lean_ctor_set_uint8(x_94, sizeof(void*)*5 + 4, x_61);
-lean_inc(x_70);
-lean_inc_ref(x_62);
-lean_inc_ref(x_75);
-lean_inc_ref(x_67);
-x_95 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_95, 0, x_92);
-lean_ctor_set(x_95, 1, x_67);
-lean_ctor_set(x_95, 2, x_75);
-lean_ctor_set(x_95, 3, x_62);
-lean_ctor_set(x_95, 4, x_62);
-lean_ctor_set(x_95, 5, x_70);
-lean_ctor_set(x_95, 6, x_94);
-lean_ctor_set_uint8(x_95, sizeof(void*)*7, x_58);
-x_96 = lean_array_get_size(x_72);
-x_97 = l_Array_filterMapM___at___Lean_finalizeImport_spec__10(x_72, x_76, x_96);
-lean_dec(x_96);
-lean_dec(x_76);
-lean_dec_ref(x_72);
-x_98 = l_Array_append___redArg(x_78, x_97);
-lean_dec_ref(x_97);
-lean_inc_ref(x_64);
-x_99 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_99, 0, x_74);
-lean_ctor_set(x_99, 1, x_2);
-lean_ctor_set(x_99, 2, x_98);
-lean_ctor_set(x_99, 3, x_91);
-lean_ctor_set(x_99, 4, x_64);
-lean_ctor_set_uint32(x_99, sizeof(void*)*5, x_4);
-lean_ctor_set_uint8(x_99, sizeof(void*)*5 + 4, x_61);
-x_100 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_100, 0, x_69);
-lean_ctor_set(x_100, 1, x_67);
-lean_ctor_set(x_100, 2, x_75);
-lean_ctor_set(x_100, 3, x_80);
-lean_ctor_set(x_100, 4, x_83);
-lean_ctor_set(x_100, 5, x_70);
-lean_ctor_set(x_100, 6, x_99);
-lean_ctor_set_uint8(x_100, sizeof(void*)*7, x_58);
-lean_inc_ref(x_100);
-lean_ctor_set(x_87, 1, x_95);
-lean_ctor_set(x_87, 0, x_100);
-x_101 = lean_task_pure(x_100);
-x_102 = lean_box(1);
-x_103 = l_Lean_Environment_ofKernelEnv___closed__0;
+lean_inc(x_64);
+x_93 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_93, 0, x_64);
+lean_ctor_set(x_93, 1, x_2);
+lean_ctor_set(x_93, 2, x_92);
+lean_ctor_set(x_93, 3, x_90);
+lean_ctor_set(x_93, 4, x_72);
+lean_ctor_set_uint32(x_93, sizeof(void*)*5, x_4);
+lean_ctor_set_uint8(x_93, sizeof(void*)*5 + 4, x_76);
+lean_inc_ref(x_73);
+lean_inc_ref(x_63);
+lean_inc_ref(x_74);
+x_94 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_94, 0, x_91);
+lean_ctor_set(x_94, 1, x_74);
+lean_ctor_set(x_94, 2, x_63);
+lean_ctor_set(x_94, 3, x_73);
+lean_ctor_set(x_94, 4, x_73);
+lean_ctor_set(x_94, 5, x_93);
+lean_ctor_set_uint8(x_94, sizeof(void*)*6, x_61);
+x_95 = lean_array_get_size(x_71);
+x_96 = l_Array_filterMapM___at___Lean_finalizeImport_spec__10(x_71, x_65, x_95);
+lean_dec(x_95);
+lean_dec(x_65);
+lean_dec_ref(x_71);
+x_97 = l_Array_append___redArg(x_77, x_96);
+lean_dec_ref(x_96);
+lean_inc_ref(x_72);
+x_98 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_98, 0, x_64);
+lean_ctor_set(x_98, 1, x_2);
+lean_ctor_set(x_98, 2, x_97);
+lean_ctor_set(x_98, 3, x_90);
+lean_ctor_set(x_98, 4, x_72);
+lean_ctor_set_uint32(x_98, sizeof(void*)*5, x_4);
+lean_ctor_set_uint8(x_98, sizeof(void*)*5 + 4, x_76);
+x_99 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_99, 0, x_60);
+lean_ctor_set(x_99, 1, x_74);
+lean_ctor_set(x_99, 2, x_63);
+lean_ctor_set(x_99, 3, x_79);
+lean_ctor_set(x_99, 4, x_82);
+lean_ctor_set(x_99, 5, x_98);
+lean_ctor_set_uint8(x_99, sizeof(void*)*6, x_61);
+lean_inc_ref(x_99);
+lean_ctor_set(x_86, 1, x_94);
+lean_ctor_set(x_86, 0, x_99);
+x_100 = lean_task_pure(x_99);
+x_101 = lean_box(1);
+x_102 = l_Lean_Environment_ofKernelEnv___closed__0;
+x_103 = lean_box(0);
 x_104 = lean_box(0);
-x_105 = lean_box(0);
-x_106 = l_Lean_Environment_ofKernelEnv___closed__1;
-x_107 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_107, 0, x_87);
-lean_ctor_set(x_107, 1, x_89);
-lean_ctor_set(x_107, 2, x_101);
-lean_ctor_set(x_107, 3, x_103);
-lean_ctor_set(x_107, 4, x_104);
-lean_ctor_set(x_107, 5, x_105);
-lean_ctor_set(x_107, 6, x_102);
-lean_ctor_set(x_107, 7, x_106);
-lean_ctor_set_uint8(x_107, sizeof(void*)*8, x_59);
+x_105 = l_Lean_Environment_ofKernelEnv___closed__1;
+x_106 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_106, 0, x_86);
+lean_ctor_set(x_106, 1, x_88);
+lean_ctor_set(x_106, 2, x_100);
+lean_ctor_set(x_106, 3, x_102);
+lean_ctor_set(x_106, 4, x_103);
+lean_ctor_set(x_106, 5, x_104);
+lean_ctor_set(x_106, 6, x_101);
+lean_ctor_set(x_106, 7, x_105);
+lean_ctor_set_uint8(x_106, sizeof(void*)*8, x_68);
 if (x_5 == 0)
 {
-x_42 = x_64;
-x_43 = x_107;
-x_44 = x_90;
+x_42 = x_72;
+x_43 = x_106;
+x_44 = x_89;
 goto block_53;
 }
 else
 {
-lean_object* x_108; lean_object* x_109; lean_object* x_110; 
-x_108 = lean_runtime_mark_persistent(x_107, x_90);
-x_109 = lean_ctor_get(x_108, 0);
+lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_107 = lean_runtime_mark_persistent(x_106, x_89);
+x_108 = lean_ctor_get(x_107, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_107, 1);
 lean_inc(x_109);
-x_110 = lean_ctor_get(x_108, 1);
-lean_inc(x_110);
-lean_dec_ref(x_108);
-x_42 = x_64;
-x_43 = x_109;
-x_44 = x_110;
+lean_dec_ref(x_107);
+x_42 = x_72;
+x_43 = x_108;
+x_44 = x_109;
 goto block_53;
 }
 }
 else
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
-x_111 = lean_ctor_get(x_87, 0);
-x_112 = lean_ctor_get(x_87, 1);
-lean_inc(x_112);
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+x_110 = lean_ctor_get(x_86, 0);
+x_111 = lean_ctor_get(x_86, 1);
 lean_inc(x_111);
-lean_dec(x_87);
-x_113 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__9(x_68, x_60, x_65);
-x_114 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_114, 0, x_71);
-lean_ctor_set(x_114, 1, x_77);
-lean_ctor_set_uint8(x_114, sizeof(void*)*2, x_59);
-x_115 = lean_mk_empty_array_with_capacity(x_76);
-lean_inc_ref(x_64);
-lean_inc_ref(x_113);
+lean_inc(x_110);
+lean_dec(x_86);
+x_112 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__9(x_58, x_67, x_62);
+x_113 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_113, 0, x_59);
+lean_ctor_set(x_113, 1, x_75);
+lean_ctor_set_uint8(x_113, sizeof(void*)*2, x_68);
+x_114 = lean_mk_empty_array_with_capacity(x_65);
+lean_inc_ref(x_72);
+lean_inc_ref(x_112);
 lean_inc_ref(x_2);
-lean_inc(x_74);
-x_116 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_116, 0, x_74);
-lean_ctor_set(x_116, 1, x_2);
-lean_ctor_set(x_116, 2, x_115);
-lean_ctor_set(x_116, 3, x_113);
-lean_ctor_set(x_116, 4, x_64);
-lean_ctor_set_uint32(x_116, sizeof(void*)*5, x_4);
-lean_ctor_set_uint8(x_116, sizeof(void*)*5 + 4, x_61);
-lean_inc(x_70);
-lean_inc_ref(x_62);
-lean_inc_ref(x_75);
-lean_inc_ref(x_67);
-x_117 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_117, 0, x_114);
-lean_ctor_set(x_117, 1, x_67);
-lean_ctor_set(x_117, 2, x_75);
-lean_ctor_set(x_117, 3, x_62);
-lean_ctor_set(x_117, 4, x_62);
-lean_ctor_set(x_117, 5, x_70);
-lean_ctor_set(x_117, 6, x_116);
-lean_ctor_set_uint8(x_117, sizeof(void*)*7, x_58);
-x_118 = lean_array_get_size(x_72);
-x_119 = l_Array_filterMapM___at___Lean_finalizeImport_spec__10(x_72, x_76, x_118);
-lean_dec(x_118);
-lean_dec(x_76);
-lean_dec_ref(x_72);
-x_120 = l_Array_append___redArg(x_78, x_119);
-lean_dec_ref(x_119);
-lean_inc_ref(x_64);
-x_121 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_121, 0, x_74);
-lean_ctor_set(x_121, 1, x_2);
-lean_ctor_set(x_121, 2, x_120);
-lean_ctor_set(x_121, 3, x_113);
-lean_ctor_set(x_121, 4, x_64);
-lean_ctor_set_uint32(x_121, sizeof(void*)*5, x_4);
-lean_ctor_set_uint8(x_121, sizeof(void*)*5 + 4, x_61);
-x_122 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_122, 0, x_69);
-lean_ctor_set(x_122, 1, x_67);
-lean_ctor_set(x_122, 2, x_75);
-lean_ctor_set(x_122, 3, x_80);
-lean_ctor_set(x_122, 4, x_83);
-lean_ctor_set(x_122, 5, x_70);
-lean_ctor_set(x_122, 6, x_121);
-lean_ctor_set_uint8(x_122, sizeof(void*)*7, x_58);
-lean_inc_ref(x_122);
-x_123 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_123, 0, x_122);
-lean_ctor_set(x_123, 1, x_117);
-x_124 = lean_task_pure(x_122);
-x_125 = lean_box(1);
-x_126 = l_Lean_Environment_ofKernelEnv___closed__0;
+lean_inc(x_64);
+x_115 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_115, 0, x_64);
+lean_ctor_set(x_115, 1, x_2);
+lean_ctor_set(x_115, 2, x_114);
+lean_ctor_set(x_115, 3, x_112);
+lean_ctor_set(x_115, 4, x_72);
+lean_ctor_set_uint32(x_115, sizeof(void*)*5, x_4);
+lean_ctor_set_uint8(x_115, sizeof(void*)*5 + 4, x_76);
+lean_inc_ref(x_73);
+lean_inc_ref(x_63);
+lean_inc_ref(x_74);
+x_116 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_116, 0, x_113);
+lean_ctor_set(x_116, 1, x_74);
+lean_ctor_set(x_116, 2, x_63);
+lean_ctor_set(x_116, 3, x_73);
+lean_ctor_set(x_116, 4, x_73);
+lean_ctor_set(x_116, 5, x_115);
+lean_ctor_set_uint8(x_116, sizeof(void*)*6, x_61);
+x_117 = lean_array_get_size(x_71);
+x_118 = l_Array_filterMapM___at___Lean_finalizeImport_spec__10(x_71, x_65, x_117);
+lean_dec(x_117);
+lean_dec(x_65);
+lean_dec_ref(x_71);
+x_119 = l_Array_append___redArg(x_77, x_118);
+lean_dec_ref(x_118);
+lean_inc_ref(x_72);
+x_120 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_120, 0, x_64);
+lean_ctor_set(x_120, 1, x_2);
+lean_ctor_set(x_120, 2, x_119);
+lean_ctor_set(x_120, 3, x_112);
+lean_ctor_set(x_120, 4, x_72);
+lean_ctor_set_uint32(x_120, sizeof(void*)*5, x_4);
+lean_ctor_set_uint8(x_120, sizeof(void*)*5 + 4, x_76);
+x_121 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_121, 0, x_60);
+lean_ctor_set(x_121, 1, x_74);
+lean_ctor_set(x_121, 2, x_63);
+lean_ctor_set(x_121, 3, x_79);
+lean_ctor_set(x_121, 4, x_82);
+lean_ctor_set(x_121, 5, x_120);
+lean_ctor_set_uint8(x_121, sizeof(void*)*6, x_61);
+lean_inc_ref(x_121);
+x_122 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_122, 0, x_121);
+lean_ctor_set(x_122, 1, x_116);
+x_123 = lean_task_pure(x_121);
+x_124 = lean_box(1);
+x_125 = l_Lean_Environment_ofKernelEnv___closed__0;
+x_126 = lean_box(0);
 x_127 = lean_box(0);
-x_128 = lean_box(0);
-x_129 = l_Lean_Environment_ofKernelEnv___closed__1;
-x_130 = lean_alloc_ctor(0, 8, 1);
-lean_ctor_set(x_130, 0, x_123);
-lean_ctor_set(x_130, 1, x_111);
-lean_ctor_set(x_130, 2, x_124);
-lean_ctor_set(x_130, 3, x_126);
-lean_ctor_set(x_130, 4, x_127);
-lean_ctor_set(x_130, 5, x_128);
-lean_ctor_set(x_130, 6, x_125);
-lean_ctor_set(x_130, 7, x_129);
-lean_ctor_set_uint8(x_130, sizeof(void*)*8, x_59);
+x_128 = l_Lean_Environment_ofKernelEnv___closed__1;
+x_129 = lean_alloc_ctor(0, 8, 1);
+lean_ctor_set(x_129, 0, x_122);
+lean_ctor_set(x_129, 1, x_110);
+lean_ctor_set(x_129, 2, x_123);
+lean_ctor_set(x_129, 3, x_125);
+lean_ctor_set(x_129, 4, x_126);
+lean_ctor_set(x_129, 5, x_127);
+lean_ctor_set(x_129, 6, x_124);
+lean_ctor_set(x_129, 7, x_128);
+lean_ctor_set_uint8(x_129, sizeof(void*)*8, x_68);
 if (x_5 == 0)
 {
-x_42 = x_64;
-x_43 = x_130;
-x_44 = x_112;
+x_42 = x_72;
+x_43 = x_129;
+x_44 = x_111;
 goto block_53;
 }
 else
 {
-lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_131 = lean_runtime_mark_persistent(x_130, x_112);
-x_132 = lean_ctor_get(x_131, 0);
+lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+x_130 = lean_runtime_mark_persistent(x_129, x_111);
+x_131 = lean_ctor_get(x_130, 0);
+lean_inc(x_131);
+x_132 = lean_ctor_get(x_130, 1);
 lean_inc(x_132);
-x_133 = lean_ctor_get(x_131, 1);
-lean_inc(x_133);
-lean_dec_ref(x_131);
-x_42 = x_64;
-x_43 = x_132;
-x_44 = x_133;
+lean_dec_ref(x_130);
+x_42 = x_72;
+x_43 = x_131;
+x_44 = x_132;
 goto block_53;
 }
 }
 }
-block_161:
+block_159:
 {
-lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; uint8_t x_157; 
-x_152 = l_Lean_Kernel_instInhabitedDiagnostics___closed__1;
-x_153 = lean_alloc_ctor(0, 1, 1);
-lean_ctor_set(x_153, 0, x_152);
-lean_ctor_set_uint8(x_153, sizeof(void*)*1, x_135);
-x_154 = lean_box(1);
-x_155 = lean_box(0);
-x_156 = l_Lean_finalizeImport___closed__0;
-x_157 = lean_nat_dec_lt(x_150, x_139);
-if (x_157 == 0)
+lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; uint8_t x_155; 
+x_151 = l_Lean_Kernel_instInhabitedDiagnostics___closed__1;
+x_152 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_152, 0, x_151);
+lean_ctor_set_uint8(x_152, sizeof(void*)*1, x_142);
+x_153 = lean_box(0);
+x_154 = l_Lean_finalizeImport___closed__0;
+x_155 = lean_nat_dec_lt(x_139, x_140);
+if (x_155 == 0)
 {
-x_58 = x_151;
+x_58 = x_134;
 x_59 = x_135;
 x_60 = x_136;
-x_61 = x_137;
-x_62 = x_138;
-x_63 = x_139;
-x_64 = x_140;
-x_65 = x_141;
-x_66 = x_142;
-x_67 = x_153;
-x_68 = x_143;
-x_69 = x_144;
-x_70 = x_154;
+x_61 = x_150;
+x_62 = x_137;
+x_63 = x_138;
+x_64 = x_153;
+x_65 = x_139;
+x_66 = x_140;
+x_67 = x_141;
+x_68 = x_142;
+x_69 = x_143;
+x_70 = x_144;
 x_71 = x_145;
 x_72 = x_146;
 x_73 = x_147;
-x_74 = x_155;
+x_74 = x_152;
 x_75 = x_148;
-x_76 = x_150;
-x_77 = x_149;
-x_78 = x_156;
-goto block_134;
+x_76 = x_149;
+x_77 = x_154;
+goto block_133;
 }
 else
 {
-uint8_t x_158; 
-x_158 = lean_nat_dec_le(x_139, x_139);
-if (x_158 == 0)
+uint8_t x_156; 
+x_156 = lean_nat_dec_le(x_140, x_140);
+if (x_156 == 0)
 {
-x_58 = x_151;
+x_58 = x_134;
 x_59 = x_135;
 x_60 = x_136;
-x_61 = x_137;
-x_62 = x_138;
-x_63 = x_139;
-x_64 = x_140;
-x_65 = x_141;
-x_66 = x_142;
-x_67 = x_153;
-x_68 = x_143;
-x_69 = x_144;
-x_70 = x_154;
+x_61 = x_150;
+x_62 = x_137;
+x_63 = x_138;
+x_64 = x_153;
+x_65 = x_139;
+x_66 = x_140;
+x_67 = x_141;
+x_68 = x_142;
+x_69 = x_143;
+x_70 = x_144;
 x_71 = x_145;
 x_72 = x_146;
 x_73 = x_147;
-x_74 = x_155;
+x_74 = x_152;
 x_75 = x_148;
-x_76 = x_150;
-x_77 = x_149;
-x_78 = x_156;
-goto block_134;
+x_76 = x_149;
+x_77 = x_154;
+goto block_133;
 }
 else
 {
-size_t x_159; lean_object* x_160; 
-x_159 = lean_usize_of_nat(x_139);
-x_160 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__12(x_141, x_136, x_159, x_156);
-x_58 = x_151;
+size_t x_157; lean_object* x_158; 
+x_157 = lean_usize_of_nat(x_140);
+x_158 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__12(x_137, x_141, x_157, x_154);
+x_58 = x_134;
 x_59 = x_135;
 x_60 = x_136;
-x_61 = x_137;
-x_62 = x_138;
-x_63 = x_139;
-x_64 = x_140;
-x_65 = x_141;
-x_66 = x_142;
-x_67 = x_153;
-x_68 = x_143;
-x_69 = x_144;
-x_70 = x_154;
+x_61 = x_150;
+x_62 = x_137;
+x_63 = x_138;
+x_64 = x_153;
+x_65 = x_139;
+x_66 = x_140;
+x_67 = x_141;
+x_68 = x_142;
+x_69 = x_143;
+x_70 = x_144;
 x_71 = x_145;
 x_72 = x_146;
 x_73 = x_147;
-x_74 = x_155;
+x_74 = x_152;
 x_75 = x_148;
-x_76 = x_150;
-x_77 = x_149;
-x_78 = x_160;
-goto block_134;
+x_76 = x_149;
+x_77 = x_158;
+goto block_133;
 }
 }
 }
-block_187:
+block_185:
 {
-lean_object* x_175; 
-x_175 = l_Lean_EnvExtension_mkInitialExtStates(x_174);
-if (lean_obj_tag(x_175) == 0)
+lean_object* x_173; 
+x_173 = l_Lean_EnvExtension_mkInitialExtStates(x_172);
+if (lean_obj_tag(x_173) == 0)
 {
-lean_object* x_176; lean_object* x_177; uint8_t x_178; lean_object* x_179; lean_object* x_180; uint8_t x_181; 
-x_176 = lean_ctor_get(x_175, 0);
-lean_inc(x_176);
-x_177 = lean_ctor_get(x_175, 1);
-lean_inc(x_177);
-lean_dec_ref(x_175);
-x_178 = 0;
-x_179 = l_Lean_mkEmptyEnvironment___closed__6;
-x_180 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_180, 0, x_164);
-lean_ctor_set(x_180, 1, x_179);
-lean_ctor_set_uint8(x_180, sizeof(void*)*2, x_178);
-x_181 = l_Array_isEmpty___redArg(x_2);
+lean_object* x_174; lean_object* x_175; uint8_t x_176; lean_object* x_177; lean_object* x_178; uint8_t x_179; 
+x_174 = lean_ctor_get(x_173, 0);
+lean_inc(x_174);
+x_175 = lean_ctor_get(x_173, 1);
+lean_inc(x_175);
+lean_dec_ref(x_173);
+x_176 = 0;
+x_177 = l_Lean_mkEmptyEnvironment___closed__6;
+x_178 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_178, 0, x_165);
+lean_ctor_set(x_178, 1, x_177);
+lean_ctor_set_uint8(x_178, sizeof(void*)*2, x_176);
+x_179 = l_Array_isEmpty___redArg(x_2);
+if (x_179 == 0)
+{
+uint8_t x_180; 
+x_180 = 1;
+x_134 = x_160;
+x_135 = x_171;
+x_136 = x_178;
+x_137 = x_166;
+x_138 = x_167;
+x_139 = x_170;
+x_140 = x_169;
+x_141 = x_161;
+x_142 = x_176;
+x_143 = x_175;
+x_144 = x_162;
+x_145 = x_164;
+x_146 = x_163;
+x_147 = x_174;
+x_148 = x_177;
+x_149 = x_168;
+x_150 = x_180;
+goto block_159;
+}
+else
+{
+x_134 = x_160;
+x_135 = x_171;
+x_136 = x_178;
+x_137 = x_166;
+x_138 = x_167;
+x_139 = x_170;
+x_140 = x_169;
+x_141 = x_161;
+x_142 = x_176;
+x_143 = x_175;
+x_144 = x_162;
+x_145 = x_164;
+x_146 = x_163;
+x_147 = x_174;
+x_148 = x_177;
+x_149 = x_168;
+x_150 = x_176;
+goto block_159;
+}
+}
+else
+{
+uint8_t x_181; 
+lean_dec_ref(x_171);
+lean_dec(x_170);
+lean_dec(x_169);
+lean_dec_ref(x_167);
+lean_dec_ref(x_166);
+lean_dec_ref(x_165);
+lean_dec_ref(x_164);
+lean_dec_ref(x_163);
+lean_dec_ref(x_162);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+x_181 = !lean_is_exclusive(x_173);
 if (x_181 == 0)
 {
-uint8_t x_182; 
-x_182 = 1;
-x_135 = x_178;
-x_136 = x_163;
-x_137 = x_165;
-x_138 = x_176;
-x_139 = x_166;
-x_140 = x_167;
-x_141 = x_169;
-x_142 = x_177;
-x_143 = x_162;
-x_144 = x_180;
-x_145 = x_173;
-x_146 = x_168;
-x_147 = x_170;
-x_148 = x_171;
-x_149 = x_179;
-x_150 = x_172;
-x_151 = x_182;
-goto block_161;
+return x_173;
 }
 else
 {
-x_135 = x_178;
-x_136 = x_163;
-x_137 = x_165;
-x_138 = x_176;
-x_139 = x_166;
-x_140 = x_167;
-x_141 = x_169;
-x_142 = x_177;
-x_143 = x_162;
-x_144 = x_180;
-x_145 = x_173;
-x_146 = x_168;
-x_147 = x_170;
-x_148 = x_171;
-x_149 = x_179;
-x_150 = x_172;
-x_151 = x_178;
-goto block_161;
+lean_object* x_182; lean_object* x_183; lean_object* x_184; 
+x_182 = lean_ctor_get(x_173, 0);
+x_183 = lean_ctor_get(x_173, 1);
+lean_inc(x_183);
+lean_inc(x_182);
+lean_dec(x_173);
+x_184 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_184, 0, x_182);
+lean_ctor_set(x_184, 1, x_183);
+return x_184;
 }
 }
-else
+}
+block_204:
 {
-uint8_t x_183; 
-lean_dec_ref(x_173);
-lean_dec(x_172);
-lean_dec_ref(x_171);
-lean_dec_ref(x_170);
-lean_dec_ref(x_169);
-lean_dec_ref(x_168);
-lean_dec_ref(x_167);
-lean_dec(x_166);
-lean_dec_ref(x_164);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-x_183 = !lean_is_exclusive(x_175);
-if (x_183 == 0)
-{
-return x_175;
-}
-else
-{
-lean_object* x_184; lean_object* x_185; lean_object* x_186; 
-x_184 = lean_ctor_get(x_175, 0);
-x_185 = lean_ctor_get(x_175, 1);
-lean_inc(x_185);
-lean_inc(x_184);
-lean_dec(x_175);
-x_186 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_186, 0, x_184);
-lean_ctor_set(x_186, 1, x_185);
-return x_186;
-}
-}
-}
-block_206:
-{
-size_t x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; 
-x_202 = lean_array_size(x_201);
-x_203 = l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__14(x_55, x_56, x_201, x_202, x_188, x_197, x_196);
+size_t x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; 
+x_200 = lean_array_size(x_199);
+x_201 = l_Array_forIn_x27Unsafe_loop___at___Lean_finalizeImport_spec__14(x_55, x_56, x_199, x_200, x_192, x_191, x_197);
+lean_dec_ref(x_199);
+x_202 = lean_ctor_get(x_201, 0);
+lean_inc(x_202);
+x_203 = lean_ctor_get(x_201, 1);
+lean_inc(x_203);
 lean_dec_ref(x_201);
-x_204 = lean_ctor_get(x_203, 0);
-lean_inc(x_204);
-x_205 = lean_ctor_get(x_203, 1);
-lean_inc(x_205);
-lean_dec_ref(x_203);
+x_160 = x_186;
+x_161 = x_192;
 x_162 = x_193;
-x_163 = x_188;
-x_164 = x_194;
-x_165 = x_189;
-x_166 = x_190;
-x_167 = x_191;
-x_168 = x_195;
-x_169 = x_192;
-x_170 = x_198;
-x_171 = x_199;
-x_172 = x_200;
-x_173 = x_204;
-x_174 = x_205;
-goto block_187;
+x_163 = x_194;
+x_164 = x_195;
+x_165 = x_196;
+x_166 = x_187;
+x_167 = x_188;
+x_168 = x_198;
+x_169 = x_189;
+x_170 = x_190;
+x_171 = x_202;
+x_172 = x_203;
+goto block_185;
 }
-block_225:
+block_223:
 {
-if (x_209 == 0)
+if (x_212 == 0)
 {
-x_162 = x_207;
-x_163 = x_208;
-x_164 = x_218;
-x_165 = x_209;
-x_166 = x_210;
-x_167 = x_211;
-x_168 = x_213;
-x_169 = x_212;
-x_170 = x_215;
-x_171 = x_217;
-x_172 = x_216;
-x_173 = x_214;
-x_174 = x_219;
-goto block_187;
+x_160 = x_205;
+x_161 = x_207;
+x_162 = x_208;
+x_163 = x_210;
+x_164 = x_209;
+x_165 = x_216;
+x_166 = x_211;
+x_167 = x_215;
+x_168 = x_212;
+x_169 = x_214;
+x_170 = x_213;
+x_171 = x_206;
+x_172 = x_217;
+goto block_185;
 }
 else
 {
-lean_object* x_220; uint8_t x_221; 
-x_220 = lean_mk_empty_array_with_capacity(x_216);
-x_221 = lean_nat_dec_lt(x_216, x_210);
-if (x_221 == 0)
+lean_object* x_218; uint8_t x_219; 
+x_218 = lean_mk_empty_array_with_capacity(x_213);
+x_219 = lean_nat_dec_lt(x_213, x_214);
+if (x_219 == 0)
 {
-x_188 = x_208;
-x_189 = x_209;
-x_190 = x_210;
-x_191 = x_211;
-x_192 = x_212;
-x_193 = x_207;
-x_194 = x_218;
-x_195 = x_213;
-x_196 = x_219;
-x_197 = x_214;
-x_198 = x_215;
-x_199 = x_217;
-x_200 = x_216;
-x_201 = x_220;
-goto block_206;
+x_186 = x_205;
+x_187 = x_211;
+x_188 = x_215;
+x_189 = x_214;
+x_190 = x_213;
+x_191 = x_206;
+x_192 = x_207;
+x_193 = x_208;
+x_194 = x_210;
+x_195 = x_209;
+x_196 = x_216;
+x_197 = x_217;
+x_198 = x_212;
+x_199 = x_218;
+goto block_204;
 }
 else
 {
-uint8_t x_222; 
-x_222 = lean_nat_dec_le(x_210, x_210);
-if (x_222 == 0)
+uint8_t x_220; 
+x_220 = lean_nat_dec_le(x_214, x_214);
+if (x_220 == 0)
 {
-x_188 = x_208;
-x_189 = x_209;
-x_190 = x_210;
-x_191 = x_211;
-x_192 = x_212;
-x_193 = x_207;
-x_194 = x_218;
-x_195 = x_213;
-x_196 = x_219;
-x_197 = x_214;
-x_198 = x_215;
-x_199 = x_217;
-x_200 = x_216;
-x_201 = x_220;
-goto block_206;
+x_186 = x_205;
+x_187 = x_211;
+x_188 = x_215;
+x_189 = x_214;
+x_190 = x_213;
+x_191 = x_206;
+x_192 = x_207;
+x_193 = x_208;
+x_194 = x_210;
+x_195 = x_209;
+x_196 = x_216;
+x_197 = x_217;
+x_198 = x_212;
+x_199 = x_218;
+goto block_204;
 }
 else
 {
-size_t x_223; lean_object* x_224; 
-x_223 = lean_usize_of_nat(x_210);
-x_224 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__15(x_212, x_208, x_223, x_220);
-x_188 = x_208;
-x_189 = x_209;
-x_190 = x_210;
-x_191 = x_211;
-x_192 = x_212;
-x_193 = x_207;
-x_194 = x_218;
-x_195 = x_213;
-x_196 = x_219;
-x_197 = x_214;
-x_198 = x_215;
-x_199 = x_217;
-x_200 = x_216;
-x_201 = x_224;
-goto block_206;
+size_t x_221; lean_object* x_222; 
+x_221 = lean_usize_of_nat(x_214);
+x_222 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__15(x_211, x_207, x_221, x_218);
+x_186 = x_205;
+x_187 = x_211;
+x_188 = x_215;
+x_189 = x_214;
+x_190 = x_213;
+x_191 = x_206;
+x_192 = x_207;
+x_193 = x_208;
+x_194 = x_210;
+x_195 = x_209;
+x_196 = x_216;
+x_197 = x_217;
+x_198 = x_212;
+x_199 = x_222;
+goto block_204;
 }
 }
 }
 }
-block_270:
+block_268:
 {
-lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; uint8_t x_258; 
-x_239 = lean_nat_add(x_228, x_238);
-x_240 = lean_unsigned_to_nat(4u);
-x_241 = lean_nat_mul(x_239, x_240);
-lean_dec(x_239);
-x_242 = lean_unsigned_to_nat(3u);
-x_243 = lean_nat_div(x_241, x_242);
-lean_dec(x_241);
-x_244 = l_Nat_nextPowerOfTwo(x_243);
-lean_dec(x_243);
-x_245 = lean_box(0);
-x_246 = lean_mk_array(x_244, x_245);
-lean_inc(x_237);
-x_247 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_247, 0, x_237);
-lean_ctor_set(x_247, 1, x_246);
-x_248 = lean_nat_mul(x_228, x_240);
-lean_dec(x_228);
-x_249 = lean_nat_div(x_248, x_242);
-lean_dec(x_248);
-x_250 = l_Nat_nextPowerOfTwo(x_249);
-lean_dec(x_249);
-x_251 = lean_mk_array(x_250, x_245);
-lean_inc(x_237);
-x_252 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_252, 0, x_237);
-lean_ctor_set(x_252, 1, x_251);
-x_253 = lean_nat_mul(x_238, x_240);
-lean_dec(x_238);
-x_254 = lean_nat_div(x_253, x_242);
-lean_dec(x_253);
-x_255 = l_Nat_nextPowerOfTwo(x_254);
-lean_dec(x_254);
-x_256 = lean_mk_array(x_255, x_245);
-lean_inc(x_237);
-x_257 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_257, 0, x_237);
-lean_ctor_set(x_257, 1, x_256);
-x_258 = lean_nat_dec_lt(x_237, x_236);
-if (x_258 == 0)
-{
-lean_dec(x_236);
-lean_dec_ref(x_1);
-x_207 = x_226;
-x_208 = x_227;
-x_209 = x_229;
-x_210 = x_230;
-x_211 = x_231;
-x_212 = x_233;
-x_213 = x_232;
-x_214 = x_257;
-x_215 = x_235;
-x_216 = x_237;
-x_217 = x_247;
-x_218 = x_252;
-x_219 = x_234;
-goto block_225;
-}
-else
-{
-uint8_t x_259; lean_object* x_260; lean_object* x_261; 
-x_259 = 0;
-x_260 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_260, 0, x_247);
-lean_ctor_set(x_260, 1, x_252);
-lean_inc(x_237);
-x_261 = l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_finalizeImport_spec__16___redArg(x_55, x_56, x_1, x_231, x_235, x_259, x_236, x_237, x_260, x_237, x_234);
-lean_dec(x_236);
-if (lean_obj_tag(x_261) == 0)
-{
-lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; 
-x_262 = lean_ctor_get(x_261, 0);
-lean_inc(x_262);
-x_263 = lean_ctor_get(x_261, 1);
-lean_inc(x_263);
-lean_dec_ref(x_261);
-x_264 = lean_ctor_get(x_262, 0);
-lean_inc(x_264);
-x_265 = lean_ctor_get(x_262, 1);
-lean_inc(x_265);
-lean_dec(x_262);
-x_207 = x_226;
-x_208 = x_227;
-x_209 = x_229;
-x_210 = x_230;
-x_211 = x_231;
-x_212 = x_233;
-x_213 = x_232;
-x_214 = x_257;
-x_215 = x_235;
-x_216 = x_237;
-x_217 = x_264;
-x_218 = x_265;
-x_219 = x_263;
-goto block_225;
-}
-else
-{
-uint8_t x_266; 
-lean_dec_ref(x_257);
+lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; uint8_t x_256; 
+x_237 = lean_nat_add(x_227, x_236);
+x_238 = lean_unsigned_to_nat(4u);
+x_239 = lean_nat_mul(x_237, x_238);
 lean_dec(x_237);
-lean_dec_ref(x_235);
-lean_dec_ref(x_233);
-lean_dec_ref(x_232);
+x_240 = lean_unsigned_to_nat(3u);
+x_241 = lean_nat_div(x_239, x_240);
+lean_dec(x_239);
+x_242 = l_Nat_nextPowerOfTwo(x_241);
+lean_dec(x_241);
+x_243 = lean_box(0);
+x_244 = lean_mk_array(x_242, x_243);
+lean_inc(x_235);
+x_245 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_245, 0, x_235);
+lean_ctor_set(x_245, 1, x_244);
+x_246 = lean_nat_mul(x_227, x_238);
+lean_dec(x_227);
+x_247 = lean_nat_div(x_246, x_240);
+lean_dec(x_246);
+x_248 = l_Nat_nextPowerOfTwo(x_247);
+lean_dec(x_247);
+x_249 = lean_mk_array(x_248, x_243);
+lean_inc(x_235);
+x_250 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_250, 0, x_235);
+lean_ctor_set(x_250, 1, x_249);
+x_251 = lean_nat_mul(x_236, x_238);
+lean_dec(x_236);
+x_252 = lean_nat_div(x_251, x_240);
+lean_dec(x_251);
+x_253 = l_Nat_nextPowerOfTwo(x_252);
+lean_dec(x_252);
+x_254 = lean_mk_array(x_253, x_243);
+lean_inc(x_235);
+x_255 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_255, 0, x_235);
+lean_ctor_set(x_255, 1, x_254);
+x_256 = lean_nat_dec_lt(x_235, x_225);
+if (x_256 == 0)
+{
+lean_dec(x_225);
+lean_dec_ref(x_1);
+x_205 = x_224;
+x_206 = x_255;
+x_207 = x_226;
+x_208 = x_228;
+x_209 = x_229;
+x_210 = x_230;
+x_211 = x_231;
+x_212 = x_233;
+x_213 = x_235;
+x_214 = x_234;
+x_215 = x_245;
+x_216 = x_250;
+x_217 = x_232;
+goto block_223;
+}
+else
+{
+uint8_t x_257; lean_object* x_258; lean_object* x_259; 
+x_257 = 0;
+x_258 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_258, 0, x_245);
+lean_ctor_set(x_258, 1, x_250);
+lean_inc(x_235);
+x_259 = l_Std_PRange_RangeIterator_instIteratorLoop_loop___at___Lean_finalizeImport_spec__16___redArg(x_55, x_56, x_1, x_230, x_228, x_257, x_225, x_235, x_258, x_235, x_232);
+lean_dec(x_225);
+if (lean_obj_tag(x_259) == 0)
+{
+lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; 
+x_260 = lean_ctor_get(x_259, 0);
+lean_inc(x_260);
+x_261 = lean_ctor_get(x_259, 1);
+lean_inc(x_261);
+lean_dec_ref(x_259);
+x_262 = lean_ctor_get(x_260, 0);
+lean_inc(x_262);
+x_263 = lean_ctor_get(x_260, 1);
+lean_inc(x_263);
+lean_dec(x_260);
+x_205 = x_224;
+x_206 = x_255;
+x_207 = x_226;
+x_208 = x_228;
+x_209 = x_229;
+x_210 = x_230;
+x_211 = x_231;
+x_212 = x_233;
+x_213 = x_235;
+x_214 = x_234;
+x_215 = x_262;
+x_216 = x_263;
+x_217 = x_261;
+goto block_223;
+}
+else
+{
+uint8_t x_264; 
+lean_dec_ref(x_255);
+lean_dec(x_235);
+lean_dec(x_234);
 lean_dec_ref(x_231);
-lean_dec(x_230);
+lean_dec_ref(x_230);
+lean_dec_ref(x_229);
+lean_dec_ref(x_228);
 lean_dec(x_3);
 lean_dec_ref(x_2);
-x_266 = !lean_is_exclusive(x_261);
-if (x_266 == 0)
+x_264 = !lean_is_exclusive(x_259);
+if (x_264 == 0)
 {
-return x_261;
+return x_259;
 }
 else
 {
-lean_object* x_267; lean_object* x_268; lean_object* x_269; 
-x_267 = lean_ctor_get(x_261, 0);
-x_268 = lean_ctor_get(x_261, 1);
-lean_inc(x_268);
-lean_inc(x_267);
-lean_dec(x_261);
-x_269 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_269, 0, x_267);
-lean_ctor_set(x_269, 1, x_268);
-return x_269;
+lean_object* x_265; lean_object* x_266; lean_object* x_267; 
+x_265 = lean_ctor_get(x_259, 0);
+x_266 = lean_ctor_get(x_259, 1);
+lean_inc(x_266);
+lean_inc(x_265);
+lean_dec(x_259);
+x_267 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_267, 0, x_265);
+lean_ctor_set(x_267, 1, x_266);
+return x_267;
 }
 }
 }
 }
-block_287:
+block_285:
 {
-lean_object* x_282; uint8_t x_283; 
-x_282 = lean_array_get_size(x_276);
-x_283 = lean_nat_dec_lt(x_280, x_282);
-if (x_283 == 0)
+lean_object* x_280; uint8_t x_281; 
+x_280 = lean_array_get_size(x_275);
+x_281 = lean_nat_dec_lt(x_278, x_280);
+if (x_281 == 0)
 {
-lean_inc(x_280);
+lean_inc(x_278);
+x_224 = x_269;
+x_225 = x_270;
 x_226 = x_271;
-x_227 = x_272;
-x_228 = x_281;
-x_229 = x_273;
-x_230 = x_282;
-x_231 = x_274;
-x_232 = x_275;
-x_233 = x_276;
-x_234 = x_277;
+x_227 = x_279;
+x_228 = x_272;
+x_229 = x_274;
+x_230 = x_273;
+x_231 = x_275;
+x_232 = x_276;
+x_233 = x_277;
+x_234 = x_280;
 x_235 = x_278;
-x_236 = x_279;
-x_237 = x_280;
-x_238 = x_280;
-goto block_270;
+x_236 = x_278;
+goto block_268;
 }
 else
 {
-uint8_t x_284; 
-x_284 = lean_nat_dec_le(x_282, x_282);
-if (x_284 == 0)
+uint8_t x_282; 
+x_282 = lean_nat_dec_le(x_280, x_280);
+if (x_282 == 0)
 {
-lean_inc(x_280);
+lean_inc(x_278);
+x_224 = x_269;
+x_225 = x_270;
 x_226 = x_271;
-x_227 = x_272;
-x_228 = x_281;
-x_229 = x_273;
-x_230 = x_282;
-x_231 = x_274;
-x_232 = x_275;
-x_233 = x_276;
-x_234 = x_277;
+x_227 = x_279;
+x_228 = x_272;
+x_229 = x_274;
+x_230 = x_273;
+x_231 = x_275;
+x_232 = x_276;
+x_233 = x_277;
+x_234 = x_280;
 x_235 = x_278;
-x_236 = x_279;
-x_237 = x_280;
-x_238 = x_280;
-goto block_270;
+x_236 = x_278;
+goto block_268;
 }
 else
 {
-size_t x_285; lean_object* x_286; 
-x_285 = lean_usize_of_nat(x_282);
-lean_inc(x_280);
-x_286 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__18(x_276, x_272, x_285, x_280);
+size_t x_283; lean_object* x_284; 
+x_283 = lean_usize_of_nat(x_280);
+lean_inc(x_278);
+x_284 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__18(x_275, x_271, x_283, x_278);
+x_224 = x_269;
+x_225 = x_270;
 x_226 = x_271;
-x_227 = x_272;
-x_228 = x_281;
-x_229 = x_273;
-x_230 = x_282;
-x_231 = x_274;
-x_232 = x_275;
-x_233 = x_276;
-x_234 = x_277;
+x_227 = x_279;
+x_228 = x_272;
+x_229 = x_274;
+x_230 = x_273;
+x_231 = x_275;
+x_232 = x_276;
+x_233 = x_277;
+x_234 = x_280;
 x_235 = x_278;
-x_236 = x_279;
-x_237 = x_280;
-x_238 = x_286;
-goto block_270;
+x_236 = x_284;
+goto block_268;
 }
 }
 }
-block_304:
+block_302:
 {
-lean_object* x_299; uint8_t x_300; 
-x_299 = lean_array_get_size(x_295);
-x_300 = lean_nat_dec_lt(x_297, x_299);
-if (x_300 == 0)
+lean_object* x_297; uint8_t x_298; 
+x_297 = lean_array_get_size(x_289);
+x_298 = lean_nat_dec_lt(x_295, x_297);
+if (x_298 == 0)
 {
-lean_dec(x_299);
+lean_dec(x_297);
+x_269 = x_286;
+x_270 = x_287;
 x_271 = x_288;
 x_272 = x_289;
-x_273 = x_290;
-x_274 = x_291;
-x_275 = x_293;
-x_276 = x_292;
+x_273 = x_291;
+x_274 = x_290;
+x_275 = x_292;
+x_276 = x_293;
 x_277 = x_294;
 x_278 = x_295;
 x_279 = x_296;
-x_280 = x_297;
-x_281 = x_298;
-goto block_287;
+goto block_285;
 }
 else
 {
-uint8_t x_301; 
-x_301 = lean_nat_dec_le(x_299, x_299);
-if (x_301 == 0)
+uint8_t x_299; 
+x_299 = lean_nat_dec_le(x_297, x_297);
+if (x_299 == 0)
 {
-lean_dec(x_299);
+lean_dec(x_297);
+x_269 = x_286;
+x_270 = x_287;
 x_271 = x_288;
 x_272 = x_289;
-x_273 = x_290;
-x_274 = x_291;
-x_275 = x_293;
-x_276 = x_292;
+x_273 = x_291;
+x_274 = x_290;
+x_275 = x_292;
+x_276 = x_293;
 x_277 = x_294;
 x_278 = x_295;
 x_279 = x_296;
-x_280 = x_297;
-x_281 = x_298;
-goto block_287;
+goto block_285;
 }
 else
 {
-size_t x_302; lean_object* x_303; 
-x_302 = lean_usize_of_nat(x_299);
-lean_dec(x_299);
-x_303 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__19(x_295, x_289, x_302, x_298);
+size_t x_300; lean_object* x_301; 
+x_300 = lean_usize_of_nat(x_297);
+lean_dec(x_297);
+x_301 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__19(x_289, x_288, x_300, x_296);
+x_269 = x_286;
+x_270 = x_287;
 x_271 = x_288;
 x_272 = x_289;
-x_273 = x_290;
-x_274 = x_291;
-x_275 = x_293;
-x_276 = x_292;
+x_273 = x_291;
+x_274 = x_290;
+x_275 = x_292;
+x_276 = x_293;
 x_277 = x_294;
 x_278 = x_295;
-x_279 = x_296;
-x_280 = x_297;
-x_281 = x_303;
-goto block_287;
+x_279 = x_301;
+goto block_285;
 }
 }
 }
-block_334:
+block_332:
 {
-lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; size_t x_310; size_t x_311; lean_object* x_312; 
-x_306 = lean_ctor_get(x_1, 1);
-lean_inc_ref(x_306);
-x_307 = lean_unsigned_to_nat(0u);
-x_308 = lean_array_get_size(x_306);
-x_309 = l_Array_filterMapM___at___Lean_finalizeImport_spec__2(x_1, x_306, x_307, x_308);
-lean_dec(x_308);
-lean_dec_ref(x_306);
-x_310 = lean_array_size(x_309);
-x_311 = 0;
-lean_inc_ref(x_309);
-x_312 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__4(x_54, x_310, x_311, x_309, x_9);
-if (lean_obj_tag(x_312) == 0)
+lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; size_t x_308; size_t x_309; lean_object* x_310; 
+x_304 = lean_ctor_get(x_1, 1);
+lean_inc_ref(x_304);
+x_305 = lean_unsigned_to_nat(0u);
+x_306 = lean_array_get_size(x_304);
+x_307 = l_Array_filterMapM___at___Lean_finalizeImport_spec__2(x_1, x_304, x_305, x_306);
+lean_dec(x_306);
+lean_dec_ref(x_304);
+x_308 = lean_array_size(x_307);
+x_309 = 0;
+lean_inc_ref(x_307);
+x_310 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__4(x_54, x_308, x_309, x_307, x_9);
+if (lean_obj_tag(x_310) == 0)
 {
-lean_object* x_313; lean_object* x_314; lean_object* x_315; 
-x_313 = lean_ctor_get(x_312, 0);
-lean_inc(x_313);
-x_314 = lean_ctor_get(x_312, 1);
+lean_object* x_311; lean_object* x_312; lean_object* x_313; 
+x_311 = lean_ctor_get(x_310, 0);
+lean_inc(x_311);
+x_312 = lean_ctor_get(x_310, 1);
+lean_inc(x_312);
+lean_dec_ref(x_310);
+lean_inc_ref(x_307);
+x_313 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__5(x_8, x_7, x_54, x_308, x_309, x_307, x_312);
+if (lean_obj_tag(x_313) == 0)
+{
+lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; uint8_t x_320; 
+x_314 = lean_ctor_get(x_313, 0);
 lean_inc(x_314);
-lean_dec_ref(x_312);
-lean_inc_ref(x_309);
-x_315 = l_Array_mapMUnsafe_map___at___Lean_finalizeImport_spec__5(x_8, x_7, x_54, x_310, x_311, x_309, x_314);
-if (lean_obj_tag(x_315) == 0)
-{
-lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; uint8_t x_322; 
-x_316 = lean_ctor_get(x_315, 0);
-lean_inc(x_316);
-x_317 = lean_ctor_get(x_315, 1);
+x_315 = lean_ctor_get(x_313, 1);
+lean_inc(x_315);
+lean_dec_ref(x_313);
+x_316 = l_Array_unzip___redArg(x_314);
+lean_dec(x_314);
+x_317 = lean_ctor_get(x_316, 0);
 lean_inc(x_317);
-lean_dec_ref(x_315);
-x_318 = l_Array_unzip___redArg(x_316);
-lean_dec(x_316);
-x_319 = lean_ctor_get(x_318, 0);
-lean_inc(x_319);
-x_320 = lean_ctor_get(x_318, 1);
-lean_inc(x_320);
-lean_dec_ref(x_318);
-x_321 = lean_array_get_size(x_313);
-x_322 = lean_nat_dec_lt(x_307, x_321);
-if (x_322 == 0)
+x_318 = lean_ctor_get(x_316, 1);
+lean_inc(x_318);
+lean_dec_ref(x_316);
+x_319 = lean_array_get_size(x_311);
+x_320 = lean_nat_dec_lt(x_305, x_319);
+if (x_320 == 0)
 {
-x_288 = x_310;
-x_289 = x_311;
-x_290 = x_305;
-x_291 = x_313;
-x_292 = x_309;
-x_293 = x_320;
-x_294 = x_317;
-x_295 = x_319;
-x_296 = x_321;
-x_297 = x_307;
-x_298 = x_307;
-goto block_304;
+x_286 = x_308;
+x_287 = x_319;
+x_288 = x_309;
+x_289 = x_317;
+x_290 = x_318;
+x_291 = x_311;
+x_292 = x_307;
+x_293 = x_315;
+x_294 = x_303;
+x_295 = x_305;
+x_296 = x_305;
+goto block_302;
 }
 else
 {
-uint8_t x_323; 
-x_323 = lean_nat_dec_le(x_321, x_321);
-if (x_323 == 0)
+uint8_t x_321; 
+x_321 = lean_nat_dec_le(x_319, x_319);
+if (x_321 == 0)
 {
-x_288 = x_310;
-x_289 = x_311;
-x_290 = x_305;
-x_291 = x_313;
-x_292 = x_309;
-x_293 = x_320;
-x_294 = x_317;
-x_295 = x_319;
-x_296 = x_321;
-x_297 = x_307;
-x_298 = x_307;
-goto block_304;
+x_286 = x_308;
+x_287 = x_319;
+x_288 = x_309;
+x_289 = x_317;
+x_290 = x_318;
+x_291 = x_311;
+x_292 = x_307;
+x_293 = x_315;
+x_294 = x_303;
+x_295 = x_305;
+x_296 = x_305;
+goto block_302;
 }
 else
 {
-size_t x_324; lean_object* x_325; 
-x_324 = lean_usize_of_nat(x_321);
-x_325 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__20(x_313, x_311, x_324, x_307);
-x_288 = x_310;
-x_289 = x_311;
-x_290 = x_305;
-x_291 = x_313;
-x_292 = x_309;
-x_293 = x_320;
-x_294 = x_317;
-x_295 = x_319;
-x_296 = x_321;
-x_297 = x_307;
-x_298 = x_325;
-goto block_304;
+size_t x_322; lean_object* x_323; 
+x_322 = lean_usize_of_nat(x_319);
+x_323 = l_Array_foldlMUnsafe_fold___at___Lean_finalizeImport_spec__20(x_311, x_309, x_322, x_305);
+x_286 = x_308;
+x_287 = x_319;
+x_288 = x_309;
+x_289 = x_317;
+x_290 = x_318;
+x_291 = x_311;
+x_292 = x_307;
+x_293 = x_315;
+x_294 = x_303;
+x_295 = x_305;
+x_296 = x_323;
+goto block_302;
 }
 }
 }
 else
 {
-uint8_t x_326; 
+uint8_t x_324; 
+lean_dec(x_311);
+lean_dec_ref(x_307);
+lean_dec(x_3);
+lean_dec_ref(x_2);
+lean_dec_ref(x_1);
+x_324 = !lean_is_exclusive(x_313);
+if (x_324 == 0)
+{
+return x_313;
+}
+else
+{
+lean_object* x_325; lean_object* x_326; lean_object* x_327; 
+x_325 = lean_ctor_get(x_313, 0);
+x_326 = lean_ctor_get(x_313, 1);
+lean_inc(x_326);
+lean_inc(x_325);
 lean_dec(x_313);
-lean_dec_ref(x_309);
+x_327 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_327, 0, x_325);
+lean_ctor_set(x_327, 1, x_326);
+return x_327;
+}
+}
+}
+else
+{
+uint8_t x_328; 
+lean_dec_ref(x_307);
 lean_dec(x_3);
 lean_dec_ref(x_2);
 lean_dec_ref(x_1);
-x_326 = !lean_is_exclusive(x_315);
-if (x_326 == 0)
+x_328 = !lean_is_exclusive(x_310);
+if (x_328 == 0)
 {
-return x_315;
+return x_310;
 }
 else
 {
-lean_object* x_327; lean_object* x_328; lean_object* x_329; 
-x_327 = lean_ctor_get(x_315, 0);
-x_328 = lean_ctor_get(x_315, 1);
-lean_inc(x_328);
-lean_inc(x_327);
-lean_dec(x_315);
-x_329 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_329, 0, x_327);
-lean_ctor_set(x_329, 1, x_328);
-return x_329;
-}
-}
-}
-else
-{
-uint8_t x_330; 
-lean_dec_ref(x_309);
-lean_dec(x_3);
-lean_dec_ref(x_2);
-lean_dec_ref(x_1);
-x_330 = !lean_is_exclusive(x_312);
-if (x_330 == 0)
-{
-return x_312;
-}
-else
-{
-lean_object* x_331; lean_object* x_332; lean_object* x_333; 
-x_331 = lean_ctor_get(x_312, 0);
-x_332 = lean_ctor_get(x_312, 1);
-lean_inc(x_332);
-lean_inc(x_331);
-lean_dec(x_312);
-x_333 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_333, 0, x_331);
-lean_ctor_set(x_333, 1, x_332);
-return x_333;
+lean_object* x_329; lean_object* x_330; lean_object* x_331; 
+x_329 = lean_ctor_get(x_310, 0);
+x_330 = lean_ctor_get(x_310, 1);
+lean_inc(x_330);
+lean_inc(x_329);
+lean_dec(x_310);
+x_331 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_331, 0, x_329);
+lean_ctor_set(x_331, 1, x_330);
+return x_331;
 }
 }
 }
@@ -31615,7 +31456,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts___closed__1;
-x_2 = l_Lean_instImpl____x40_Lean_Environment___hyg_2222_;
+x_2 = l_Lean_instImpl____x40_Lean_Environment___hyg_2209_;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -32730,9 +32571,9 @@ block_84:
 lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 x_33 = lean_usize_to_nat(x_32);
 x_34 = l_Nat_reprFast(x_33);
-x_35 = lean_string_append(x_30, x_34);
+x_35 = lean_string_append(x_31, x_34);
 lean_dec_ref(x_34);
-x_36 = l_IO_println___at___Lean_Environment_displayStats_spec__2(x_35, x_31);
+x_36 = l_IO_println___at___Lean_Environment_displayStats_spec__2(x_35, x_30);
 if (lean_obj_tag(x_36) == 0)
 {
 lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
@@ -32950,8 +32791,8 @@ if (x_96 == 0)
 {
 lean_dec(x_95);
 lean_dec_ref(x_94);
-x_30 = x_91;
-x_31 = x_90;
+x_30 = x_90;
+x_31 = x_91;
 x_32 = x_93;
 goto block_84;
 }
@@ -32962,8 +32803,8 @@ x_97 = lean_usize_of_nat(x_95);
 lean_dec(x_95);
 x_98 = l_Array_foldrMUnsafe_fold___at___Lean_Environment_displayStats_spec__10(x_94, x_97, x_93, x_93);
 lean_dec_ref(x_94);
-x_30 = x_91;
-x_31 = x_90;
+x_30 = x_90;
+x_31 = x_91;
 x_32 = x_98;
 goto block_84;
 }
@@ -33331,13 +33172,13 @@ goto block_12;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
 x_17 = lean_ctor_get(x_16, 0);
 lean_inc(x_17);
 lean_dec_ref(x_16);
 x_18 = lean_ctor_get(x_7, 0);
 lean_inc_ref(x_18);
-x_19 = lean_ctor_get_uint8(x_7, sizeof(void*)*7);
+x_19 = lean_ctor_get_uint8(x_7, sizeof(void*)*6);
 x_20 = lean_ctor_get(x_7, 1);
 lean_inc_ref(x_20);
 x_21 = lean_ctor_get(x_7, 2);
@@ -33345,51 +33186,46 @@ lean_inc_ref(x_21);
 x_22 = lean_ctor_get(x_7, 4);
 lean_inc_ref(x_22);
 x_23 = lean_ctor_get(x_7, 5);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_7, 6);
-lean_inc_ref(x_24);
+lean_inc_ref(x_23);
 lean_inc_ref(x_7);
 lean_inc(x_3);
 lean_inc_ref(x_2);
 lean_inc_ref(x_1);
-x_25 = l_Lean_Environment_replayConsts_replayKernel_unsafe__1(x_1, x_2, x_3, x_15, x_7, x_17);
+x_24 = l_Lean_Environment_replayConsts_replayKernel_unsafe__1(x_1, x_2, x_3, x_15, x_7, x_17);
 lean_dec_ref(x_15);
-x_26 = !lean_is_exclusive(x_7);
-if (x_26 == 0)
+x_25 = !lean_is_exclusive(x_7);
+if (x_25 == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_27 = lean_ctor_get(x_7, 6);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_26 = lean_ctor_get(x_7, 5);
+lean_dec(x_26);
+x_27 = lean_ctor_get(x_7, 4);
 lean_dec(x_27);
-x_28 = lean_ctor_get(x_7, 5);
+x_28 = lean_ctor_get(x_7, 3);
 lean_dec(x_28);
-x_29 = lean_ctor_get(x_7, 4);
+x_29 = lean_ctor_get(x_7, 2);
 lean_dec(x_29);
-x_30 = lean_ctor_get(x_7, 3);
+x_30 = lean_ctor_get(x_7, 1);
 lean_dec(x_30);
-x_31 = lean_ctor_get(x_7, 2);
+x_31 = lean_ctor_get(x_7, 0);
 lean_dec(x_31);
-x_32 = lean_ctor_get(x_7, 1);
-lean_dec(x_32);
-x_33 = lean_ctor_get(x_7, 0);
-lean_dec(x_33);
-lean_ctor_set(x_7, 3, x_25);
+lean_ctor_set(x_7, 3, x_24);
 x_8 = x_7;
 goto block_12;
 }
 else
 {
-lean_object* x_34; 
+lean_object* x_32; 
 lean_dec(x_7);
-x_34 = lean_alloc_ctor(0, 7, 1);
-lean_ctor_set(x_34, 0, x_18);
-lean_ctor_set(x_34, 1, x_20);
-lean_ctor_set(x_34, 2, x_21);
-lean_ctor_set(x_34, 3, x_25);
-lean_ctor_set(x_34, 4, x_22);
-lean_ctor_set(x_34, 5, x_23);
-lean_ctor_set(x_34, 6, x_24);
-lean_ctor_set_uint8(x_34, sizeof(void*)*7, x_19);
-x_8 = x_34;
+x_32 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_32, 0, x_18);
+lean_ctor_set(x_32, 1, x_20);
+lean_ctor_set(x_32, 2, x_21);
+lean_ctor_set(x_32, 3, x_24);
+lean_ctor_set(x_32, 4, x_22);
+lean_ctor_set(x_32, 5, x_23);
+lean_ctor_set_uint8(x_32, sizeof(void*)*6, x_19);
+x_8 = x_32;
 goto block_12;
 }
 }
@@ -33632,7 +33468,7 @@ x_33 = lean_alloc_closure((void*)(l_List_forIn_x27_loop___at___Lean_Environment_
 lean_closure_set(x_33, 0, x_32);
 x_34 = l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0;
 x_35 = l_List_forIn_x27_loop___at___Lean_Environment_replayConsts_replayKernel_spec__2___redArg___closed__0;
-x_36 = lean_unsigned_to_nat(2374u);
+x_36 = lean_unsigned_to_nat(2353u);
 x_37 = lean_unsigned_to_nat(17u);
 x_38 = 1;
 x_39 = l_Lean_Name_toString(x_31, x_38, x_33);
@@ -35369,28 +35205,28 @@ return x_10;
 block_166:
 {
 lean_object* x_34; 
-x_34 = lean_st_ref_set(x_27, x_33, x_25);
-lean_dec(x_27);
+x_34 = lean_st_ref_set(x_31, x_33, x_26);
+lean_dec(x_31);
 if (lean_obj_tag(x_32) == 0)
 {
 lean_object* x_35; uint8_t x_36; 
 x_35 = lean_ctor_get(x_34, 1);
 lean_inc(x_35);
 lean_dec_ref(x_34);
-x_36 = !lean_is_exclusive(x_31);
+x_36 = !lean_is_exclusive(x_29);
 if (x_36 == 0)
 {
 lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_37 = lean_ctor_get(x_31, 6);
-x_38 = lean_ctor_get(x_31, 5);
+x_37 = lean_ctor_get(x_29, 6);
+x_38 = lean_ctor_get(x_29, 5);
 lean_dec(x_38);
-x_39 = l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(x_2, x_26, x_37);
-lean_ctor_set(x_31, 6, x_39);
-lean_ctor_set(x_31, 5, x_21);
-x_40 = l___private_Lean_Environment_0__Lean_Environment_enterAsyncRealizing(x_3, x_31);
+x_39 = l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(x_2, x_28, x_37);
+lean_ctor_set(x_29, 6, x_39);
+lean_ctor_set(x_29, 5, x_21);
+x_40 = l___private_Lean_Environment_0__Lean_Environment_enterAsyncRealizing(x_3, x_29);
 x_41 = l_Lean_Environment_realizeConst___closed__0;
 x_42 = 1;
-x_43 = l_Lean_Option_set___at___Lean_Environment_realizeConst_spec__2(x_30, x_41, x_42);
+x_43 = l_Lean_Option_set___at___Lean_Environment_realizeConst_spec__2(x_27, x_41, x_42);
 lean_inc_ref(x_40);
 x_44 = lean_apply_3(x_4, x_40, x_43, x_35);
 x_45 = lean_ctor_get(x_44, 0);
@@ -35479,12 +35315,12 @@ lean_ctor_set(x_79, 0, x_53);
 lean_ctor_set(x_79, 1, x_78);
 lean_ctor_set(x_79, 2, x_48);
 lean_inc_ref(x_79);
-x_80 = lean_io_promise_resolve(x_79, x_29, x_60);
-lean_dec(x_29);
+x_80 = lean_io_promise_resolve(x_79, x_30, x_60);
+lean_dec(x_30);
 x_81 = lean_ctor_get(x_80, 1);
 lean_inc(x_81);
 lean_dec_ref(x_80);
-x_82 = lean_apply_2(x_28, x_79, x_81);
+x_82 = lean_apply_2(x_25, x_79, x_81);
 x_6 = x_82;
 goto block_11;
 }
@@ -35551,12 +35387,12 @@ lean_ctor_set(x_105, 0, x_104);
 lean_ctor_set(x_105, 1, x_103);
 lean_ctor_set(x_105, 2, x_48);
 lean_inc_ref(x_105);
-x_106 = lean_io_promise_resolve(x_105, x_29, x_85);
-lean_dec(x_29);
+x_106 = lean_io_promise_resolve(x_105, x_30, x_85);
+lean_dec(x_30);
 x_107 = lean_ctor_get(x_106, 1);
 lean_inc(x_107);
 lean_dec_ref(x_106);
-x_108 = lean_apply_2(x_28, x_105, x_107);
+x_108 = lean_apply_2(x_25, x_105, x_107);
 x_6 = x_108;
 goto block_11;
 }
@@ -35564,14 +35400,14 @@ goto block_11;
 else
 {
 lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; uint8_t x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
-x_109 = lean_ctor_get(x_31, 0);
-x_110 = lean_ctor_get(x_31, 1);
-x_111 = lean_ctor_get(x_31, 2);
-x_112 = lean_ctor_get(x_31, 3);
-x_113 = lean_ctor_get(x_31, 4);
-x_114 = lean_ctor_get(x_31, 6);
-x_115 = lean_ctor_get(x_31, 7);
-x_116 = lean_ctor_get_uint8(x_31, sizeof(void*)*8);
+x_109 = lean_ctor_get(x_29, 0);
+x_110 = lean_ctor_get(x_29, 1);
+x_111 = lean_ctor_get(x_29, 2);
+x_112 = lean_ctor_get(x_29, 3);
+x_113 = lean_ctor_get(x_29, 4);
+x_114 = lean_ctor_get(x_29, 6);
+x_115 = lean_ctor_get(x_29, 7);
+x_116 = lean_ctor_get_uint8(x_29, sizeof(void*)*8);
 lean_inc(x_115);
 lean_inc(x_114);
 lean_inc(x_113);
@@ -35579,8 +35415,8 @@ lean_inc(x_112);
 lean_inc(x_111);
 lean_inc(x_110);
 lean_inc(x_109);
-lean_dec(x_31);
-x_117 = l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(x_2, x_26, x_114);
+lean_dec(x_29);
+x_117 = l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(x_2, x_28, x_114);
 x_118 = lean_alloc_ctor(0, 8, 1);
 lean_ctor_set(x_118, 0, x_109);
 lean_ctor_set(x_118, 1, x_110);
@@ -35594,7 +35430,7 @@ lean_ctor_set_uint8(x_118, sizeof(void*)*8, x_116);
 x_119 = l___private_Lean_Environment_0__Lean_Environment_enterAsyncRealizing(x_3, x_118);
 x_120 = l_Lean_Environment_realizeConst___closed__0;
 x_121 = 1;
-x_122 = l_Lean_Option_set___at___Lean_Environment_realizeConst_spec__2(x_30, x_120, x_121);
+x_122 = l_Lean_Option_set___at___Lean_Environment_realizeConst_spec__2(x_27, x_120, x_121);
 lean_inc_ref(x_119);
 x_123 = lean_apply_3(x_4, x_119, x_122, x_35);
 x_124 = lean_ctor_get(x_123, 0);
@@ -35691,12 +35527,12 @@ lean_ctor_set(x_158, 0, x_157);
 lean_ctor_set(x_158, 1, x_156);
 lean_ctor_set(x_158, 2, x_127);
 lean_inc_ref(x_158);
-x_159 = lean_io_promise_resolve(x_158, x_29, x_138);
-lean_dec(x_29);
+x_159 = lean_io_promise_resolve(x_158, x_30, x_138);
+lean_dec(x_30);
 x_160 = lean_ctor_get(x_159, 1);
 lean_inc(x_160);
 lean_dec_ref(x_159);
-x_161 = lean_apply_2(x_28, x_158, x_160);
+x_161 = lean_apply_2(x_25, x_158, x_160);
 x_6 = x_161;
 goto block_11;
 }
@@ -35704,10 +35540,10 @@ goto block_11;
 else
 {
 lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
-lean_dec(x_31);
 lean_dec(x_30);
 lean_dec(x_29);
-lean_dec_ref(x_26);
+lean_dec_ref(x_28);
+lean_dec(x_27);
 lean_dec(x_21);
 lean_dec_ref(x_4);
 lean_dec(x_3);
@@ -35719,7 +35555,7 @@ x_163 = lean_ctor_get(x_32, 0);
 lean_inc(x_163);
 lean_dec_ref(x_32);
 x_164 = lean_task_get_own(x_163);
-x_165 = lean_apply_2(x_28, x_164, x_162);
+x_165 = lean_apply_2(x_25, x_164, x_162);
 x_6 = x_165;
 goto block_11;
 }
@@ -35752,26 +35588,26 @@ lean_object* x_180; lean_object* x_181;
 x_180 = l_IO_Promise_result_x21___redArg(x_171);
 lean_inc(x_3);
 x_181 = l_Std_DTreeMap_Internal_Impl_insert___at___Lean_NameMap_insert_spec__0___redArg(x_3, x_180, x_177);
-x_25 = x_178;
-x_26 = x_168;
-x_27 = x_175;
-x_28 = x_167;
-x_29 = x_171;
-x_30 = x_174;
-x_31 = x_173;
+x_25 = x_167;
+x_26 = x_178;
+x_27 = x_174;
+x_28 = x_168;
+x_29 = x_173;
+x_30 = x_171;
+x_31 = x_175;
 x_32 = x_179;
 x_33 = x_181;
 goto block_166;
 }
 else
 {
-x_25 = x_178;
-x_26 = x_168;
-x_27 = x_175;
-x_28 = x_167;
-x_29 = x_171;
-x_30 = x_174;
-x_31 = x_173;
+x_25 = x_167;
+x_26 = x_178;
+x_27 = x_174;
+x_28 = x_168;
+x_29 = x_173;
+x_30 = x_171;
+x_31 = x_175;
 x_32 = x_179;
 x_33 = x_177;
 goto block_166;
@@ -36787,38 +36623,38 @@ l_Lean_instBEqConstantKind___closed__0 = _init_l_Lean_instBEqConstantKind___clos
 lean_mark_persistent(l_Lean_instBEqConstantKind___closed__0);
 l_Lean_instBEqConstantKind = _init_l_Lean_instBEqConstantKind();
 lean_mark_persistent(l_Lean_instBEqConstantKind);
-l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1573_);
-l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1573_ = _init_l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1573_();
-lean_mark_persistent(l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1573_);
+l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__0____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__1____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__2____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__3____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__4____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__5____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__6____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__7____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__8____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__9____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__10____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__11____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__12____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__13____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__14____x40_Lean_Environment___hyg_1560_);
+l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1560_ = _init_l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1560_();
+lean_mark_persistent(l_Lean_reprConstantKind___closed__15____x40_Lean_Environment___hyg_1560_);
 l_Lean_instReprConstantKind___closed__0 = _init_l_Lean_instReprConstantKind___closed__0();
 lean_mark_persistent(l_Lean_instReprConstantKind___closed__0);
 l_Lean_instReprConstantKind = _init_l_Lean_instReprConstantKind();
@@ -36849,26 +36685,26 @@ l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts___closed__1 = _ini
 lean_mark_persistent(l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts___closed__1);
 l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts = _init_l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts();
 lean_mark_persistent(l___private_Lean_Environment_0__Lean_instInhabitedAsyncConsts);
-l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2222_);
-l_Lean_instImpl____x40_Lean_Environment___hyg_2222_ = _init_l_Lean_instImpl____x40_Lean_Environment___hyg_2222_();
-lean_mark_persistent(l_Lean_instImpl____x40_Lean_Environment___hyg_2222_);
+l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__0____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__1____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__2____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__3____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__4____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__5____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__6____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__7____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl___closed__8____x40_Lean_Environment___hyg_2209_);
+l_Lean_instImpl____x40_Lean_Environment___hyg_2209_ = _init_l_Lean_instImpl____x40_Lean_Environment___hyg_2209_();
+lean_mark_persistent(l_Lean_instImpl____x40_Lean_Environment___hyg_2209_);
 l_Lean_instTypeNameAsyncConsts = _init_l_Lean_instTypeNameAsyncConsts();
 lean_mark_persistent(l_Lean_instTypeNameAsyncConsts);
 l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0 = _init_l___private_Lean_Environment_0__Lean_AsyncConsts_add___closed__0();
@@ -37042,9 +36878,9 @@ l_Lean_instInhabitedEnvExtension___lam__0___closed__0 = _init_l_Lean_instInhabit
 lean_mark_persistent(l_Lean_instInhabitedEnvExtension___lam__0___closed__0);
 l_Lean_instInhabitedEnvExtension___lam__0___closed__1 = _init_l_Lean_instInhabitedEnvExtension___lam__0___closed__1();
 lean_mark_persistent(l_Lean_instInhabitedEnvExtension___lam__0___closed__1);
-l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7407_ = _init_l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7407_();
-lean_mark_persistent(l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7407_);
-if (builtin) {res = l___private_Lean_Environment_0__Lean_EnvExtension_initFn____x40_Lean_Environment___hyg_7407_(lean_io_mk_world());
+l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7369_ = _init_l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7369_();
+lean_mark_persistent(l___private_Lean_Environment_0__Lean_EnvExtension_initFn___closed__0____x40_Lean_Environment___hyg_7369_);
+if (builtin) {res = l___private_Lean_Environment_0__Lean_EnvExtension_initFn____x40_Lean_Environment___hyg_7369_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l___private_Lean_Environment_0__Lean_EnvExtension_envExtensionsRef = lean_io_result_get_value(res);
 lean_mark_persistent(l___private_Lean_Environment_0__Lean_EnvExtension_envExtensionsRef);
@@ -37119,18 +36955,18 @@ l_Lean_instOrdOLeanLevel___closed__0 = _init_l_Lean_instOrdOLeanLevel___closed__
 lean_mark_persistent(l_Lean_instOrdOLeanLevel___closed__0);
 l_Lean_instOrdOLeanLevel = _init_l_Lean_instOrdOLeanLevel();
 lean_mark_persistent(l_Lean_instOrdOLeanLevel);
-l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9162_ = _init_l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9162_();
-lean_mark_persistent(l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9162_);
-l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9162_ = _init_l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9162_();
-lean_mark_persistent(l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9162_);
-l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9162_ = _init_l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9162_();
-lean_mark_persistent(l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9162_);
-l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9162_ = _init_l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9162_();
-lean_mark_persistent(l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9162_);
-l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9162_ = _init_l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9162_();
-lean_mark_persistent(l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9162_);
-l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9162_ = _init_l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9162_();
-lean_mark_persistent(l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9162_);
+l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9117_ = _init_l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9117_();
+lean_mark_persistent(l_Lean_reprOLeanLevel___closed__0____x40_Lean_Environment___hyg_9117_);
+l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9117_ = _init_l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9117_();
+lean_mark_persistent(l_Lean_reprOLeanLevel___closed__1____x40_Lean_Environment___hyg_9117_);
+l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9117_ = _init_l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9117_();
+lean_mark_persistent(l_Lean_reprOLeanLevel___closed__2____x40_Lean_Environment___hyg_9117_);
+l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9117_ = _init_l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9117_();
+lean_mark_persistent(l_Lean_reprOLeanLevel___closed__3____x40_Lean_Environment___hyg_9117_);
+l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9117_ = _init_l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9117_();
+lean_mark_persistent(l_Lean_reprOLeanLevel___closed__4____x40_Lean_Environment___hyg_9117_);
+l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9117_ = _init_l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9117_();
+lean_mark_persistent(l_Lean_reprOLeanLevel___closed__5____x40_Lean_Environment___hyg_9117_);
 l_Lean_instReprOLeanLevel___closed__0 = _init_l_Lean_instReprOLeanLevel___closed__0();
 lean_mark_persistent(l_Lean_instReprOLeanLevel___closed__0);
 l_Lean_instReprOLeanLevel = _init_l_Lean_instReprOLeanLevel();
@@ -37147,9 +36983,9 @@ l_Lean_instInhabitedPersistentEnvExtension___closed__0 = _init_l_Lean_instInhabi
 lean_mark_persistent(l_Lean_instInhabitedPersistentEnvExtension___closed__0);
 l_Lean_PersistentEnvExtension_getModuleEntries_unsafe__1___redArg___closed__0 = _init_l_Lean_PersistentEnvExtension_getModuleEntries_unsafe__1___redArg___closed__0();
 lean_mark_persistent(l_Lean_PersistentEnvExtension_getModuleEntries_unsafe__1___redArg___closed__0);
-l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9655_ = _init_l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9655_();
-lean_mark_persistent(l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9655_);
-if (builtin) {res = l_Lean_initFn____x40_Lean_Environment___hyg_9655_(lean_io_mk_world());
+l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9610_ = _init_l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9610_();
+lean_mark_persistent(l_Lean_initFn___closed__0____x40_Lean_Environment___hyg_9610_);
+if (builtin) {res = l_Lean_initFn____x40_Lean_Environment___hyg_9610_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_persistentEnvExtensionsRef = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_persistentEnvExtensionsRef);
diff --git a/stage0/stdlib/Lean/Meta/Eval.c b/stage0/stdlib/Lean/Meta/Eval.c
index 24e87801ca..1ea7762c83 100644
--- a/stage0/stdlib/Lean/Meta/Eval.c
+++ b/stage0/stdlib/Lean/Meta/Eval.c
@@ -937,7 +937,7 @@ lean_inc_ref(x_135);
 x_136 = lean_ctor_get(x_121, 0);
 lean_inc_ref(x_136);
 lean_dec(x_121);
-x_137 = lean_array_to_list(x_98);
+x_137 = lean_array_to_list(x_97);
 lean_inc(x_100);
 x_138 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_138, 0, x_100);
@@ -946,7 +946,7 @@ lean_ctor_set(x_138, 2, x_107);
 x_139 = lean_box(0);
 lean_inc(x_100);
 lean_ctor_set_tag(x_119, 1);
-lean_ctor_set(x_119, 1, x_97);
+lean_ctor_set(x_119, 1, x_98);
 lean_ctor_set(x_119, 0, x_100);
 x_140 = lean_alloc_ctor(0, 4, 1);
 lean_ctor_set(x_140, 0, x_138);
@@ -1078,7 +1078,7 @@ lean_inc_ref(x_162);
 x_163 = lean_ctor_get(x_148, 0);
 lean_inc_ref(x_163);
 lean_dec(x_148);
-x_164 = lean_array_to_list(x_98);
+x_164 = lean_array_to_list(x_97);
 lean_inc(x_100);
 x_165 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_165, 0, x_100);
@@ -1088,7 +1088,7 @@ x_166 = lean_box(0);
 lean_inc(x_100);
 x_167 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_167, 0, x_100);
-lean_ctor_set(x_167, 1, x_97);
+lean_ctor_set(x_167, 1, x_98);
 x_168 = lean_alloc_ctor(0, 4, 1);
 lean_ctor_set(x_168, 0, x_165);
 lean_ctor_set(x_168, 1, x_99);
@@ -1194,8 +1194,8 @@ lean_dec(x_102);
 lean_dec_ref(x_101);
 lean_dec(x_100);
 lean_dec_ref(x_99);
-lean_dec_ref(x_98);
-lean_dec(x_97);
+lean_dec(x_98);
+lean_dec_ref(x_97);
 x_176 = !lean_is_exclusive(x_117);
 if (x_176 == 0)
 {
@@ -1226,8 +1226,8 @@ lean_dec(x_102);
 lean_dec_ref(x_101);
 lean_dec(x_100);
 lean_dec_ref(x_99);
-lean_dec_ref(x_98);
-lean_dec(x_97);
+lean_dec(x_98);
+lean_dec_ref(x_97);
 x_180 = !lean_is_exclusive(x_109);
 if (x_180 == 0)
 {
@@ -1257,8 +1257,8 @@ lean_dec(x_102);
 lean_dec_ref(x_101);
 lean_dec(x_100);
 lean_dec_ref(x_99);
-lean_dec_ref(x_98);
-lean_dec(x_97);
+lean_dec(x_98);
+lean_dec_ref(x_97);
 lean_dec_ref(x_1);
 x_184 = !lean_is_exclusive(x_106);
 if (x_184 == 0)
@@ -1310,8 +1310,8 @@ if (x_207 == 0)
 {
 lean_free_object(x_199);
 lean_free_object(x_195);
-x_97 = x_206;
-x_98 = x_205;
+x_97 = x_205;
+x_98 = x_206;
 x_99 = x_201;
 x_100 = x_197;
 x_101 = x_189;
@@ -1380,8 +1380,8 @@ x_222 = l_Lean_Expr_hasMVar(x_216);
 if (x_222 == 0)
 {
 lean_free_object(x_195);
-x_97 = x_221;
-x_98 = x_220;
+x_97 = x_220;
+x_98 = x_221;
 x_99 = x_216;
 x_100 = x_197;
 x_101 = x_189;
@@ -1466,8 +1466,8 @@ x_242 = l_Lean_Expr_hasMVar(x_235);
 if (x_242 == 0)
 {
 lean_dec(x_237);
-x_97 = x_241;
-x_98 = x_240;
+x_97 = x_240;
+x_98 = x_241;
 x_99 = x_235;
 x_100 = x_232;
 x_101 = x_189;
diff --git a/stage0/stdlib/Lean/Meta/SizeOf.c b/stage0/stdlib/Lean/Meta/SizeOf.c
index 2056da7ee1..e9daa49139 100644
--- a/stage0/stdlib/Lean/Meta/SizeOf.c
+++ b/stage0/stdlib/Lean/Meta/SizeOf.c
@@ -5878,7 +5878,7 @@ x_29 = l_Array_ofSubarray___redArg(x_21);
 lean_dec_ref(x_21);
 lean_inc_ref(x_29);
 x_30 = lean_alloc_closure((void*)(l_Lean_Meta_mkSizeOfFn___lam__5___boxed), 18, 12);
-lean_closure_set(x_30, 0, x_19);
+lean_closure_set(x_30, 0, x_20);
 lean_closure_set(x_30, 1, x_18);
 lean_closure_set(x_30, 2, x_27);
 lean_closure_set(x_30, 3, x_4);
@@ -5888,7 +5888,7 @@ lean_closure_set(x_30, 6, x_26);
 lean_closure_set(x_30, 7, x_28);
 lean_closure_set(x_30, 8, x_5);
 lean_closure_set(x_30, 9, x_6);
-lean_closure_set(x_30, 10, x_20);
+lean_closure_set(x_30, 10, x_19);
 lean_closure_set(x_30, 11, x_7);
 x_31 = l___private_Lean_Meta_SizeOf_0__Lean_Meta_mkLocalInstances___redArg(x_29, x_30, x_13, x_14, x_15, x_16, x_17);
 return x_31;
@@ -5930,8 +5930,8 @@ x_49 = lean_array_get_size(x_11);
 x_50 = lean_nat_dec_le(x_46, x_48);
 if (x_50 == 0)
 {
-x_33 = x_41;
-x_34 = x_45;
+x_33 = x_45;
+x_34 = x_41;
 x_35 = x_47;
 x_36 = x_42;
 x_37 = x_49;
@@ -5941,8 +5941,8 @@ goto block_40;
 else
 {
 lean_dec(x_46);
-x_33 = x_41;
-x_34 = x_45;
+x_33 = x_45;
+x_34 = x_41;
 x_35 = x_47;
 x_36 = x_42;
 x_37 = x_49;
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
index 83af36ffdd..2e7e99491c 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
@@ -290,7 +290,6 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_____private_Lean_Meta_Tacti
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_erase___at___Lean_Meta_SimpTheorems_eraseCore_spec__0(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binInsertM___at_____private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___at___Lean_Meta_DiscrTree_insertCore___at___Lean_Meta_SimpTheorems_addSimpTheorem_spec__0_spec__0_spec__2___lam__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_shouldPreprocess___lam__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(uint8_t, uint8_t);
 lean_object* l_Lean_Expr_constName_x21(lean_object*);
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_isRflProofCore___closed__1;
 static lean_object* l_Lean_Meta_initFn___closed__6____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_6_;
@@ -390,6 +389,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_
 static lean_object* l___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_isRflProofCore___closed__3;
 static lean_object* l___auto___closed__20____x40_Lean_Meta_Tactic_Simp_SimpTheorems___hyg_6937_;
 static lean_object* l_Lean_Meta_ppOrigin___redArg___closed__6;
+uint8_t l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at_____private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_isPerm_spec__0___redArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_ppOrigin___redArg___closed__5;
 LEAN_EXPORT uint8_t l_Lean_PersistentHashMap_containsAtAux___at___Lean_PersistentHashMap_containsAux___at___Lean_PersistentHashMap_contains___at_____private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_eraseIfExists_spec__0_spec__0_spec__0(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -11395,7 +11395,7 @@ x_6 = lean_ctor_get(x_1, 0);
 x_7 = lean_ctor_get(x_2, 0);
 x_8 = lean_unbox(x_6);
 x_9 = lean_unbox(x_7);
-x_10 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1555_(x_8, x_9);
+x_10 = l_Lean_beqConstantKind____x40_Lean_Environment___hyg_1542_(x_8, x_9);
 return x_10;
 }
 }