diff --git a/stage0/library/Init/Lean/Expr.c b/stage0/library/Init/Lean/Expr.c
index ca375256a4..0006ea7785 100644
--- a/stage0/library/Init/Lean/Expr.c
+++ b/stage0/library/Init/Lean/Expr.c
@@ -13,8 +13,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed__const__1;
-lean_object* l_Lean_Expr_mkCachedData___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_mkData___boxed__const__1;
 lean_object* l_Lean_Expr_hasLooseBVars___boxed(lean_object*);
 lean_object* l_Lean_mkAppN___boxed(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasFVar(lean_object*);
@@ -28,6 +27,7 @@ lean_object* l_Lean_Expr_bvarIdx_x21___closed__2;
 lean_object* l_Lean_Expr_bindingBody_x21(lean_object*);
 lean_object* l_Lean_Literal_type___boxed(lean_object*);
 lean_object* l_Lean_Expr_updateProj___boxed(lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_hasBeq(uint64_t, uint64_t);
 uint8_t lean_expr_binder_info(lean_object*);
 uint8_t lean_name_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bindingName_x21___boxed(lean_object*);
@@ -37,9 +37,9 @@ lean_object* lean_expr_mk_sort(lean_object*);
 lean_object* l_Lean_Expr_betaRev(lean_object*, lean_object*);
 lean_object* l_Lean_ExprStructEq_HasRepr(lean_object*);
 lean_object* l___private_Init_Lean_Expr_6__mkAppRevRangeAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+uint64_t l_Lean_Expr_mkDataForBinder(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
 lean_object* l_Lean_MData_empty;
 extern lean_object* l_Nat_Inhabited;
-size_t l_Lean_Expr_CachedData_hash(uint64_t);
 lean_object* lean_expr_update_app(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateSort___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppRevArgs(lean_object*);
@@ -50,15 +50,16 @@ lean_object* l_Lean_Expr_withApp(lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isSort(lean_object*);
 lean_object* l_Lean_Expr_bvarIdx_x21(lean_object*);
+lean_object* l_Lean_Expr_mkData___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Literal_type___closed__2;
 uint8_t l_Lean_Expr_isConst(lean_object*);
 lean_object* l___private_Init_Lean_Expr_9__etaExpandedAux(lean_object*, lean_object*);
-lean_object* l_Lean_Expr_CachedData_hash___boxed(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_mkAppRev___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bindingName_x21___closed__1;
 lean_object* l_Lean_Expr_withAppAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Expr_CachedData_hasLevelParam___boxed(lean_object*);
+lean_object* l_Lean_Expr_Data_looseBVarRange___boxed(lean_object*);
+lean_object* l_Lean_Expr_mkDataForLet___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_HasBeq___closed__1;
 lean_object* l_Lean_Expr_bindingBody_x21___boxed(lean_object*);
 lean_object* l_Lean_Expr_isAppOfArity___main___boxed(lean_object*, lean_object*, lean_object*);
@@ -75,38 +76,37 @@ lean_object* l_Array_iterateMAux___main___at_Lean_mkAppN___spec__1___boxed(lean_
 lean_object* l_Lean_Expr_appFn_x21___boxed(lean_object*);
 size_t l_List_hash___at_Lean_mkConst___spec__1(lean_object*);
 extern lean_object* l_List_get_x21___main___rarg___closed__2;
-uint8_t l_Lean_Expr_CachedData_hasLevelParam(uint64_t);
 lean_object* l_Lean_Expr_updateLambda_x21___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_hasLooseBVar___boxed(lean_object*, lean_object*);
 uint8_t lean_level_has_mvar(lean_object*);
+uint64_t l_Lean_Expr_mkData___closed__1;
 lean_object* l_Lean_ExprStructEq_Hashable;
 lean_object* lean_expr_dbg_to_string(lean_object*);
+lean_object* l_Lean_Expr_Data_hasExprMVar___boxed(lean_object*);
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_instantiate1___boxed(lean_object*, lean_object*);
 uint64_t l_Lean_BinderInfo_toUInt64(uint8_t);
-uint64_t l_Lean_Expr_mkCachedData___closed__4;
 lean_object* l_Lean_mkStrLit(lean_object*);
 lean_object* l_Lean_Expr_eqv___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkDecIsTrue___closed__4;
 lean_object* l_Lean_Expr_withAppRev(lean_object*);
 uint8_t l_UInt64_decEq(uint64_t, uint64_t);
 lean_object* l_Lean_ExprStructEq_HasBeq___closed__1;
-uint8_t l_Lean_Expr_CachedData_hasLevelMVar(uint64_t);
 lean_object* l_Lean_Literal_inhabited;
 lean_object* l_Lean_Expr_fvarId_x21___closed__2;
-uint64_t lean_expr_cached_data(lean_object*);
 lean_object* l_Lean_Expr_isBVar___boxed(lean_object*);
 lean_object* l_Lean_Expr_Inhabited___closed__1;
 lean_object* lean_expr_instantiate(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_letName_x21___closed__2;
 lean_object* l_Lean_Expr_getAppNumArgsAux___boxed(lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_nonDepLet(uint64_t);
 lean_object* lean_expr_instantiate_rev_range(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Expr_7__betaRevAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_mk_local(lean_object*, lean_object*, lean_object*, uint8_t);
+lean_object* l_Lean_Expr_Data_hasLevelParam___boxed(lean_object*);
 lean_object* l_Lean_Expr_quickLt___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_hasExprMVar___boxed(lean_object*);
 lean_object* l_Lean_Expr_isAppOf___boxed(lean_object*, lean_object*);
-uint64_t l_Lean_Expr_mkCachedData___closed__1;
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateLet_x21(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_BinderInfo_toUInt64___boxed(lean_object*);
@@ -116,11 +116,11 @@ lean_object* l_Lean_Expr_looseBVarRange(lean_object*);
 lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
 lean_object* l_Lean_mkLet(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Literal_hashable___closed__1;
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4;
 lean_object* l_Lean_Expr_hasFVarEx___boxed(lean_object*);
 lean_object* l_Lean_exprToExprStructEq___boxed(lean_object*);
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Expr_hasMVarEx___boxed(lean_object*);
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed__const__1;
 lean_object* lean_expr_mk_fvar(lean_object*);
 uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
@@ -128,11 +128,14 @@ extern lean_object* l_Lean_Inhabited;
 lean_object* l_Lean_mkDecIsFalse___closed__1;
 lean_object* l_Lean_Expr_isAppOfArity___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Expr_8__etaExpandedBody(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_Data_hasLevelMVar___boxed(lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_Literal_type(lean_object*);
 lean_object* l_Lean_mkDecIsTrue___closed__3;
 lean_object* l_Lean_Expr_isProj___boxed(lean_object*);
 lean_object* lean_expr_mk_forall(lean_object*, lean_object*, lean_object*, uint8_t);
+uint32_t l_Lean_Expr_Data_looseBVarRange(uint64_t);
 size_t l_Lean_Literal_hash(lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21___main(lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
@@ -141,6 +144,7 @@ size_t l_Lean_BinderInfo_hash(uint8_t);
 lean_object* l_Lean_Expr_equal___boxed(lean_object*, lean_object*);
 uint64_t l_UInt64_add(uint64_t, uint64_t);
 lean_object* l_Lean_Expr_isConstOf___boxed(lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_hasLevelMVar(uint64_t);
 lean_object* l_Lean_Expr_hasMVar___boxed(lean_object*);
 lean_object* l_Lean_Expr_HasToString___closed__1;
 uint64_t l_Bool_toUInt64(uint8_t);
@@ -156,7 +160,6 @@ lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_Expr_withAppAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkLocal(lean_object*, lean_object*, lean_object*, uint8_t);
 uint32_t lean_expr_loose_bvar_range(lean_object*);
-uint64_t l_Lean_Expr_cachedData(lean_object*);
 lean_object* l_Lean_Expr_appArg_x21___closed__1;
 lean_object* l_Lean_Expr_getRevArg_x21___boxed(lean_object*, lean_object*);
 lean_object* lean_expr_update_forall(lean_object*, uint8_t, lean_object*, lean_object*);
@@ -166,7 +169,6 @@ lean_object* l_Lean_Expr_constName_x21___closed__2;
 lean_object* l_Lean_Expr_appFn_x21(lean_object*);
 lean_object* l_Lean_BinderInfo_beq___boxed(lean_object*, lean_object*);
 uint8_t lean_expr_has_level_mvar(lean_object*);
-uint64_t l_Lean_Expr_CachedData_inhabited;
 lean_object* l_Lean_mkCAppN(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isLet(lean_object*);
 lean_object* l___private_Init_Lean_Expr_7__betaRevAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -178,6 +180,7 @@ lean_object* l_Lean_Expr_updateFn___main___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_BinderInfo_hash___boxed(lean_object*);
 uint32_t l_UInt64_toUInt32(uint64_t);
 lean_object* l_Lean_Expr_getRevArgD(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_data___boxed(lean_object*);
 lean_object* l_Lean_Expr_updateFn___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateForall_x21___closed__1;
 lean_object* l_Lean_Expr_bindingDomain_x21(lean_object*);
@@ -191,8 +194,8 @@ uint8_t lean_expr_eqv(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateMData___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21___main___closed__1;
 lean_object* l_Lean_Expr_withAppRev___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_Expr_CachedData_hasFVar___boxed(lean_object*);
 lean_object* l_Lean_Expr_mvarId_x21___boxed(lean_object*);
+uint64_t l_Lean_Expr_data(lean_object*);
 lean_object* l_Lean_Expr_updateForall_x21(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_mkForallEx___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint64_t l_UInt64_shiftLeft(uint64_t, uint64_t);
@@ -206,24 +209,24 @@ lean_object* l_Lean_ExprStructEq_HasRepr___boxed(lean_object*);
 uint64_t lean_uint64_of_nat(lean_object*);
 lean_object* l_Lean_Literal_type___closed__6;
 lean_object* l_Lean_Expr_dbgToString___boxed(lean_object*);
-lean_object* l_Lean_Expr_CachedData_nonDepLet___boxed(lean_object*);
 uint8_t lean_expr_equal(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateSort_x21___closed__2;
 lean_object* l_Lean_Expr_instantiateRev___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkSort(lean_object*);
 lean_object* l_Lean_Expr_appFn_x21___closed__1;
-uint64_t l_Lean_Expr_mkCachedDataForBinder(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__3;
+lean_object* l_Lean_Expr_Data_binderInfo___boxed(lean_object*);
+uint64_t l_Lean_Expr_mkDataForLet(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
+uint64_t l___private_Init_Lean_Expr_1__Expr_mkDataCore(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
 lean_object* l_Lean_Expr_Inhabited;
 lean_object* l_Lean_Expr_updateForallE_x21(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_withApp___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_binderInfo___boxed(lean_object*);
 lean_object* lean_expr_mk_mdata(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__3;
 lean_object* l___private_Init_Lean_Expr_2__mkAppRangeAux(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_string_hash(lean_object*);
 lean_object* l_Lean_Expr_instantiate___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_BinderInfo_hashable___closed__1;
-lean_object* l_Lean_Expr_CachedData_looseBVarRange___boxed(lean_object*);
 lean_object* l_Lean_Expr_constName_x21___closed__1;
 uint8_t l_Lean_Expr_isForall(lean_object*);
 uint8_t lean_expr_has_expr_mvar(lean_object*);
@@ -239,12 +242,11 @@ lean_object* l_Lean_Expr_withAppAux(lean_object*);
 lean_object* l_Lean_Literal_inhabited___closed__1;
 lean_object* l_Lean_mkDecIsFalse(lean_object*, lean_object*);
 lean_object* l_Lean_mkFVar(lean_object*);
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_ExprStructEq_beq___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Expr_CachedData_binderInfo___boxed(lean_object*);
 lean_object* l___private_Init_Lean_Expr_8__etaExpandedBody___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_HasRepr;
-lean_object* l_Lean_Expr_mkCachedDataForBinder___boxed__const__1;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateApp_x21___closed__1;
 lean_object* l_Lean_Expr_constLevels_x21___closed__1;
@@ -254,11 +256,14 @@ uint8_t l_Lean_BinderInfo_beq(uint8_t, uint8_t);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 uint8_t lean_level_has_param(lean_object*);
 lean_object* l_Lean_Expr_updateLet___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_mkDataForBinder___boxed__const__1;
 uint8_t lean_expr_has_mvar(lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_hasExprMVar(uint64_t);
 lean_object* l_Lean_Expr_updateLet_x21___closed__1;
 lean_object* l_Lean_mkDecIsTrue___closed__2;
 lean_object* l___private_Init_Lean_Expr_5__withAppRevAux(lean_object*);
+uint8_t l_Lean_Expr_Data_hasLevelParam(uint64_t);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_mkAppRev___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_update_proj(lean_object*, lean_object*);
 lean_object* l_Lean_BinderInfo_hasBeq;
@@ -270,12 +275,10 @@ lean_object* l_List_hash___at_Lean_mkConst___spec__1___boxed(lean_object*);
 lean_object* lean_expr_update_mdata(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_instantiateRevRange___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppFn___main___boxed(lean_object*);
-lean_object* l_Lean_Expr_mkCachedDataForLet___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isFVar(lean_object*);
 lean_object* lean_array_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bindingName_x21(lean_object*);
 lean_object* l_Lean_mkCAppN___boxed(lean_object*, lean_object*);
-uint64_t l_Lean_Expr_mkCachedData___closed__2;
 uint8_t l_Lean_BinderInfo_isInstImplicit(uint8_t);
 lean_object* l_Lean_Expr_looseBVarRangeEx___boxed(lean_object*);
 lean_object* l___private_Init_Util_1__mkPanicMessage(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -290,7 +293,6 @@ lean_object* l_Lean_Expr_fvarId_x21___boxed(lean_object*);
 lean_object* l_Lean_Expr_updateLambda___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateConst_x21___closed__1;
 lean_object* l_Lean_mkDecIsTrue___closed__5;
-uint64_t l_Lean_Expr_mkCachedData___closed__3;
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_hasFVar___boxed(lean_object*);
@@ -301,23 +303,23 @@ uint8_t l_Lean_Expr_isBinding(lean_object*);
 lean_object* l_Lean_Expr_mvarId_x21___closed__2;
 lean_object* l_Lean_Expr_appFn_x21___closed__2;
 uint8_t l_Lean_Expr_isMVar(lean_object*);
+uint64_t l_Lean_Expr_mkData___closed__4;
 lean_object* lean_expr_update_lambda(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Expr_5__withAppRevAux___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_letName_x21___boxed(lean_object*);
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1;
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
 lean_object* l___private_Init_Lean_Expr_5__withAppRevAux___main___rarg(lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_hasFVar(uint64_t);
 lean_object* l_Lean_Expr_getArg_x21___boxed(lean_object*, lean_object*, lean_object*);
-uint32_t l_Lean_Expr_CachedData_looseBVarRange(uint64_t);
 lean_object* lean_instantiate_lparams(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_withAppAux___main(lean_object*);
 lean_object* l_Lean_Expr_letName_x21___closed__1;
-uint64_t l_Lean_Expr_mkCachedData(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t);
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1;
 lean_object* lean_expr_abstract_range(lean_object*, lean_object*, lean_object*);
 lean_object* l_panic(lean_object*, lean_object*, lean_object*);
-uint64_t l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
+uint64_t l_Lean_Expr_mkData(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t);
 lean_object* l_Lean_Expr_updateLambda_x21___closed__2;
 lean_object* l_Lean_Expr_appArg_x21___boxed(lean_object*);
+size_t l_Lean_Expr_Data_hash(uint64_t);
 lean_object* l___private_Init_Lean_Expr_3__getAppArgsAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateConst_x21(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_updateLambda_x21___closed__1;
@@ -326,7 +328,6 @@ lean_object* l_Lean_mkMData(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Expr_4__getAppRevArgsAux(lean_object*, lean_object*);
 size_t lean_usize_mix_hash(size_t, size_t);
 uint8_t lean_expr_lt(lean_object*, lean_object*);
-lean_object* l_Lean_Expr_CachedData_hasLevelMVar___boxed(lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21___main___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bindingDomain_x21___closed__1;
 lean_object* l___private_Init_Lean_Expr_7__betaRevAux(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -336,11 +337,13 @@ lean_object* lean_expr_mk_let(lean_object*, lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_Expr_updateApp___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_betaRev___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_bvarIdx_x21___boxed(lean_object*);
+lean_object* l_Lean_Expr_mkDataForBinder___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isApp(lean_object*);
 lean_object* l_Lean_mkProj(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_hasLevelMVar___boxed(lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_mkCAppB(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_Data_nonDepLet___boxed(lean_object*);
 lean_object* l_Lean_Expr_bindingDomain_x21___boxed(lean_object*);
 lean_object* l_Lean_mkDecIsTrue(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasLevelParam(lean_object*);
@@ -348,18 +351,20 @@ uint8_t lean_expr_has_fvar(lean_object*);
 lean_object* l_Lean_Expr_updateForall___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_abstract___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Expr_mkCachedData___boxed__const__1;
 lean_object* l_Lean_Expr_bindingName_x21___closed__2;
 lean_object* l_Lean_Expr_updateSort_x21(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_Data_hash___boxed(lean_object*);
 uint8_t l_Lean_Expr_isConstOf(lean_object*, lean_object*);
+uint64_t l_Lean_Expr_Data_inhabited;
 uint8_t l_Lean_Expr_isAppOf(lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_hasExprMVar(uint64_t);
 size_t l_Lean_ExprStructEq_hash(lean_object*);
 lean_object* l_Lean_Expr_getRevArgD___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Literal_hash___boxed(lean_object*);
 lean_object* l_Lean_Expr_getAppArgs___closed__1;
 lean_object* l_Lean_Expr_updateProj_x21(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_Data_hasFVar___boxed(lean_object*);
 lean_object* l_Lean_Expr_hashEx___boxed(lean_object*);
+lean_object* l_Lean_Expr_Data_hasBeq___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Expr_2__mkAppRangeAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_mvarId_x21___closed__1;
 lean_object* l_Lean_Expr_updateLambdaE_x21___closed__1;
@@ -377,9 +382,9 @@ lean_object* l_Lean_ExprStructEq_HasToString___boxed(lean_object*);
 lean_object* l___private_Init_Lean_Expr_6__mkAppRevRangeAux(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_binderInfo(lean_object*);
 lean_object* l_Lean_Expr_updateFn___main(lean_object*, lean_object*);
+uint64_t l_Lean_Expr_mkData___closed__3;
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
 lean_object* l_Lean_Literal_type___closed__4;
-lean_object* l_Lean_Expr_cachedData___boxed(lean_object*);
 lean_object* l_Lean_Expr_HasBeq;
 lean_object* l_Lean_Expr_getRevArgD___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t l_List_foldr___main___at_Lean_mkConst___spec__4(uint8_t, lean_object*);
@@ -388,15 +393,13 @@ lean_object* lean_uint32_to_nat(uint32_t);
 lean_object* lean_expr_mk_lambda(lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_mkAppRev___boxed(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isBVar(lean_object*);
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint64_t l_Lean_Expr_mkData___closed__2;
 lean_object* l_Lean_Expr_hasLevelParam___boxed(lean_object*);
 lean_object* l_Lean_Expr_updateSort_x21___closed__1;
 lean_object* l_Lean_Expr_isBinding___boxed(lean_object*);
 uint8_t l_Lean_Expr_hasExprMVar(lean_object*);
 lean_object* l_Lean_Expr_Hashable;
 lean_object* l_Lean_Expr_updateMData_x21___closed__1;
-lean_object* l_Lean_Expr_mkCachedDataForLet___boxed__const__1;
-uint8_t l_Lean_Expr_CachedData_hasBeq(uint64_t, uint64_t);
 lean_object* l_Lean_Expr_getAppNumArgs___boxed(lean_object*);
 lean_object* l_Lean_mkLambdaEx___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_binderInfoEx___boxed(lean_object*);
@@ -427,14 +430,14 @@ lean_object* l_Lean_Expr_mkAppRevRange(lean_object*, lean_object*, lean_object*,
 uint8_t l_List_foldr___main___at_Lean_mkConst___spec__3(uint8_t, lean_object*);
 uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_isForall___boxed(lean_object*);
-uint8_t l_Lean_Expr_CachedData_nonDepLet(uint64_t);
+lean_object* l_Lean_Expr_mkDataForLet___boxed__const__1;
 size_t l_List_foldl___main___at_Lean_mkConst___spec__2(size_t, lean_object*);
 lean_object* l_Lean_Literal_type___closed__1;
 uint64_t l_UInt64_land(uint64_t, uint64_t);
 lean_object* l_Lean_Expr_mkAppRevRange___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Expr_5__withAppRevAux___main(lean_object*);
 lean_object* l_Lean_Expr_bindingBody_x21___closed__1;
-lean_object* l_Lean_Expr_CachedData_hasBeq___boxed(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4;
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_isMVar___boxed(lean_object*);
 lean_object* l_Lean_ExprStructEq_Inhabited;
@@ -442,22 +445,17 @@ lean_object* l_Lean_mkDecIsFalse___closed__3;
 lean_object* l___private_Init_Lean_Expr_9__etaExpandedAux___main(lean_object*, lean_object*);
 lean_object* l_Lean_mkForall___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_hasExprMVarEx___boxed(lean_object*);
-uint64_t l_Lean_Expr_mkCachedDataForLet(size_t, lean_object*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
 lean_object* l_Lean_mkDecIsFalse___closed__2;
 lean_object* l_List_foldl___main___at_Lean_mkConst___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkBVar(lean_object*);
-lean_object* l_Lean_Expr_mkCachedDataForBinder___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Expr_cachedDataEx___boxed(lean_object*);
 lean_object* l_Lean_Expr_isConst___boxed(lean_object*);
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_instantiateLevelParams___boxed(lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_hasFVar(uint64_t);
-lean_object* l_Lean_Expr_CachedData_hasExprMVar___boxed(lean_object*);
 lean_object* l_Lean_Literal_type___closed__3;
 lean_object* l___private_Init_Lean_Expr_2__mkAppRangeAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_lt___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_ExprStructEq_Hashable___closed__1;
 lean_object* lean_expr_update_let(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 uint8_t l_Lean_Expr_hasLevelMVar(lean_object*);
 uint8_t l_Lean_Expr_isLambda(lean_object*);
 uint8_t lean_expr_has_level_param(lean_object*);
@@ -796,7 +794,7 @@ x_1 = lean_box(0);
 return x_1;
 }
 }
-uint64_t _init_l_Lean_Expr_CachedData_inhabited() {
+uint64_t _init_l_Lean_Expr_Data_inhabited() {
 _start:
 {
 uint64_t x_1; 
@@ -804,7 +802,7 @@ x_1 = l_UInt64_Inhabited;
 return x_1;
 }
 }
-size_t l_Lean_Expr_CachedData_hash(uint64_t x_1) {
+size_t l_Lean_Expr_Data_hash(uint64_t x_1) {
 _start:
 {
 uint32_t x_2; size_t x_3; 
@@ -813,18 +811,18 @@ x_3 = x_2;
 return x_3;
 }
 }
-lean_object* l_Lean_Expr_CachedData_hash___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_hash___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; size_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_hash(x_2);
+x_3 = l_Lean_Expr_Data_hash(x_2);
 x_4 = lean_box_usize(x_3);
 return x_4;
 }
 }
-uint8_t l_Lean_Expr_CachedData_hasBeq(uint64_t x_1, uint64_t x_2) {
+uint8_t l_Lean_Expr_Data_hasBeq(uint64_t x_1, uint64_t x_2) {
 _start:
 {
 uint8_t x_3; 
@@ -832,7 +830,7 @@ x_3 = x_1 == x_2;
 return x_3;
 }
 }
-lean_object* l_Lean_Expr_CachedData_hasBeq___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Expr_Data_hasBeq___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint64_t x_3; uint64_t x_4; uint8_t x_5; lean_object* x_6; 
@@ -840,12 +838,12 @@ x_3 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
 x_4 = lean_unbox_uint64(x_2);
 lean_dec(x_2);
-x_5 = l_Lean_Expr_CachedData_hasBeq(x_3, x_4);
+x_5 = l_Lean_Expr_Data_hasBeq(x_3, x_4);
 x_6 = lean_box(x_5);
 return x_6;
 }
 }
-uint32_t l_Lean_Expr_CachedData_looseBVarRange(uint64_t x_1) {
+uint32_t l_Lean_Expr_Data_looseBVarRange(uint64_t x_1) {
 _start:
 {
 uint64_t x_2; uint64_t x_3; uint32_t x_4; 
@@ -855,18 +853,18 @@ x_4 = ((uint32_t)x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Expr_CachedData_looseBVarRange___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_looseBVarRange___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint32_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_looseBVarRange(x_2);
+x_3 = l_Lean_Expr_Data_looseBVarRange(x_2);
 x_4 = lean_box_uint32(x_3);
 return x_4;
 }
 }
-uint8_t l_Lean_Expr_CachedData_hasFVar(uint64_t x_1) {
+uint8_t l_Lean_Expr_Data_hasFVar(uint64_t x_1) {
 _start:
 {
 uint64_t x_2; uint64_t x_3; uint64_t x_4; uint64_t x_5; uint8_t x_6; 
@@ -878,18 +876,18 @@ x_6 = x_5 == x_2;
 return x_6;
 }
 }
-lean_object* l_Lean_Expr_CachedData_hasFVar___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_hasFVar___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_hasFVar(x_2);
+x_3 = l_Lean_Expr_Data_hasFVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-uint8_t l_Lean_Expr_CachedData_hasExprMVar(uint64_t x_1) {
+uint8_t l_Lean_Expr_Data_hasExprMVar(uint64_t x_1) {
 _start:
 {
 uint64_t x_2; uint64_t x_3; uint64_t x_4; uint64_t x_5; uint8_t x_6; 
@@ -901,18 +899,18 @@ x_6 = x_5 == x_2;
 return x_6;
 }
 }
-lean_object* l_Lean_Expr_CachedData_hasExprMVar___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_hasExprMVar___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_hasExprMVar(x_2);
+x_3 = l_Lean_Expr_Data_hasExprMVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-uint8_t l_Lean_Expr_CachedData_hasLevelMVar(uint64_t x_1) {
+uint8_t l_Lean_Expr_Data_hasLevelMVar(uint64_t x_1) {
 _start:
 {
 uint64_t x_2; uint64_t x_3; uint64_t x_4; uint64_t x_5; uint8_t x_6; 
@@ -924,18 +922,18 @@ x_6 = x_5 == x_2;
 return x_6;
 }
 }
-lean_object* l_Lean_Expr_CachedData_hasLevelMVar___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_hasLevelMVar___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_hasLevelMVar(x_2);
+x_3 = l_Lean_Expr_Data_hasLevelMVar(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-uint8_t l_Lean_Expr_CachedData_hasLevelParam(uint64_t x_1) {
+uint8_t l_Lean_Expr_Data_hasLevelParam(uint64_t x_1) {
 _start:
 {
 uint64_t x_2; uint64_t x_3; uint64_t x_4; uint64_t x_5; uint8_t x_6; 
@@ -947,18 +945,18 @@ x_6 = x_5 == x_2;
 return x_6;
 }
 }
-lean_object* l_Lean_Expr_CachedData_hasLevelParam___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_hasLevelParam___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_hasLevelParam(x_2);
+x_3 = l_Lean_Expr_Data_hasLevelParam(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-uint8_t l_Lean_Expr_CachedData_nonDepLet(uint64_t x_1) {
+uint8_t l_Lean_Expr_Data_nonDepLet(uint64_t x_1) {
 _start:
 {
 uint64_t x_2; uint64_t x_3; uint64_t x_4; uint64_t x_5; uint8_t x_6; 
@@ -970,18 +968,18 @@ x_6 = x_5 == x_2;
 return x_6;
 }
 }
-lean_object* l_Lean_Expr_CachedData_nonDepLet___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_nonDepLet___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
 x_2 = lean_unbox_uint64(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_nonDepLet(x_2);
+x_3 = l_Lean_Expr_Data_nonDepLet(x_2);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Expr_CachedData_binderInfo___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_Data_binderInfo___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; uint8_t x_3; lean_object* x_4; 
@@ -1003,7 +1001,7 @@ x_4 = lean_box_uint64(x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1() {
+lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1013,7 +1011,7 @@ x_3 = lean_nat_sub(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2() {
+lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -1021,7 +1019,7 @@ x_1 = lean_mk_string("Init.Lean.Expr");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__3() {
+lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -1029,32 +1027,32 @@ x_1 = lean_mk_string("bound variable index is too big");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4() {
+lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
 x_2 = lean_unsigned_to_nat(122u);
 x_3 = lean_unsigned_to_nat(42u);
-x_4 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__3;
+x_4 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__3;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
-lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed__const__1() {
+lean_object* _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed__const__1() {
 _start:
 {
 uint64_t x_1; lean_object* x_2; 
-x_1 = l_Lean_Expr_CachedData_inhabited;
+x_1 = l_Lean_Expr_Data_inhabited;
 x_2 = lean_box_uint64(x_1);
 return x_2;
 }
 }
-uint64_t l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7, uint8_t x_8) {
+uint64_t l___private_Init_Lean_Expr_1__Expr_mkDataCore(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7, uint8_t x_8) {
 _start:
 {
 lean_object* x_9; uint8_t x_10; 
-x_9 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1;
+x_9 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1;
 x_10 = lean_nat_dec_lt(x_9, x_2);
 if (x_10 == 0)
 {
@@ -1094,8 +1092,8 @@ return x_40;
 else
 {
 lean_object* x_41; lean_object* x_42; lean_object* x_43; uint64_t x_44; 
-x_41 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4;
-x_42 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed__const__1;
+x_41 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4;
+x_42 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed__const__1;
 x_43 = lean_panic_fn(x_41);
 x_44 = lean_unbox_uint64(x_43);
 lean_dec(x_43);
@@ -1103,7 +1101,7 @@ return x_44;
 }
 }
 }
-lean_object* l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 size_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint8_t x_14; uint8_t x_15; uint64_t x_16; lean_object* x_17; 
@@ -1121,13 +1119,13 @@ x_14 = lean_unbox(x_7);
 lean_dec(x_7);
 x_15 = lean_unbox(x_8);
 lean_dec(x_8);
-x_16 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore(x_9, x_2, x_10, x_11, x_12, x_13, x_14, x_15);
+x_16 = l___private_Init_Lean_Expr_1__Expr_mkDataCore(x_9, x_2, x_10, x_11, x_12, x_13, x_14, x_15);
 lean_dec(x_2);
 x_17 = lean_box_uint64(x_16);
 return x_17;
 }
 }
-uint64_t _init_l_Lean_Expr_mkCachedData___closed__1() {
+uint64_t _init_l_Lean_Expr_mkData___closed__1() {
 _start:
 {
 uint8_t x_1; uint64_t x_2; 
@@ -1136,17 +1134,17 @@ x_2 = (uint64_t)x_1;
 return x_2;
 }
 }
-uint64_t _init_l_Lean_Expr_mkCachedData___closed__2() {
+uint64_t _init_l_Lean_Expr_mkData___closed__2() {
 _start:
 {
 uint64_t x_1; uint64_t x_2; uint64_t x_3; 
 x_1 = 36;
-x_2 = l_Lean_Expr_mkCachedData___closed__1;
+x_2 = l_Lean_Expr_mkData___closed__1;
 x_3 = x_2 << x_1;
 return x_3;
 }
 }
-uint64_t _init_l_Lean_Expr_mkCachedData___closed__3() {
+uint64_t _init_l_Lean_Expr_mkData___closed__3() {
 _start:
 {
 uint8_t x_1; uint64_t x_2; 
@@ -1155,30 +1153,30 @@ x_2 = (uint64_t)x_1;
 return x_2;
 }
 }
-uint64_t _init_l_Lean_Expr_mkCachedData___closed__4() {
+uint64_t _init_l_Lean_Expr_mkData___closed__4() {
 _start:
 {
 uint64_t x_1; uint64_t x_2; uint64_t x_3; 
 x_1 = 37;
-x_2 = l_Lean_Expr_mkCachedData___closed__3;
+x_2 = l_Lean_Expr_mkData___closed__3;
 x_3 = x_2 << x_1;
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Expr_mkCachedData___boxed__const__1() {
+lean_object* _init_l_Lean_Expr_mkData___boxed__const__1() {
 _start:
 {
 uint64_t x_1; lean_object* x_2; 
-x_1 = l_Lean_Expr_CachedData_inhabited;
+x_1 = l_Lean_Expr_Data_inhabited;
 x_2 = lean_box_uint64(x_1);
 return x_2;
 }
 }
-uint64_t l_Lean_Expr_mkCachedData(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6) {
+uint64_t l_Lean_Expr_mkData(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
-x_7 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1;
+x_7 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1;
 x_8 = lean_nat_dec_lt(x_7, x_2);
 if (x_8 == 0)
 {
@@ -1201,9 +1199,9 @@ x_23 = (uint64_t)x_6;
 x_24 = 35;
 x_25 = x_23 << x_24;
 x_26 = x_22 + x_25;
-x_27 = l_Lean_Expr_mkCachedData___closed__2;
+x_27 = l_Lean_Expr_mkData___closed__2;
 x_28 = x_26 + x_27;
-x_29 = l_Lean_Expr_mkCachedData___closed__4;
+x_29 = l_Lean_Expr_mkData___closed__4;
 x_30 = x_28 + x_29;
 x_31 = lean_uint64_of_nat(x_2);
 x_32 = 40;
@@ -1214,8 +1212,8 @@ return x_34;
 else
 {
 lean_object* x_35; lean_object* x_36; lean_object* x_37; uint64_t x_38; 
-x_35 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4;
-x_36 = l_Lean_Expr_mkCachedData___boxed__const__1;
+x_35 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4;
+x_36 = l_Lean_Expr_mkData___boxed__const__1;
 x_37 = lean_panic_fn(x_35);
 x_38 = lean_unbox_uint64(x_37);
 lean_dec(x_37);
@@ -1223,7 +1221,7 @@ return x_38;
 }
 }
 }
-lean_object* l_Lean_Expr_mkCachedData___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_Expr_mkData___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 size_t x_7; uint8_t x_8; uint8_t x_9; uint8_t x_10; uint8_t x_11; uint64_t x_12; lean_object* x_13; 
@@ -1237,26 +1235,26 @@ x_10 = lean_unbox(x_5);
 lean_dec(x_5);
 x_11 = lean_unbox(x_6);
 lean_dec(x_6);
-x_12 = l_Lean_Expr_mkCachedData(x_7, x_2, x_8, x_9, x_10, x_11);
+x_12 = l_Lean_Expr_mkData(x_7, x_2, x_8, x_9, x_10, x_11);
 lean_dec(x_2);
 x_13 = lean_box_uint64(x_12);
 return x_13;
 }
 }
-lean_object* _init_l_Lean_Expr_mkCachedDataForBinder___boxed__const__1() {
+lean_object* _init_l_Lean_Expr_mkDataForBinder___boxed__const__1() {
 _start:
 {
 uint64_t x_1; lean_object* x_2; 
-x_1 = l_Lean_Expr_CachedData_inhabited;
+x_1 = l_Lean_Expr_Data_inhabited;
 x_2 = lean_box_uint64(x_1);
 return x_2;
 }
 }
-uint64_t l_Lean_Expr_mkCachedDataForBinder(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7) {
+uint64_t l_Lean_Expr_mkDataForBinder(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
-x_8 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1;
+x_8 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1;
 x_9 = lean_nat_dec_lt(x_8, x_2);
 if (x_9 == 0)
 {
@@ -1279,7 +1277,7 @@ x_24 = (uint64_t)x_6;
 x_25 = 35;
 x_26 = x_24 << x_25;
 x_27 = x_23 + x_26;
-x_28 = l_Lean_Expr_mkCachedData___closed__2;
+x_28 = l_Lean_Expr_mkData___closed__2;
 x_29 = x_27 + x_28;
 x_30 = (uint64_t)x_7;
 x_31 = 37;
@@ -1294,8 +1292,8 @@ return x_37;
 else
 {
 lean_object* x_38; lean_object* x_39; lean_object* x_40; uint64_t x_41; 
-x_38 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4;
-x_39 = l_Lean_Expr_mkCachedDataForBinder___boxed__const__1;
+x_38 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4;
+x_39 = l_Lean_Expr_mkDataForBinder___boxed__const__1;
 x_40 = lean_panic_fn(x_38);
 x_41 = lean_unbox_uint64(x_40);
 lean_dec(x_40);
@@ -1303,7 +1301,7 @@ return x_41;
 }
 }
 }
-lean_object* l_Lean_Expr_mkCachedDataForBinder___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Lean_Expr_mkDataForBinder___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 size_t x_8; uint8_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint64_t x_14; lean_object* x_15; 
@@ -1319,26 +1317,26 @@ x_12 = lean_unbox(x_6);
 lean_dec(x_6);
 x_13 = lean_unbox(x_7);
 lean_dec(x_7);
-x_14 = l_Lean_Expr_mkCachedDataForBinder(x_8, x_2, x_9, x_10, x_11, x_12, x_13);
+x_14 = l_Lean_Expr_mkDataForBinder(x_8, x_2, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_2);
 x_15 = lean_box_uint64(x_14);
 return x_15;
 }
 }
-lean_object* _init_l_Lean_Expr_mkCachedDataForLet___boxed__const__1() {
+lean_object* _init_l_Lean_Expr_mkDataForLet___boxed__const__1() {
 _start:
 {
 uint64_t x_1; lean_object* x_2; 
-x_1 = l_Lean_Expr_CachedData_inhabited;
+x_1 = l_Lean_Expr_Data_inhabited;
 x_2 = lean_box_uint64(x_1);
 return x_2;
 }
 }
-uint64_t l_Lean_Expr_mkCachedDataForLet(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7) {
+uint64_t l_Lean_Expr_mkDataForLet(size_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, uint8_t x_5, uint8_t x_6, uint8_t x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
-x_8 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1;
+x_8 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1;
 x_9 = lean_nat_dec_lt(x_8, x_2);
 if (x_9 == 0)
 {
@@ -1365,7 +1363,7 @@ x_28 = (uint64_t)x_7;
 x_29 = 36;
 x_30 = x_28 << x_29;
 x_31 = x_27 + x_30;
-x_32 = l_Lean_Expr_mkCachedData___closed__4;
+x_32 = l_Lean_Expr_mkData___closed__4;
 x_33 = x_31 + x_32;
 x_34 = lean_uint64_of_nat(x_2);
 x_35 = 40;
@@ -1376,8 +1374,8 @@ return x_37;
 else
 {
 lean_object* x_38; lean_object* x_39; lean_object* x_40; uint64_t x_41; 
-x_38 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4;
-x_39 = l_Lean_Expr_mkCachedDataForLet___boxed__const__1;
+x_38 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4;
+x_39 = l_Lean_Expr_mkDataForLet___boxed__const__1;
 x_40 = lean_panic_fn(x_38);
 x_41 = lean_unbox_uint64(x_40);
 lean_dec(x_40);
@@ -1385,7 +1383,7 @@ return x_41;
 }
 }
 }
-lean_object* l_Lean_Expr_mkCachedDataForLet___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Lean_Expr_mkDataForLet___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 size_t x_8; uint8_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint64_t x_14; lean_object* x_15; 
@@ -1401,7 +1399,7 @@ x_12 = lean_unbox(x_6);
 lean_dec(x_6);
 x_13 = lean_unbox(x_7);
 lean_dec(x_7);
-x_14 = l_Lean_Expr_mkCachedDataForLet(x_8, x_2, x_9, x_10, x_11, x_12, x_13);
+x_14 = l_Lean_Expr_mkDataForLet(x_8, x_2, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_2);
 x_15 = lean_box_uint64(x_14);
 return x_15;
@@ -1427,7 +1425,7 @@ x_1 = l_Lean_Expr_Inhabited___closed__1;
 return x_1;
 }
 }
-uint64_t l_Lean_Expr_cachedData(lean_object* x_1) {
+uint64_t l_Lean_Expr_data(lean_object* x_1) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
@@ -1488,95 +1486,16 @@ return x_10;
 }
 }
 }
-lean_object* l_Lean_Expr_cachedData___boxed(lean_object* x_1) {
+lean_object* l_Lean_Expr_data___boxed(lean_object* x_1) {
 _start:
 {
 uint64_t x_2; lean_object* x_3; 
-x_2 = l_Lean_Expr_cachedData(x_1);
+x_2 = l_Lean_Expr_data(x_1);
 lean_dec(x_1);
 x_3 = lean_box_uint64(x_2);
 return x_3;
 }
 }
-uint64_t lean_expr_cached_data(lean_object* x_1) {
-_start:
-{
-switch (lean_obj_tag(x_1)) {
-case 4:
-{
-uint64_t x_2; 
-x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-lean_dec(x_1);
-return x_2;
-}
-case 5:
-{
-uint64_t x_3; 
-x_3 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-lean_dec(x_1);
-return x_3;
-}
-case 6:
-{
-uint64_t x_4; 
-x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-lean_dec(x_1);
-return x_4;
-}
-case 7:
-{
-uint64_t x_5; 
-x_5 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-lean_dec(x_1);
-return x_5;
-}
-case 8:
-{
-uint64_t x_6; 
-x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-lean_dec(x_1);
-return x_6;
-}
-case 10:
-{
-uint64_t x_7; 
-x_7 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-lean_dec(x_1);
-return x_7;
-}
-case 11:
-{
-uint64_t x_8; 
-x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-lean_dec(x_1);
-return x_8;
-}
-case 12:
-{
-uint64_t x_9; 
-x_9 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-lean_dec(x_1);
-return x_9;
-}
-default: 
-{
-uint64_t x_10; 
-x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-lean_dec(x_1);
-return x_10;
-}
-}
-}
-}
-lean_object* l_Lean_Expr_cachedDataEx___boxed(lean_object* x_1) {
-_start:
-{
-uint64_t x_2; lean_object* x_3; 
-x_2 = lean_expr_cached_data(x_1);
-x_3 = lean_box_uint64(x_2);
-return x_3;
-}
-}
 size_t l_Lean_Expr_hash(lean_object* x_1) {
 _start:
 {
@@ -1585,63 +1504,63 @@ case 4:
 {
 uint64_t x_2; size_t x_3; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_3 = l_Lean_Expr_CachedData_hash(x_2);
+x_3 = l_Lean_Expr_Data_hash(x_2);
 return x_3;
 }
 case 5:
 {
 uint64_t x_4; size_t x_5; 
 x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_5 = l_Lean_Expr_CachedData_hash(x_4);
+x_5 = l_Lean_Expr_Data_hash(x_4);
 return x_5;
 }
 case 6:
 {
 uint64_t x_6; size_t x_7; 
 x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_7 = l_Lean_Expr_CachedData_hash(x_6);
+x_7 = l_Lean_Expr_Data_hash(x_6);
 return x_7;
 }
 case 7:
 {
 uint64_t x_8; size_t x_9; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_9 = l_Lean_Expr_CachedData_hash(x_8);
+x_9 = l_Lean_Expr_Data_hash(x_8);
 return x_9;
 }
 case 8:
 {
 uint64_t x_10; size_t x_11; 
 x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-x_11 = l_Lean_Expr_CachedData_hash(x_10);
+x_11 = l_Lean_Expr_Data_hash(x_10);
 return x_11;
 }
 case 10:
 {
 uint64_t x_12; size_t x_13; 
 x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_13 = l_Lean_Expr_CachedData_hash(x_12);
+x_13 = l_Lean_Expr_Data_hash(x_12);
 return x_13;
 }
 case 11:
 {
 uint64_t x_14; size_t x_15; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_15 = l_Lean_Expr_CachedData_hash(x_14);
+x_15 = l_Lean_Expr_Data_hash(x_14);
 return x_15;
 }
 case 12:
 {
 uint64_t x_16; size_t x_17; 
 x_16 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_17 = l_Lean_Expr_CachedData_hash(x_16);
+x_17 = l_Lean_Expr_Data_hash(x_16);
 return x_17;
 }
 default: 
 {
 uint64_t x_18; size_t x_19; 
 x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-x_19 = l_Lean_Expr_CachedData_hash(x_18);
+x_19 = l_Lean_Expr_Data_hash(x_18);
 return x_19;
 }
 }
@@ -1681,63 +1600,63 @@ case 4:
 {
 uint64_t x_2; uint8_t x_3; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_3 = l_Lean_Expr_CachedData_hasFVar(x_2);
+x_3 = l_Lean_Expr_Data_hasFVar(x_2);
 return x_3;
 }
 case 5:
 {
 uint64_t x_4; uint8_t x_5; 
 x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_5 = l_Lean_Expr_CachedData_hasFVar(x_4);
+x_5 = l_Lean_Expr_Data_hasFVar(x_4);
 return x_5;
 }
 case 6:
 {
 uint64_t x_6; uint8_t x_7; 
 x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_7 = l_Lean_Expr_CachedData_hasFVar(x_6);
+x_7 = l_Lean_Expr_Data_hasFVar(x_6);
 return x_7;
 }
 case 7:
 {
 uint64_t x_8; uint8_t x_9; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_9 = l_Lean_Expr_CachedData_hasFVar(x_8);
+x_9 = l_Lean_Expr_Data_hasFVar(x_8);
 return x_9;
 }
 case 8:
 {
 uint64_t x_10; uint8_t x_11; 
 x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-x_11 = l_Lean_Expr_CachedData_hasFVar(x_10);
+x_11 = l_Lean_Expr_Data_hasFVar(x_10);
 return x_11;
 }
 case 10:
 {
 uint64_t x_12; uint8_t x_13; 
 x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_13 = l_Lean_Expr_CachedData_hasFVar(x_12);
+x_13 = l_Lean_Expr_Data_hasFVar(x_12);
 return x_13;
 }
 case 11:
 {
 uint64_t x_14; uint8_t x_15; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_15 = l_Lean_Expr_CachedData_hasFVar(x_14);
+x_15 = l_Lean_Expr_Data_hasFVar(x_14);
 return x_15;
 }
 case 12:
 {
 uint64_t x_16; uint8_t x_17; 
 x_16 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_17 = l_Lean_Expr_CachedData_hasFVar(x_16);
+x_17 = l_Lean_Expr_Data_hasFVar(x_16);
 return x_17;
 }
 default: 
 {
 uint64_t x_18; uint8_t x_19; 
 x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-x_19 = l_Lean_Expr_CachedData_hasFVar(x_18);
+x_19 = l_Lean_Expr_Data_hasFVar(x_18);
 return x_19;
 }
 }
@@ -1761,63 +1680,63 @@ case 4:
 {
 uint64_t x_2; uint8_t x_3; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_3 = l_Lean_Expr_CachedData_hasExprMVar(x_2);
+x_3 = l_Lean_Expr_Data_hasExprMVar(x_2);
 return x_3;
 }
 case 5:
 {
 uint64_t x_4; uint8_t x_5; 
 x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_5 = l_Lean_Expr_CachedData_hasExprMVar(x_4);
+x_5 = l_Lean_Expr_Data_hasExprMVar(x_4);
 return x_5;
 }
 case 6:
 {
 uint64_t x_6; uint8_t x_7; 
 x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_7 = l_Lean_Expr_CachedData_hasExprMVar(x_6);
+x_7 = l_Lean_Expr_Data_hasExprMVar(x_6);
 return x_7;
 }
 case 7:
 {
 uint64_t x_8; uint8_t x_9; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_9 = l_Lean_Expr_CachedData_hasExprMVar(x_8);
+x_9 = l_Lean_Expr_Data_hasExprMVar(x_8);
 return x_9;
 }
 case 8:
 {
 uint64_t x_10; uint8_t x_11; 
 x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-x_11 = l_Lean_Expr_CachedData_hasExprMVar(x_10);
+x_11 = l_Lean_Expr_Data_hasExprMVar(x_10);
 return x_11;
 }
 case 10:
 {
 uint64_t x_12; uint8_t x_13; 
 x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_13 = l_Lean_Expr_CachedData_hasExprMVar(x_12);
+x_13 = l_Lean_Expr_Data_hasExprMVar(x_12);
 return x_13;
 }
 case 11:
 {
 uint64_t x_14; uint8_t x_15; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_15 = l_Lean_Expr_CachedData_hasExprMVar(x_14);
+x_15 = l_Lean_Expr_Data_hasExprMVar(x_14);
 return x_15;
 }
 case 12:
 {
 uint64_t x_16; uint8_t x_17; 
 x_16 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_17 = l_Lean_Expr_CachedData_hasExprMVar(x_16);
+x_17 = l_Lean_Expr_Data_hasExprMVar(x_16);
 return x_17;
 }
 default: 
 {
 uint64_t x_18; uint8_t x_19; 
 x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-x_19 = l_Lean_Expr_CachedData_hasExprMVar(x_18);
+x_19 = l_Lean_Expr_Data_hasExprMVar(x_18);
 return x_19;
 }
 }
@@ -1841,63 +1760,63 @@ case 4:
 {
 uint64_t x_2; uint8_t x_3; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_3 = l_Lean_Expr_CachedData_hasLevelMVar(x_2);
+x_3 = l_Lean_Expr_Data_hasLevelMVar(x_2);
 return x_3;
 }
 case 5:
 {
 uint64_t x_4; uint8_t x_5; 
 x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_5 = l_Lean_Expr_CachedData_hasLevelMVar(x_4);
+x_5 = l_Lean_Expr_Data_hasLevelMVar(x_4);
 return x_5;
 }
 case 6:
 {
 uint64_t x_6; uint8_t x_7; 
 x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_7 = l_Lean_Expr_CachedData_hasLevelMVar(x_6);
+x_7 = l_Lean_Expr_Data_hasLevelMVar(x_6);
 return x_7;
 }
 case 7:
 {
 uint64_t x_8; uint8_t x_9; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_9 = l_Lean_Expr_CachedData_hasLevelMVar(x_8);
+x_9 = l_Lean_Expr_Data_hasLevelMVar(x_8);
 return x_9;
 }
 case 8:
 {
 uint64_t x_10; uint8_t x_11; 
 x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-x_11 = l_Lean_Expr_CachedData_hasLevelMVar(x_10);
+x_11 = l_Lean_Expr_Data_hasLevelMVar(x_10);
 return x_11;
 }
 case 10:
 {
 uint64_t x_12; uint8_t x_13; 
 x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_13 = l_Lean_Expr_CachedData_hasLevelMVar(x_12);
+x_13 = l_Lean_Expr_Data_hasLevelMVar(x_12);
 return x_13;
 }
 case 11:
 {
 uint64_t x_14; uint8_t x_15; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_15 = l_Lean_Expr_CachedData_hasLevelMVar(x_14);
+x_15 = l_Lean_Expr_Data_hasLevelMVar(x_14);
 return x_15;
 }
 case 12:
 {
 uint64_t x_16; uint8_t x_17; 
 x_16 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_17 = l_Lean_Expr_CachedData_hasLevelMVar(x_16);
+x_17 = l_Lean_Expr_Data_hasLevelMVar(x_16);
 return x_17;
 }
 default: 
 {
 uint64_t x_18; uint8_t x_19; 
 x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-x_19 = l_Lean_Expr_CachedData_hasLevelMVar(x_18);
+x_19 = l_Lean_Expr_Data_hasLevelMVar(x_18);
 return x_19;
 }
 }
@@ -1985,11 +1904,11 @@ goto block_6;
 block_6:
 {
 uint8_t x_3; 
-x_3 = l_Lean_Expr_CachedData_hasExprMVar(x_2);
+x_3 = l_Lean_Expr_Data_hasExprMVar(x_2);
 if (x_3 == 0)
 {
 uint8_t x_4; 
-x_4 = l_Lean_Expr_CachedData_hasLevelMVar(x_2);
+x_4 = l_Lean_Expr_Data_hasLevelMVar(x_2);
 return x_4;
 }
 else
@@ -2019,63 +1938,63 @@ case 4:
 {
 uint64_t x_2; uint8_t x_3; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_3 = l_Lean_Expr_CachedData_hasLevelParam(x_2);
+x_3 = l_Lean_Expr_Data_hasLevelParam(x_2);
 return x_3;
 }
 case 5:
 {
 uint64_t x_4; uint8_t x_5; 
 x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_5 = l_Lean_Expr_CachedData_hasLevelParam(x_4);
+x_5 = l_Lean_Expr_Data_hasLevelParam(x_4);
 return x_5;
 }
 case 6:
 {
 uint64_t x_6; uint8_t x_7; 
 x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_7 = l_Lean_Expr_CachedData_hasLevelParam(x_6);
+x_7 = l_Lean_Expr_Data_hasLevelParam(x_6);
 return x_7;
 }
 case 7:
 {
 uint64_t x_8; uint8_t x_9; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_9 = l_Lean_Expr_CachedData_hasLevelParam(x_8);
+x_9 = l_Lean_Expr_Data_hasLevelParam(x_8);
 return x_9;
 }
 case 8:
 {
 uint64_t x_10; uint8_t x_11; 
 x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-x_11 = l_Lean_Expr_CachedData_hasLevelParam(x_10);
+x_11 = l_Lean_Expr_Data_hasLevelParam(x_10);
 return x_11;
 }
 case 10:
 {
 uint64_t x_12; uint8_t x_13; 
 x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_13 = l_Lean_Expr_CachedData_hasLevelParam(x_12);
+x_13 = l_Lean_Expr_Data_hasLevelParam(x_12);
 return x_13;
 }
 case 11:
 {
 uint64_t x_14; uint8_t x_15; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_15 = l_Lean_Expr_CachedData_hasLevelParam(x_14);
+x_15 = l_Lean_Expr_Data_hasLevelParam(x_14);
 return x_15;
 }
 case 12:
 {
 uint64_t x_16; uint8_t x_17; 
 x_16 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_17 = l_Lean_Expr_CachedData_hasLevelParam(x_16);
+x_17 = l_Lean_Expr_Data_hasLevelParam(x_16);
 return x_17;
 }
 default: 
 {
 uint64_t x_18; uint8_t x_19; 
 x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-x_19 = l_Lean_Expr_CachedData_hasLevelParam(x_18);
+x_19 = l_Lean_Expr_Data_hasLevelParam(x_18);
 return x_19;
 }
 }
@@ -2099,7 +2018,7 @@ case 4:
 {
 uint64_t x_2; uint32_t x_3; lean_object* x_4; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_3 = l_Lean_Expr_CachedData_looseBVarRange(x_2);
+x_3 = l_Lean_Expr_Data_looseBVarRange(x_2);
 x_4 = lean_uint32_to_nat(x_3);
 return x_4;
 }
@@ -2107,7 +2026,7 @@ case 5:
 {
 uint64_t x_5; uint32_t x_6; lean_object* x_7; 
 x_5 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_6 = l_Lean_Expr_CachedData_looseBVarRange(x_5);
+x_6 = l_Lean_Expr_Data_looseBVarRange(x_5);
 x_7 = lean_uint32_to_nat(x_6);
 return x_7;
 }
@@ -2115,7 +2034,7 @@ case 6:
 {
 uint64_t x_8; uint32_t x_9; lean_object* x_10; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_9 = l_Lean_Expr_CachedData_looseBVarRange(x_8);
+x_9 = l_Lean_Expr_Data_looseBVarRange(x_8);
 x_10 = lean_uint32_to_nat(x_9);
 return x_10;
 }
@@ -2123,7 +2042,7 @@ case 7:
 {
 uint64_t x_11; uint32_t x_12; lean_object* x_13; 
 x_11 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_12 = l_Lean_Expr_CachedData_looseBVarRange(x_11);
+x_12 = l_Lean_Expr_Data_looseBVarRange(x_11);
 x_13 = lean_uint32_to_nat(x_12);
 return x_13;
 }
@@ -2131,7 +2050,7 @@ case 8:
 {
 uint64_t x_14; uint32_t x_15; lean_object* x_16; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
-x_15 = l_Lean_Expr_CachedData_looseBVarRange(x_14);
+x_15 = l_Lean_Expr_Data_looseBVarRange(x_14);
 x_16 = lean_uint32_to_nat(x_15);
 return x_16;
 }
@@ -2139,7 +2058,7 @@ case 10:
 {
 uint64_t x_17; uint32_t x_18; lean_object* x_19; 
 x_17 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
-x_18 = l_Lean_Expr_CachedData_looseBVarRange(x_17);
+x_18 = l_Lean_Expr_Data_looseBVarRange(x_17);
 x_19 = lean_uint32_to_nat(x_18);
 return x_19;
 }
@@ -2147,7 +2066,7 @@ case 11:
 {
 uint64_t x_20; uint32_t x_21; lean_object* x_22; 
 x_20 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_21 = l_Lean_Expr_CachedData_looseBVarRange(x_20);
+x_21 = l_Lean_Expr_Data_looseBVarRange(x_20);
 x_22 = lean_uint32_to_nat(x_21);
 return x_22;
 }
@@ -2155,7 +2074,7 @@ case 12:
 {
 uint64_t x_23; uint32_t x_24; lean_object* x_25; 
 x_23 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
-x_24 = l_Lean_Expr_CachedData_looseBVarRange(x_23);
+x_24 = l_Lean_Expr_Data_looseBVarRange(x_23);
 x_25 = lean_uint32_to_nat(x_24);
 return x_25;
 }
@@ -2163,7 +2082,7 @@ default:
 {
 uint64_t x_26; uint32_t x_27; lean_object* x_28; 
 x_26 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
-x_27 = l_Lean_Expr_CachedData_looseBVarRange(x_26);
+x_27 = l_Lean_Expr_Data_looseBVarRange(x_26);
 x_28 = lean_uint32_to_nat(x_27);
 return x_28;
 }
@@ -2376,7 +2295,7 @@ case 4:
 uint64_t x_2; uint32_t x_3; 
 x_2 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
 lean_dec(x_1);
-x_3 = l_Lean_Expr_CachedData_looseBVarRange(x_2);
+x_3 = l_Lean_Expr_Data_looseBVarRange(x_2);
 return x_3;
 }
 case 5:
@@ -2384,7 +2303,7 @@ case 5:
 uint64_t x_4; uint32_t x_5; 
 x_4 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
 lean_dec(x_1);
-x_5 = l_Lean_Expr_CachedData_looseBVarRange(x_4);
+x_5 = l_Lean_Expr_Data_looseBVarRange(x_4);
 return x_5;
 }
 case 6:
@@ -2392,7 +2311,7 @@ case 6:
 uint64_t x_6; uint32_t x_7; 
 x_6 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
 lean_dec(x_1);
-x_7 = l_Lean_Expr_CachedData_looseBVarRange(x_6);
+x_7 = l_Lean_Expr_Data_looseBVarRange(x_6);
 return x_7;
 }
 case 7:
@@ -2400,7 +2319,7 @@ case 7:
 uint64_t x_8; uint32_t x_9; 
 x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
 lean_dec(x_1);
-x_9 = l_Lean_Expr_CachedData_looseBVarRange(x_8);
+x_9 = l_Lean_Expr_Data_looseBVarRange(x_8);
 return x_9;
 }
 case 8:
@@ -2408,7 +2327,7 @@ case 8:
 uint64_t x_10; uint32_t x_11; 
 x_10 = lean_ctor_get_uint64(x_1, sizeof(void*)*4);
 lean_dec(x_1);
-x_11 = l_Lean_Expr_CachedData_looseBVarRange(x_10);
+x_11 = l_Lean_Expr_Data_looseBVarRange(x_10);
 return x_11;
 }
 case 10:
@@ -2416,7 +2335,7 @@ case 10:
 uint64_t x_12; uint32_t x_13; 
 x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
 lean_dec(x_1);
-x_13 = l_Lean_Expr_CachedData_looseBVarRange(x_12);
+x_13 = l_Lean_Expr_Data_looseBVarRange(x_12);
 return x_13;
 }
 case 11:
@@ -2424,7 +2343,7 @@ case 11:
 uint64_t x_14; uint32_t x_15; 
 x_14 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
 lean_dec(x_1);
-x_15 = l_Lean_Expr_CachedData_looseBVarRange(x_14);
+x_15 = l_Lean_Expr_Data_looseBVarRange(x_14);
 return x_15;
 }
 case 12:
@@ -2432,7 +2351,7 @@ case 12:
 uint64_t x_16; uint32_t x_17; 
 x_16 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
 lean_dec(x_1);
-x_17 = l_Lean_Expr_CachedData_looseBVarRange(x_16);
+x_17 = l_Lean_Expr_Data_looseBVarRange(x_16);
 return x_17;
 }
 default: 
@@ -2440,7 +2359,7 @@ default:
 uint64_t x_18; uint32_t x_19; 
 x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
 lean_dec(x_1);
-x_19 = l_Lean_Expr_CachedData_looseBVarRange(x_18);
+x_19 = l_Lean_Expr_Data_looseBVarRange(x_18);
 return x_19;
 }
 }
@@ -2483,7 +2402,7 @@ x_3 = l_Lean_Literal_hash(x_1);
 x_4 = lean_usize_mix_hash(x_2, x_3);
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = 0;
-x_7 = l_Lean_Expr_mkCachedData(x_4, x_5, x_6, x_6, x_6, x_6);
+x_7 = l_Lean_Expr_mkData(x_4, x_5, x_6, x_6, x_6, x_6);
 x_8 = lean_alloc_ctor(9, 1, 8);
 lean_ctor_set(x_8, 0, x_1);
 lean_ctor_set_uint64(x_8, sizeof(void*)*1, x_7);
@@ -2614,7 +2533,7 @@ x_9 = l_List_foldr___main___at_Lean_mkConst___spec__3(x_8, x_2);
 lean_inc(x_2);
 x_10 = l_List_foldr___main___at_Lean_mkConst___spec__4(x_8, x_2);
 x_11 = lean_unsigned_to_nat(0u);
-x_12 = l_Lean_Expr_mkCachedData(x_7, x_11, x_8, x_8, x_9, x_10);
+x_12 = l_Lean_Expr_mkData(x_7, x_11, x_8, x_8, x_9, x_10);
 x_13 = lean_alloc_ctor(4, 2, 8);
 lean_ctor_set(x_13, 0, x_1);
 lean_ctor_set(x_13, 1, x_2);
@@ -2767,7 +2686,7 @@ x_4 = lean_usize_mix_hash(x_2, x_3);
 x_5 = lean_unsigned_to_nat(1u);
 x_6 = lean_nat_add(x_1, x_5);
 x_7 = 0;
-x_8 = l_Lean_Expr_mkCachedData(x_4, x_6, x_7, x_7, x_7, x_7);
+x_8 = l_Lean_Expr_mkData(x_4, x_6, x_7, x_7, x_7, x_7);
 lean_dec(x_6);
 x_9 = lean_alloc_ctor(0, 1, 8);
 lean_ctor_set(x_9, 0, x_1);
@@ -2788,7 +2707,7 @@ lean_inc(x_1);
 x_6 = lean_level_has_param(x_1);
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = 0;
-x_9 = l_Lean_Expr_mkCachedData(x_4, x_7, x_8, x_8, x_5, x_6);
+x_9 = l_Lean_Expr_mkData(x_4, x_7, x_8, x_8, x_5, x_6);
 x_10 = lean_alloc_ctor(3, 1, 8);
 lean_ctor_set(x_10, 0, x_1);
 lean_ctor_set_uint64(x_10, sizeof(void*)*1, x_9);
@@ -2805,7 +2724,7 @@ x_4 = lean_usize_mix_hash(x_2, x_3);
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = 1;
 x_7 = 0;
-x_8 = l_Lean_Expr_mkCachedData(x_4, x_5, x_6, x_7, x_7, x_7);
+x_8 = l_Lean_Expr_mkData(x_4, x_5, x_6, x_7, x_7, x_7);
 x_9 = lean_alloc_ctor(1, 1, 8);
 lean_ctor_set(x_9, 0, x_1);
 lean_ctor_set_uint64(x_9, sizeof(void*)*1, x_8);
@@ -2822,7 +2741,7 @@ x_4 = lean_usize_mix_hash(x_2, x_3);
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = 0;
 x_7 = 1;
-x_8 = l_Lean_Expr_mkCachedData(x_4, x_5, x_6, x_7, x_6, x_6);
+x_8 = l_Lean_Expr_mkData(x_4, x_5, x_6, x_7, x_6, x_6);
 x_9 = lean_alloc_ctor(2, 1, 8);
 lean_ctor_set(x_9, 0, x_1);
 lean_ctor_set_uint64(x_9, sizeof(void*)*1, x_8);
@@ -2841,7 +2760,7 @@ x_7 = l_Lean_Expr_hasFVar(x_2);
 x_8 = l_Lean_Expr_hasExprMVar(x_2);
 x_9 = l_Lean_Expr_hasLevelMVar(x_2);
 x_10 = l_Lean_Expr_hasLevelParam(x_2);
-x_11 = l_Lean_Expr_mkCachedData(x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l_Lean_Expr_mkData(x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_6);
 x_12 = lean_alloc_ctor(10, 2, 8);
 lean_ctor_set(x_12, 0, x_1);
@@ -2866,7 +2785,7 @@ x_12 = l_Lean_Expr_hasFVar(x_3);
 x_13 = l_Lean_Expr_hasExprMVar(x_3);
 x_14 = l_Lean_Expr_hasLevelMVar(x_3);
 x_15 = l_Lean_Expr_hasLevelParam(x_3);
-x_16 = l_Lean_Expr_mkCachedData(x_10, x_11, x_12, x_13, x_14, x_15);
+x_16 = l_Lean_Expr_mkData(x_10, x_11, x_12, x_13, x_14, x_15);
 lean_dec(x_11);
 x_17 = lean_alloc_ctor(11, 3, 8);
 lean_ctor_set(x_17, 0, x_1);
@@ -2910,7 +2829,7 @@ if (x_14 == 0)
 {
 uint8_t x_18; uint64_t x_19; lean_object* x_20; 
 x_18 = l_Lean_Expr_hasLevelParam(x_2);
-x_19 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_16, x_17, x_18);
+x_19 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_16, x_17, x_18);
 lean_dec(x_10);
 x_20 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_20, 0, x_1);
@@ -2922,7 +2841,7 @@ else
 {
 uint8_t x_21; uint64_t x_22; lean_object* x_23; 
 x_21 = 1;
-x_22 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_16, x_17, x_21);
+x_22 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_16, x_17, x_21);
 lean_dec(x_10);
 x_23 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_23, 0, x_1);
@@ -2938,7 +2857,7 @@ if (x_14 == 0)
 uint8_t x_24; uint8_t x_25; uint64_t x_26; lean_object* x_27; 
 x_24 = l_Lean_Expr_hasLevelParam(x_2);
 x_25 = 1;
-x_26 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_16, x_25, x_24);
+x_26 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_16, x_25, x_24);
 lean_dec(x_10);
 x_27 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_27, 0, x_1);
@@ -2950,7 +2869,7 @@ else
 {
 uint8_t x_28; uint64_t x_29; lean_object* x_30; 
 x_28 = 1;
-x_29 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_16, x_28, x_28);
+x_29 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_16, x_28, x_28);
 lean_dec(x_10);
 x_30 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_30, 0, x_1);
@@ -2971,7 +2890,7 @@ if (x_14 == 0)
 uint8_t x_32; uint8_t x_33; uint64_t x_34; lean_object* x_35; 
 x_32 = l_Lean_Expr_hasLevelParam(x_2);
 x_33 = 1;
-x_34 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_33, x_31, x_32);
+x_34 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_33, x_31, x_32);
 lean_dec(x_10);
 x_35 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_35, 0, x_1);
@@ -2983,7 +2902,7 @@ else
 {
 uint8_t x_36; uint64_t x_37; lean_object* x_38; 
 x_36 = 1;
-x_37 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_36, x_31, x_36);
+x_37 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_36, x_31, x_36);
 lean_dec(x_10);
 x_38 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_38, 0, x_1);
@@ -2999,7 +2918,7 @@ if (x_14 == 0)
 uint8_t x_39; uint8_t x_40; uint64_t x_41; lean_object* x_42; 
 x_39 = l_Lean_Expr_hasLevelParam(x_2);
 x_40 = 1;
-x_41 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_40, x_40, x_39);
+x_41 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_40, x_40, x_39);
 lean_dec(x_10);
 x_42 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_42, 0, x_1);
@@ -3011,7 +2930,7 @@ else
 {
 uint8_t x_43; uint64_t x_44; lean_object* x_45; 
 x_43 = 1;
-x_44 = l_Lean_Expr_mkCachedData(x_7, x_10, x_15, x_43, x_43, x_43);
+x_44 = l_Lean_Expr_mkData(x_7, x_10, x_15, x_43, x_43, x_43);
 lean_dec(x_10);
 x_45 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_45, 0, x_1);
@@ -3037,7 +2956,7 @@ if (x_14 == 0)
 uint8_t x_48; uint8_t x_49; uint64_t x_50; lean_object* x_51; 
 x_48 = l_Lean_Expr_hasLevelParam(x_2);
 x_49 = 1;
-x_50 = l_Lean_Expr_mkCachedData(x_7, x_10, x_49, x_46, x_47, x_48);
+x_50 = l_Lean_Expr_mkData(x_7, x_10, x_49, x_46, x_47, x_48);
 lean_dec(x_10);
 x_51 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_51, 0, x_1);
@@ -3049,7 +2968,7 @@ else
 {
 uint8_t x_52; uint64_t x_53; lean_object* x_54; 
 x_52 = 1;
-x_53 = l_Lean_Expr_mkCachedData(x_7, x_10, x_52, x_46, x_47, x_52);
+x_53 = l_Lean_Expr_mkData(x_7, x_10, x_52, x_46, x_47, x_52);
 lean_dec(x_10);
 x_54 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_54, 0, x_1);
@@ -3065,7 +2984,7 @@ if (x_14 == 0)
 uint8_t x_55; uint8_t x_56; uint64_t x_57; lean_object* x_58; 
 x_55 = l_Lean_Expr_hasLevelParam(x_2);
 x_56 = 1;
-x_57 = l_Lean_Expr_mkCachedData(x_7, x_10, x_56, x_46, x_56, x_55);
+x_57 = l_Lean_Expr_mkData(x_7, x_10, x_56, x_46, x_56, x_55);
 lean_dec(x_10);
 x_58 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_58, 0, x_1);
@@ -3077,7 +2996,7 @@ else
 {
 uint8_t x_59; uint64_t x_60; lean_object* x_61; 
 x_59 = 1;
-x_60 = l_Lean_Expr_mkCachedData(x_7, x_10, x_59, x_46, x_59, x_59);
+x_60 = l_Lean_Expr_mkData(x_7, x_10, x_59, x_46, x_59, x_59);
 lean_dec(x_10);
 x_61 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_61, 0, x_1);
@@ -3098,7 +3017,7 @@ if (x_14 == 0)
 uint8_t x_63; uint8_t x_64; uint64_t x_65; lean_object* x_66; 
 x_63 = l_Lean_Expr_hasLevelParam(x_2);
 x_64 = 1;
-x_65 = l_Lean_Expr_mkCachedData(x_7, x_10, x_64, x_64, x_62, x_63);
+x_65 = l_Lean_Expr_mkData(x_7, x_10, x_64, x_64, x_62, x_63);
 lean_dec(x_10);
 x_66 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_66, 0, x_1);
@@ -3110,7 +3029,7 @@ else
 {
 uint8_t x_67; uint64_t x_68; lean_object* x_69; 
 x_67 = 1;
-x_68 = l_Lean_Expr_mkCachedData(x_7, x_10, x_67, x_67, x_62, x_67);
+x_68 = l_Lean_Expr_mkData(x_7, x_10, x_67, x_67, x_62, x_67);
 lean_dec(x_10);
 x_69 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_69, 0, x_1);
@@ -3126,7 +3045,7 @@ if (x_14 == 0)
 uint8_t x_70; uint8_t x_71; uint64_t x_72; lean_object* x_73; 
 x_70 = l_Lean_Expr_hasLevelParam(x_2);
 x_71 = 1;
-x_72 = l_Lean_Expr_mkCachedData(x_7, x_10, x_71, x_71, x_71, x_70);
+x_72 = l_Lean_Expr_mkData(x_7, x_10, x_71, x_71, x_71, x_70);
 lean_dec(x_10);
 x_73 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_73, 0, x_1);
@@ -3138,7 +3057,7 @@ else
 {
 uint8_t x_74; uint64_t x_75; lean_object* x_76; 
 x_74 = 1;
-x_75 = l_Lean_Expr_mkCachedData(x_7, x_10, x_74, x_74, x_74, x_74);
+x_75 = l_Lean_Expr_mkData(x_7, x_10, x_74, x_74, x_74, x_74);
 lean_dec(x_10);
 x_76 = lean_alloc_ctor(5, 2, 8);
 lean_ctor_set(x_76, 0, x_1);
@@ -3188,7 +3107,7 @@ if (x_18 == 0)
 {
 uint8_t x_22; uint64_t x_23; lean_object* x_24; 
 x_22 = l_Lean_Expr_hasLevelParam(x_4);
-x_23 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_21, x_22, x_2);
+x_23 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_21, x_22, x_2);
 lean_dec(x_14);
 x_24 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_24, 0, x_1);
@@ -3201,7 +3120,7 @@ else
 {
 uint8_t x_25; uint64_t x_26; lean_object* x_27; 
 x_25 = 1;
-x_26 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_21, x_25, x_2);
+x_26 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_21, x_25, x_2);
 lean_dec(x_14);
 x_27 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_27, 0, x_1);
@@ -3218,7 +3137,7 @@ if (x_18 == 0)
 uint8_t x_28; uint8_t x_29; uint64_t x_30; lean_object* x_31; 
 x_28 = l_Lean_Expr_hasLevelParam(x_4);
 x_29 = 1;
-x_30 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_29, x_28, x_2);
+x_30 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_29, x_28, x_2);
 lean_dec(x_14);
 x_31 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_31, 0, x_1);
@@ -3231,7 +3150,7 @@ else
 {
 uint8_t x_32; uint64_t x_33; lean_object* x_34; 
 x_32 = 1;
-x_33 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_32, x_32, x_2);
+x_33 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_32, x_32, x_2);
 lean_dec(x_14);
 x_34 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_34, 0, x_1);
@@ -3253,7 +3172,7 @@ if (x_18 == 0)
 uint8_t x_36; uint8_t x_37; uint64_t x_38; lean_object* x_39; 
 x_36 = l_Lean_Expr_hasLevelParam(x_4);
 x_37 = 1;
-x_38 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_37, x_35, x_36, x_2);
+x_38 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_37, x_35, x_36, x_2);
 lean_dec(x_14);
 x_39 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_39, 0, x_1);
@@ -3266,7 +3185,7 @@ else
 {
 uint8_t x_40; uint64_t x_41; lean_object* x_42; 
 x_40 = 1;
-x_41 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_40, x_35, x_40, x_2);
+x_41 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_40, x_35, x_40, x_2);
 lean_dec(x_14);
 x_42 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_42, 0, x_1);
@@ -3283,7 +3202,7 @@ if (x_18 == 0)
 uint8_t x_43; uint8_t x_44; uint64_t x_45; lean_object* x_46; 
 x_43 = l_Lean_Expr_hasLevelParam(x_4);
 x_44 = 1;
-x_45 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_44, x_44, x_43, x_2);
+x_45 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_44, x_44, x_43, x_2);
 lean_dec(x_14);
 x_46 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_46, 0, x_1);
@@ -3296,7 +3215,7 @@ else
 {
 uint8_t x_47; uint64_t x_48; lean_object* x_49; 
 x_47 = 1;
-x_48 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_47, x_47, x_47, x_2);
+x_48 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_47, x_47, x_47, x_2);
 lean_dec(x_14);
 x_49 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_49, 0, x_1);
@@ -3323,7 +3242,7 @@ if (x_18 == 0)
 uint8_t x_52; uint8_t x_53; uint64_t x_54; lean_object* x_55; 
 x_52 = l_Lean_Expr_hasLevelParam(x_4);
 x_53 = 1;
-x_54 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_53, x_50, x_51, x_52, x_2);
+x_54 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_53, x_50, x_51, x_52, x_2);
 lean_dec(x_14);
 x_55 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_55, 0, x_1);
@@ -3336,7 +3255,7 @@ else
 {
 uint8_t x_56; uint64_t x_57; lean_object* x_58; 
 x_56 = 1;
-x_57 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_56, x_50, x_51, x_56, x_2);
+x_57 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_56, x_50, x_51, x_56, x_2);
 lean_dec(x_14);
 x_58 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_58, 0, x_1);
@@ -3353,7 +3272,7 @@ if (x_18 == 0)
 uint8_t x_59; uint8_t x_60; uint64_t x_61; lean_object* x_62; 
 x_59 = l_Lean_Expr_hasLevelParam(x_4);
 x_60 = 1;
-x_61 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_60, x_50, x_60, x_59, x_2);
+x_61 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_60, x_50, x_60, x_59, x_2);
 lean_dec(x_14);
 x_62 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_62, 0, x_1);
@@ -3366,7 +3285,7 @@ else
 {
 uint8_t x_63; uint64_t x_64; lean_object* x_65; 
 x_63 = 1;
-x_64 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_63, x_50, x_63, x_63, x_2);
+x_64 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_63, x_50, x_63, x_63, x_2);
 lean_dec(x_14);
 x_65 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_65, 0, x_1);
@@ -3388,7 +3307,7 @@ if (x_18 == 0)
 uint8_t x_67; uint8_t x_68; uint64_t x_69; lean_object* x_70; 
 x_67 = l_Lean_Expr_hasLevelParam(x_4);
 x_68 = 1;
-x_69 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_68, x_68, x_66, x_67, x_2);
+x_69 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_68, x_68, x_66, x_67, x_2);
 lean_dec(x_14);
 x_70 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_70, 0, x_1);
@@ -3401,7 +3320,7 @@ else
 {
 uint8_t x_71; uint64_t x_72; lean_object* x_73; 
 x_71 = 1;
-x_72 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_71, x_71, x_66, x_71, x_2);
+x_72 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_71, x_71, x_66, x_71, x_2);
 lean_dec(x_14);
 x_73 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_73, 0, x_1);
@@ -3418,7 +3337,7 @@ if (x_18 == 0)
 uint8_t x_74; uint8_t x_75; uint64_t x_76; lean_object* x_77; 
 x_74 = l_Lean_Expr_hasLevelParam(x_4);
 x_75 = 1;
-x_76 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_75, x_75, x_75, x_74, x_2);
+x_76 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_75, x_75, x_75, x_74, x_2);
 lean_dec(x_14);
 x_77 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_77, 0, x_1);
@@ -3431,7 +3350,7 @@ else
 {
 uint8_t x_78; uint64_t x_79; lean_object* x_80; 
 x_78 = 1;
-x_79 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_78, x_78, x_78, x_78, x_2);
+x_79 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_78, x_78, x_78, x_78, x_2);
 lean_dec(x_14);
 x_80 = lean_alloc_ctor(6, 3, 8);
 lean_ctor_set(x_80, 0, x_1);
@@ -3492,7 +3411,7 @@ if (x_18 == 0)
 {
 uint8_t x_22; uint64_t x_23; lean_object* x_24; 
 x_22 = l_Lean_Expr_hasLevelParam(x_4);
-x_23 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_21, x_22, x_2);
+x_23 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_21, x_22, x_2);
 lean_dec(x_14);
 x_24 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_24, 0, x_1);
@@ -3505,7 +3424,7 @@ else
 {
 uint8_t x_25; uint64_t x_26; lean_object* x_27; 
 x_25 = 1;
-x_26 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_21, x_25, x_2);
+x_26 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_21, x_25, x_2);
 lean_dec(x_14);
 x_27 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_27, 0, x_1);
@@ -3522,7 +3441,7 @@ if (x_18 == 0)
 uint8_t x_28; uint8_t x_29; uint64_t x_30; lean_object* x_31; 
 x_28 = l_Lean_Expr_hasLevelParam(x_4);
 x_29 = 1;
-x_30 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_29, x_28, x_2);
+x_30 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_29, x_28, x_2);
 lean_dec(x_14);
 x_31 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_31, 0, x_1);
@@ -3535,7 +3454,7 @@ else
 {
 uint8_t x_32; uint64_t x_33; lean_object* x_34; 
 x_32 = 1;
-x_33 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_20, x_32, x_32, x_2);
+x_33 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_20, x_32, x_32, x_2);
 lean_dec(x_14);
 x_34 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_34, 0, x_1);
@@ -3557,7 +3476,7 @@ if (x_18 == 0)
 uint8_t x_36; uint8_t x_37; uint64_t x_38; lean_object* x_39; 
 x_36 = l_Lean_Expr_hasLevelParam(x_4);
 x_37 = 1;
-x_38 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_37, x_35, x_36, x_2);
+x_38 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_37, x_35, x_36, x_2);
 lean_dec(x_14);
 x_39 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_39, 0, x_1);
@@ -3570,7 +3489,7 @@ else
 {
 uint8_t x_40; uint64_t x_41; lean_object* x_42; 
 x_40 = 1;
-x_41 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_40, x_35, x_40, x_2);
+x_41 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_40, x_35, x_40, x_2);
 lean_dec(x_14);
 x_42 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_42, 0, x_1);
@@ -3587,7 +3506,7 @@ if (x_18 == 0)
 uint8_t x_43; uint8_t x_44; uint64_t x_45; lean_object* x_46; 
 x_43 = l_Lean_Expr_hasLevelParam(x_4);
 x_44 = 1;
-x_45 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_44, x_44, x_43, x_2);
+x_45 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_44, x_44, x_43, x_2);
 lean_dec(x_14);
 x_46 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_46, 0, x_1);
@@ -3600,7 +3519,7 @@ else
 {
 uint8_t x_47; uint64_t x_48; lean_object* x_49; 
 x_47 = 1;
-x_48 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_19, x_47, x_47, x_47, x_2);
+x_48 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_19, x_47, x_47, x_47, x_2);
 lean_dec(x_14);
 x_49 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_49, 0, x_1);
@@ -3627,7 +3546,7 @@ if (x_18 == 0)
 uint8_t x_52; uint8_t x_53; uint64_t x_54; lean_object* x_55; 
 x_52 = l_Lean_Expr_hasLevelParam(x_4);
 x_53 = 1;
-x_54 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_53, x_50, x_51, x_52, x_2);
+x_54 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_53, x_50, x_51, x_52, x_2);
 lean_dec(x_14);
 x_55 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_55, 0, x_1);
@@ -3640,7 +3559,7 @@ else
 {
 uint8_t x_56; uint64_t x_57; lean_object* x_58; 
 x_56 = 1;
-x_57 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_56, x_50, x_51, x_56, x_2);
+x_57 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_56, x_50, x_51, x_56, x_2);
 lean_dec(x_14);
 x_58 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_58, 0, x_1);
@@ -3657,7 +3576,7 @@ if (x_18 == 0)
 uint8_t x_59; uint8_t x_60; uint64_t x_61; lean_object* x_62; 
 x_59 = l_Lean_Expr_hasLevelParam(x_4);
 x_60 = 1;
-x_61 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_60, x_50, x_60, x_59, x_2);
+x_61 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_60, x_50, x_60, x_59, x_2);
 lean_dec(x_14);
 x_62 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_62, 0, x_1);
@@ -3670,7 +3589,7 @@ else
 {
 uint8_t x_63; uint64_t x_64; lean_object* x_65; 
 x_63 = 1;
-x_64 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_63, x_50, x_63, x_63, x_2);
+x_64 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_63, x_50, x_63, x_63, x_2);
 lean_dec(x_14);
 x_65 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_65, 0, x_1);
@@ -3692,7 +3611,7 @@ if (x_18 == 0)
 uint8_t x_67; uint8_t x_68; uint64_t x_69; lean_object* x_70; 
 x_67 = l_Lean_Expr_hasLevelParam(x_4);
 x_68 = 1;
-x_69 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_68, x_68, x_66, x_67, x_2);
+x_69 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_68, x_68, x_66, x_67, x_2);
 lean_dec(x_14);
 x_70 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_70, 0, x_1);
@@ -3705,7 +3624,7 @@ else
 {
 uint8_t x_71; uint64_t x_72; lean_object* x_73; 
 x_71 = 1;
-x_72 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_71, x_71, x_66, x_71, x_2);
+x_72 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_71, x_71, x_66, x_71, x_2);
 lean_dec(x_14);
 x_73 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_73, 0, x_1);
@@ -3722,7 +3641,7 @@ if (x_18 == 0)
 uint8_t x_74; uint8_t x_75; uint64_t x_76; lean_object* x_77; 
 x_74 = l_Lean_Expr_hasLevelParam(x_4);
 x_75 = 1;
-x_76 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_75, x_75, x_75, x_74, x_2);
+x_76 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_75, x_75, x_75, x_74, x_2);
 lean_dec(x_14);
 x_77 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_77, 0, x_1);
@@ -3735,7 +3654,7 @@ else
 {
 uint8_t x_78; uint64_t x_79; lean_object* x_80; 
 x_78 = 1;
-x_79 = l_Lean_Expr_mkCachedDataForBinder(x_9, x_14, x_78, x_78, x_78, x_78, x_2);
+x_79 = l_Lean_Expr_mkDataForBinder(x_9, x_14, x_78, x_78, x_78, x_78, x_2);
 lean_dec(x_14);
 x_80 = lean_alloc_ctor(7, 3, 8);
 lean_ctor_set(x_80, 0, x_1);
@@ -3839,7 +3758,7 @@ if (x_52 == 0)
 uint8_t x_53; uint8_t x_54; uint64_t x_55; lean_object* x_56; 
 x_53 = l_Lean_Expr_hasLevelParam(x_4);
 x_54 = 1;
-x_55 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_51, x_54, x_53, x_5);
+x_55 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_51, x_54, x_53, x_5);
 lean_dec(x_19);
 x_56 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_56, 0, x_1);
@@ -3853,7 +3772,7 @@ else
 {
 uint8_t x_57; uint64_t x_58; lean_object* x_59; 
 x_57 = 1;
-x_58 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_51, x_57, x_57, x_5);
+x_58 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_51, x_57, x_57, x_5);
 lean_dec(x_19);
 x_59 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_59, 0, x_1);
@@ -3868,7 +3787,7 @@ else
 {
 uint8_t x_60; uint64_t x_61; lean_object* x_62; 
 x_60 = 1;
-x_61 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_51, x_60, x_60, x_5);
+x_61 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_51, x_60, x_60, x_5);
 lean_dec(x_19);
 x_62 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_62, 0, x_1);
@@ -3900,7 +3819,7 @@ if (x_64 == 0)
 uint8_t x_65; uint8_t x_66; uint64_t x_67; lean_object* x_68; 
 x_65 = l_Lean_Expr_hasLevelParam(x_4);
 x_66 = 1;
-x_67 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_66, x_66, x_65, x_5);
+x_67 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_66, x_66, x_65, x_5);
 lean_dec(x_19);
 x_68 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_68, 0, x_1);
@@ -3914,7 +3833,7 @@ else
 {
 uint8_t x_69; uint64_t x_70; lean_object* x_71; 
 x_69 = 1;
-x_70 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_69, x_69, x_69, x_5);
+x_70 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_69, x_69, x_69, x_5);
 lean_dec(x_19);
 x_71 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_71, 0, x_1);
@@ -3929,7 +3848,7 @@ else
 {
 uint8_t x_72; uint64_t x_73; lean_object* x_74; 
 x_72 = 1;
-x_73 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_72, x_72, x_72, x_5);
+x_73 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_72, x_72, x_72, x_5);
 lean_dec(x_19);
 x_74 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_74, 0, x_1);
@@ -3962,7 +3881,7 @@ if (x_76 == 0)
 uint8_t x_77; uint8_t x_78; uint64_t x_79; lean_object* x_80; 
 x_77 = l_Lean_Expr_hasLevelParam(x_4);
 x_78 = 1;
-x_79 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_78, x_78, x_77, x_5);
+x_79 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_78, x_78, x_77, x_5);
 lean_dec(x_19);
 x_80 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_80, 0, x_1);
@@ -3976,7 +3895,7 @@ else
 {
 uint8_t x_81; uint64_t x_82; lean_object* x_83; 
 x_81 = 1;
-x_82 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_81, x_81, x_81, x_5);
+x_82 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_81, x_81, x_81, x_5);
 lean_dec(x_19);
 x_83 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_83, 0, x_1);
@@ -3991,7 +3910,7 @@ else
 {
 uint8_t x_84; uint64_t x_85; lean_object* x_86; 
 x_84 = 1;
-x_85 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_84, x_84, x_84, x_5);
+x_85 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_84, x_84, x_84, x_5);
 lean_dec(x_19);
 x_86 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_86, 0, x_1);
@@ -4019,7 +3938,7 @@ if (x_28 == 0)
 {
 uint8_t x_29; uint64_t x_30; lean_object* x_31; 
 x_29 = l_Lean_Expr_hasLevelParam(x_4);
-x_30 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_25, x_27, x_29, x_5);
+x_30 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_25, x_27, x_29, x_5);
 lean_dec(x_19);
 x_31 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_31, 0, x_1);
@@ -4033,7 +3952,7 @@ else
 {
 uint8_t x_32; uint64_t x_33; lean_object* x_34; 
 x_32 = 1;
-x_33 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_25, x_27, x_32, x_5);
+x_33 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_25, x_27, x_32, x_5);
 lean_dec(x_19);
 x_34 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_34, 0, x_1);
@@ -4048,7 +3967,7 @@ else
 {
 uint8_t x_35; uint64_t x_36; lean_object* x_37; 
 x_35 = 1;
-x_36 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_25, x_27, x_35, x_5);
+x_36 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_25, x_27, x_35, x_5);
 lean_dec(x_19);
 x_37 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_37, 0, x_1);
@@ -4070,7 +3989,7 @@ if (x_38 == 0)
 uint8_t x_39; uint8_t x_40; uint64_t x_41; lean_object* x_42; 
 x_39 = l_Lean_Expr_hasLevelParam(x_4);
 x_40 = 1;
-x_41 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_25, x_40, x_39, x_5);
+x_41 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_25, x_40, x_39, x_5);
 lean_dec(x_19);
 x_42 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_42, 0, x_1);
@@ -4084,7 +4003,7 @@ else
 {
 uint8_t x_43; uint64_t x_44; lean_object* x_45; 
 x_43 = 1;
-x_44 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_25, x_43, x_43, x_5);
+x_44 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_25, x_43, x_43, x_5);
 lean_dec(x_19);
 x_45 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_45, 0, x_1);
@@ -4099,7 +4018,7 @@ else
 {
 uint8_t x_46; uint64_t x_47; lean_object* x_48; 
 x_46 = 1;
-x_47 = l_Lean_Expr_mkCachedDataForLet(x_12, x_19, x_24, x_25, x_46, x_46, x_5);
+x_47 = l_Lean_Expr_mkDataForLet(x_12, x_19, x_24, x_25, x_46, x_46, x_5);
 lean_dec(x_19);
 x_48 = lean_alloc_ctor(8, 4, 8);
 lean_ctor_set(x_48, 0, x_1);
@@ -4136,7 +4055,7 @@ x_9 = l_Lean_Expr_hasExprMVar(x_3);
 x_10 = l_Lean_Expr_hasLevelMVar(x_3);
 x_11 = l_Lean_Expr_hasLevelParam(x_3);
 x_12 = 1;
-x_13 = l_Lean_Expr_mkCachedDataForBinder(x_7, x_8, x_12, x_9, x_10, x_11, x_4);
+x_13 = l_Lean_Expr_mkDataForBinder(x_7, x_8, x_12, x_9, x_10, x_11, x_4);
 lean_dec(x_8);
 x_14 = lean_alloc_ctor(12, 3, 8);
 lean_ctor_set(x_14, 0, x_1);
@@ -5323,8 +5242,8 @@ lean_object* _init_l_Lean_Expr_getRevArg_x21___main___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(454u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(452u);
 x_3 = lean_unsigned_to_nat(20u);
 x_4 = l_List_get_x21___main___rarg___closed__2;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5577,8 +5496,8 @@ lean_object* _init_l_Lean_Expr_appFn_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(474u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(472u);
 x_3 = lean_unsigned_to_nat(15u);
 x_4 = l_Lean_Expr_appFn_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5618,8 +5537,8 @@ lean_object* _init_l_Lean_Expr_appArg_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(478u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(476u);
 x_3 = lean_unsigned_to_nat(15u);
 x_4 = l_Lean_Expr_appFn_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5667,8 +5586,8 @@ lean_object* _init_l_Lean_Expr_constName_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(482u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(480u);
 x_3 = lean_unsigned_to_nat(17u);
 x_4 = l_Lean_Expr_constName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5708,8 +5627,8 @@ lean_object* _init_l_Lean_Expr_constLevels_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(486u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(484u);
 x_3 = lean_unsigned_to_nat(18u);
 x_4 = l_Lean_Expr_constName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5757,8 +5676,8 @@ lean_object* _init_l_Lean_Expr_bvarIdx_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(490u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(488u);
 x_3 = lean_unsigned_to_nat(16u);
 x_4 = l_Lean_Expr_bvarIdx_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5806,8 +5725,8 @@ lean_object* _init_l_Lean_Expr_fvarId_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(494u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(492u);
 x_3 = lean_unsigned_to_nat(14u);
 x_4 = l_Lean_Expr_fvarId_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5855,8 +5774,8 @@ lean_object* _init_l_Lean_Expr_mvarId_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(498u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(496u);
 x_3 = lean_unsigned_to_nat(14u);
 x_4 = l_Lean_Expr_mvarId_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5904,8 +5823,8 @@ lean_object* _init_l_Lean_Expr_bindingName_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(503u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(501u);
 x_3 = lean_unsigned_to_nat(21u);
 x_4 = l_Lean_Expr_bindingName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -5954,8 +5873,8 @@ lean_object* _init_l_Lean_Expr_bindingDomain_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(508u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(506u);
 x_3 = lean_unsigned_to_nat(21u);
 x_4 = l_Lean_Expr_bindingName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -6004,8 +5923,8 @@ lean_object* _init_l_Lean_Expr_bindingBody_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(513u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(511u);
 x_3 = lean_unsigned_to_nat(21u);
 x_4 = l_Lean_Expr_bindingName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -6062,8 +5981,8 @@ lean_object* _init_l_Lean_Expr_letName_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(517u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(515u);
 x_3 = lean_unsigned_to_nat(20u);
 x_4 = l_Lean_Expr_letName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -6868,8 +6787,8 @@ lean_object* _init_l_Lean_Expr_updateApp_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(683u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(681u);
 x_3 = lean_unsigned_to_nat(18u);
 x_4 = l_Lean_Expr_appFn_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -6910,8 +6829,8 @@ lean_object* _init_l_Lean_Expr_updateConst_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(692u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(690u);
 x_3 = lean_unsigned_to_nat(18u);
 x_4 = l_Lean_Expr_constName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -6959,8 +6878,8 @@ lean_object* _init_l_Lean_Expr_updateSort_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(701u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(699u);
 x_3 = lean_unsigned_to_nat(14u);
 x_4 = l_Lean_Expr_updateSort_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7016,8 +6935,8 @@ lean_object* _init_l_Lean_Expr_updateMData_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(718u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(716u);
 x_3 = lean_unsigned_to_nat(17u);
 x_4 = l_Lean_Expr_updateMData_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7057,8 +6976,8 @@ lean_object* _init_l_Lean_Expr_updateProj_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(723u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(721u);
 x_3 = lean_unsigned_to_nat(18u);
 x_4 = l_Lean_Expr_updateProj_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7108,8 +7027,8 @@ lean_object* _init_l_Lean_Expr_updateForall_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(732u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(730u);
 x_3 = lean_unsigned_to_nat(21u);
 x_4 = l_Lean_Expr_updateForall_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7152,8 +7071,8 @@ lean_object* _init_l_Lean_Expr_updateForallE_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(737u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(735u);
 x_3 = lean_unsigned_to_nat(21u);
 x_4 = l_Lean_Expr_updateForall_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7206,8 +7125,8 @@ lean_object* _init_l_Lean_Expr_updateLambda_x21___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(746u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(744u);
 x_3 = lean_unsigned_to_nat(17u);
 x_4 = l_Lean_Expr_updateLambda_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7250,8 +7169,8 @@ lean_object* _init_l_Lean_Expr_updateLambdaE_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(751u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(749u);
 x_3 = lean_unsigned_to_nat(17u);
 x_4 = l_Lean_Expr_updateLambda_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7294,8 +7213,8 @@ lean_object* _init_l_Lean_Expr_updateLet_x21___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2;
-x_2 = lean_unsigned_to_nat(760u);
+x_1 = l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2;
+x_2 = lean_unsigned_to_nat(758u);
 x_3 = lean_unsigned_to_nat(20u);
 x_4 = l_Lean_Expr_letName_x21___closed__1;
 x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
@@ -7422,27 +7341,27 @@ l_Lean_MData_empty = _init_l_Lean_MData_empty();
 lean_mark_persistent(l_Lean_MData_empty);
 l_Lean_MVData_hasEmptc = _init_l_Lean_MVData_hasEmptc();
 lean_mark_persistent(l_Lean_MVData_hasEmptc);
-l_Lean_Expr_CachedData_inhabited = _init_l_Lean_Expr_CachedData_inhabited();
-l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1 = _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__1);
-l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2 = _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__2);
-l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__3 = _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__3);
-l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4 = _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___closed__4);
-l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed__const__1 = _init_l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed__const__1();
-lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkCachedDataCore___boxed__const__1);
-l_Lean_Expr_mkCachedData___closed__1 = _init_l_Lean_Expr_mkCachedData___closed__1();
-l_Lean_Expr_mkCachedData___closed__2 = _init_l_Lean_Expr_mkCachedData___closed__2();
-l_Lean_Expr_mkCachedData___closed__3 = _init_l_Lean_Expr_mkCachedData___closed__3();
-l_Lean_Expr_mkCachedData___closed__4 = _init_l_Lean_Expr_mkCachedData___closed__4();
-l_Lean_Expr_mkCachedData___boxed__const__1 = _init_l_Lean_Expr_mkCachedData___boxed__const__1();
-lean_mark_persistent(l_Lean_Expr_mkCachedData___boxed__const__1);
-l_Lean_Expr_mkCachedDataForBinder___boxed__const__1 = _init_l_Lean_Expr_mkCachedDataForBinder___boxed__const__1();
-lean_mark_persistent(l_Lean_Expr_mkCachedDataForBinder___boxed__const__1);
-l_Lean_Expr_mkCachedDataForLet___boxed__const__1 = _init_l_Lean_Expr_mkCachedDataForLet___boxed__const__1();
-lean_mark_persistent(l_Lean_Expr_mkCachedDataForLet___boxed__const__1);
+l_Lean_Expr_Data_inhabited = _init_l_Lean_Expr_Data_inhabited();
+l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1 = _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__1);
+l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2 = _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__2);
+l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__3 = _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__3);
+l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4 = _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkDataCore___closed__4);
+l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed__const__1 = _init_l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed__const__1();
+lean_mark_persistent(l___private_Init_Lean_Expr_1__Expr_mkDataCore___boxed__const__1);
+l_Lean_Expr_mkData___closed__1 = _init_l_Lean_Expr_mkData___closed__1();
+l_Lean_Expr_mkData___closed__2 = _init_l_Lean_Expr_mkData___closed__2();
+l_Lean_Expr_mkData___closed__3 = _init_l_Lean_Expr_mkData___closed__3();
+l_Lean_Expr_mkData___closed__4 = _init_l_Lean_Expr_mkData___closed__4();
+l_Lean_Expr_mkData___boxed__const__1 = _init_l_Lean_Expr_mkData___boxed__const__1();
+lean_mark_persistent(l_Lean_Expr_mkData___boxed__const__1);
+l_Lean_Expr_mkDataForBinder___boxed__const__1 = _init_l_Lean_Expr_mkDataForBinder___boxed__const__1();
+lean_mark_persistent(l_Lean_Expr_mkDataForBinder___boxed__const__1);
+l_Lean_Expr_mkDataForLet___boxed__const__1 = _init_l_Lean_Expr_mkDataForLet___boxed__const__1();
+lean_mark_persistent(l_Lean_Expr_mkDataForLet___boxed__const__1);
 l_Lean_Expr_Inhabited___closed__1 = _init_l_Lean_Expr_Inhabited___closed__1();
 lean_mark_persistent(l_Lean_Expr_Inhabited___closed__1);
 l_Lean_Expr_Inhabited = _init_l_Lean_Expr_Inhabited();
diff --git a/stage0/library/Init/Lean/Meta/Basic.c b/stage0/library/Init/Lean/Meta/Basic.c
index 7e10e933c1..2beff5cc71 100644
--- a/stage0/library/Init/Lean/Meta/Basic.c
+++ b/stage0/library/Init/Lean/Meta/Basic.c
@@ -67,6 +67,7 @@ lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Meta_isClassExpensive___main___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__5(lean_object*);
 lean_object* l___private_Init_Lean_Meta_Basic_5__getTraceState___boxed(lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l___private_Init_Lean_Meta_Basic_5__getTraceState___rarg(lean_object*);
 lean_object* l___private_Init_Lean_Meta_Basic_7__forallTelescopeReducingAuxAux___main___rarg(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_dbgTrace___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -229,7 +230,6 @@ lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaTelescopeAux(lean_object*
 lean_object* l_Lean_MetavarContext_MkBinding_mkBinding___at_Lean_MetavarContext_mkBinding___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaM_inhabited___rarg(lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 uint8_t _init_l_Lean_Meta_TransparencyMode_Inhabited() {
 _start:
 {
diff --git a/stage0/library/Init/Lean/Meta/Default.c b/stage0/library/Init/Lean/Meta/Default.c
index b584a87860..30485485f8 100644
--- a/stage0/library/Init/Lean/Meta/Default.c
+++ b/stage0/library/Init/Lean/Meta/Default.c
@@ -75,6 +75,7 @@ lean_object* l_Array_anyRangeMAux___main___at___private_Init_Lean_Meta_Default_3
 uint8_t l___private_Init_Lean_WHNF_6__isIdRhsApp(lean_object*);
 lean_object* l___private_Init_Lean_WHNF_4__getRecRuleFor(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_WHNF_9__deltaBetaDefinition___at___private_Init_Lean_Meta_Default_3__auxFixpoint___main___spec__25(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_Literal_type(lean_object*);
 lean_object* l_Lean_reduceQuotRec___at___private_Init_Lean_Meta_Default_3__auxFixpoint___main___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
@@ -267,7 +268,6 @@ lean_object* l_ReaderT_pure___at___private_Init_Lean_Meta_Default_3__auxFixpoint
 lean_object* l___private_Init_Lean_Meta_Default_3__auxFixpoint___main___closed__1;
 lean_object* l___private_Init_Lean_Meta_InferType_7__inferLambdaType___at___private_Init_Lean_Meta_Default_3__auxFixpoint___main___spec__31(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_getFunInfo___spec__7(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 uint8_t l_Lean_Expr_isLambda(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Default_3__auxFixpoint___main___spec__50(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Lean_Meta_Default_1__exprToBool(lean_object* x_1) {
diff --git a/stage0/library/Init/Lean/Meta/ExprDefEq.c b/stage0/library/Init/Lean/Meta/ExprDefEq.c
index edf7ca9228..ae29ba4ca8 100644
--- a/stage0/library/Init/Lean/Meta/ExprDefEq.c
+++ b/stage0/library/Init/Lean/Meta/ExprDefEq.c
@@ -60,6 +60,7 @@ lean_object* l_Lean_mkMVar(lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_15__processAssignment(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_contains___at_Lean_Meta_CheckAssignment_checkFVar___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_8__checkAssignmentFailure___closed__5;
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_Expr_getAppNumArgsAux___main(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_9__isDefEqFOApprox(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_2__isDefEqArgsFirstPass(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -233,7 +234,6 @@ lean_object* l___private_Init_Lean_Meta_LevelDefEq_12__processPostponed(uint8_t,
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_8__checkAssignmentFailure___closed__15;
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_update_let(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 uint8_t l_Lean_Expr_isLambda(lean_object*);
 lean_object* _init_l___private_Init_Lean_Meta_ExprDefEq_1__isDefEqEta___closed__1() {
 _start:
diff --git a/stage0/library/Init/Lean/Meta/InferType.c b/stage0/library/Init/Lean/Meta/InferType.c
index 35960a5272..f5330f462f 100644
--- a/stage0/library/Init/Lean/Meta/InferType.c
+++ b/stage0/library/Init/Lean/Meta/InferType.c
@@ -59,6 +59,7 @@ lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Meta_isClassExpensive___at_Lean_Meta_inferTypeAux___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
 lean_object* l_Nat_foldMAux___main___at_Lean_Meta_inferTypeAux___spec__33___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_Literal_type(lean_object*);
 lean_object* l_Lean_Meta_inferTypeAuxAux(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgsAux___main(lean_object*, lean_object*);
@@ -193,7 +194,6 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_inferTypeAu
 lean_object* l___private_Init_Lean_Meta_InferType_12__isAlwaysZero___main___boxed(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_inferTypeAux___spec__10___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_InferType_6__inferForallType___at_Lean_Meta_inferTypeAux___spec__16(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 lean_object* l___private_Init_Lean_Meta_Basic_7__forallTelescopeReducingAuxAux___main___at_Lean_Meta_inferTypeAux___spec__23(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_InferType_1__getForallResultType___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
diff --git a/stage0/library/Init/Lean/MetavarContext.c b/stage0/library/Init/Lean/MetavarContext.c
index faaa97bfde..369d0a3d64 100644
--- a/stage0/library/Init/Lean/MetavarContext.c
+++ b/stage0/library/Init/Lean/MetavarContext.c
@@ -140,6 +140,7 @@ uint8_t l_Lean_LocalContext_contains(lean_object*, lean_object*);
 lean_object* l_List_mapM___main___at_Lean_MetavarContext_InstantiateExprMVars_main___main___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_isLevelAssignable___closed__1;
 lean_object* l_Lean_mkMVar(lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_MetavarContext_hasAssignedLevelMVar___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgsAux___main(lean_object*, lean_object*);
 extern lean_object* l_Nat_foldRevAux___main___at_Lean_LocalContext_mkBinding___spec__1___closed__1;
@@ -501,7 +502,6 @@ lean_object* l_Lean_MetavarContext_MkBinding_mkBinding___at_Lean_MetavarContext_
 lean_object* l_Array_iterateMAux___main___at_Lean_MetavarContext_addExprMVarDecl___spec__4(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlFromM___at___private_Init_Lean_MetavarContext_13__collectDeps___spec__40___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_update_let(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 uint8_t l_Lean_Expr_isLambda(lean_object*);
 extern lean_object* l_String_splitAux___main___closed__1;
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_MetavarContext_assignLevel___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*);
diff --git a/stage0/library/Init/Lean/TypeClass/Context.c b/stage0/library/Init/Lean/TypeClass/Context.c
index 5bd58d28a4..034db59d2f 100644
--- a/stage0/library/Init/Lean/TypeClass/Context.c
+++ b/stage0/library/Init/Lean/TypeClass/Context.c
@@ -66,6 +66,7 @@ lean_object* l_Lean_TypeClass_Context_eAssign___boxed(lean_object*, lean_object*
 lean_object* l_Lean_TypeClass_Context_uNewMeta(lean_object*);
 lean_object* l_Lean_TypeClass_Context_uUnify___main___closed__3;
 lean_object* l_Lean_mkMVar(lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_TypeClass_Context_eAssign(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_TypeClass_Context__u03b1Norm___closed__5;
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
@@ -232,7 +233,6 @@ lean_object* l_Lean_TypeClass_Context__u03b1Norm___closed__2;
 lean_object* l_Lean_TypeClass_Context_uAssign___closed__1;
 lean_object* l_Lean_TypeClass_Context_uUnify___main___closed__5;
 lean_object* l_Lean_TypeClass_Context__u03b1Norm___closed__6;
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 lean_object* l_Lean_TypeClass_Context_uMetaNormalizeCore___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* _init_l_Lean_TypeClass_Context_Inhabited___closed__1() {
 _start:
diff --git a/stage0/library/Init/Lean/TypeClass/Synth.c b/stage0/library/Init/Lean/TypeClass/Synth.c
index 83a4fab0ee..6c724bc985 100644
--- a/stage0/library/Init/Lean/TypeClass/Synth.c
+++ b/stage0/library/Init/Lean/TypeClass/Synth.c
@@ -59,6 +59,7 @@ lean_object* l_Lean_TypeClass_Context_uNewMeta(lean_object*);
 lean_object* l_Stack_pop___at_Lean_TypeClass_consume___spec__3(lean_object*);
 lean_object* l_Lean_TypeClass_TypedExpr_HasToString___boxed(lean_object*);
 lean_object* l_Lean_TypeClass_TypedExpr_HasToString___closed__1;
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 extern lean_object* l_Lean_formatDataValue___closed__1;
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_Lean_TypeClass_TypedExpr_Inhabited;
@@ -203,7 +204,6 @@ lean_object* l_Array_back___at_Lean_TypeClass_generate___spec__2___boxed(lean_ob
 lean_object* l_Lean_TypeClass_synth___closed__3;
 lean_object* l_Lean_TypeClass_constNameToTypedExpr___closed__2;
 lean_object* l_Array_anyRangeMAux___main___at_Lean_TypeClass_newAnswer___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_Lean_Expr_CachedData_binderInfo(uint64_t);
 uint8_t l_Lean_Expr_isLambda(lean_object*);
 lean_object* _init_l_Lean_TypeClass_TypedExpr_HasToString___closed__1() {
 _start: