diff --git a/compiler/grainc/grainc.re b/compiler/grainc/grainc.re
index b239562571..f903e0b11d 100644
--- a/compiler/grainc/grainc.re
+++ b/compiler/grainc/grainc.re
@@ -36,9 +36,6 @@ let compile_file = (name, outfile_arg) => {
         ~default=Compile.default_output_filename(name),
         outfile_arg,
       );
-    if (Grain_utils.Config.debug^) {
-      Compile.save_mashed(name, Compile.default_mashtree_filename(outfile));
-    };
     let hook =
       if (Grain_utils.Config.statically_link^) {
         Compile.stop_after_assembled;
diff --git a/compiler/src/compile.re b/compiler/src/compile.re
index b459191089..14a1aed29f 100644
--- a/compiler/src/compile.re
+++ b/compiler/src/compile.re
@@ -49,6 +49,20 @@ let default_mashtree_filename = name =>
 let compile_prog = p =>
   Compcore.module_to_bytes @@ Compcore.compile_wasm_module(p);
 
+let save_mashed = (mashed, outfile) => {
+  switch (outfile) {
+  | Some(outfile) =>
+    let outfile = default_mashtree_filename(outfile);
+    Grain_utils.Fs_access.ensure_parent_directory_exists(outfile);
+    let mash_string =
+      Sexplib.Sexp.to_string_hum @@ Mashtree.sexp_of_mash_program(mashed);
+    let oc = open_out(outfile);
+    output_string(oc, mash_string);
+    close_out(oc);
+  | None => ()
+  };
+};
+
 let log_state = state =>
   if (Grain_utils.Config.verbose^) {
     let prerr_sexp = (conv, x) =>
@@ -135,9 +149,7 @@ let next_state = (~is_root_file=false, {cstate_desc, cstate_filename} as cs) =>
         ~no_pervasives=has_attr("noPervasives"),
         ~runtime_mode=has_attr("runtimeMode"),
       );
-      if (is_root_file) {
-        Grain_utils.Config.set_root_config();
-      };
+
       Well_formedness.check_well_formedness(p);
       WellFormed(p);
     | WellFormed(p) =>
@@ -157,7 +169,11 @@ let next_state = (~is_root_file=false, {cstate_desc, cstate_filename} as cs) =>
       Linearized(Linearize.transl_anf_module(typed_mod))
     | Linearized(anfed) => Optimized(Optimize.optimize_program(anfed))
     | Optimized(optimized) =>
-      Mashed(Transl_anf.transl_anf_program(optimized))
+      let mashed = Transl_anf.transl_anf_program(optimized);
+      if (Config.debug^) {
+        save_mashed(mashed, cs.cstate_outfile);
+      };
+      Mashed(mashed);
     | Mashed(mashed) =>
       Compiled(Compmod.compile_wasm_module(~name=?cstate_filename, mashed))
     | Compiled(compiled) =>
@@ -289,6 +305,9 @@ let compile_string =
     reset_compiler_state();
     compile_wasi_polyfill();
   };
+  if (is_root_file) {
+    Grain_utils.Config.set_root_config();
+  };
   let cstate = {
     cstate_desc: Initial(InputString(str)),
     cstate_filename: name,
@@ -305,6 +324,9 @@ let compile_file =
     reset_compiler_state();
     compile_wasi_polyfill();
   };
+  if (is_root_file) {
+    Grain_utils.Config.set_root_config();
+  };
   let cstate = {
     cstate_desc: Initial(InputFile(filename)),
     cstate_filename: Some(filename),
@@ -317,18 +339,6 @@ let compile_file =
 
 let anf = Linearize.transl_anf_module;
 
-let save_mashed = (f, outfile) =>
-  switch (compile_file(~is_root_file=false, ~hook=stop_after_mashed, f)) {
-  | {cstate_desc: Mashed(mashed)} =>
-    Grain_utils.Fs_access.ensure_parent_directory_exists(outfile);
-    let mash_string =
-      Sexplib.Sexp.to_string_hum @@ Mashtree.sexp_of_mash_program(mashed);
-    let oc = open_out(outfile);
-    output_string(oc, mash_string);
-    close_out(oc);
-  | _ => failwith("Should be impossible")
-  };
-
 let report_error = loc =>
   Location.(
     Printf.(
diff --git a/compiler/src/compile.rei b/compiler/src/compile.rei
index 382178a699..598ac3156e 100644
--- a/compiler/src/compile.rei
+++ b/compiler/src/compile.rei
@@ -41,8 +41,6 @@ exception InlineFlagsError(Location.t, error);
 
 let default_output_filename: string => string;
 
-let default_mashtree_filename: string => string;
-
 let stop_after_parse: compilation_state => compilation_action;
 
 let stop_after_well_formed: compilation_state => compilation_action;
@@ -85,5 +83,3 @@ let compile_file:
     string
   ) =>
   compilation_state;
-
-let save_mashed: (string, string) => unit;
diff --git a/compiler/src/typed/cmi_format.re b/compiler/src/typed/cmi_format.re
index 253cfe88e6..aad926f822 100644
--- a/compiler/src/typed/cmi_format.re
+++ b/compiler/src/typed/cmi_format.re
@@ -46,12 +46,25 @@ let cmi_digest_of_yojson =
       "cmi_digest_of_yojson: Invalid Digest: " ++ Yojson.Safe.to_string(d),
     );
 
+let sexp_of_cmi_digest = d => Sexplib.Conv.sexp_of_string(Digest.to_hex(d));
+let cmi_digest_of_sexp =
+  fun
+  | Sexplib.Sexp.Atom(s) as d =>
+    try(Digest.from_hex(s)) {
+    | Invalid_argument(_) =>
+      of_sexp_error("cmi_digest_of_sexp: invalid digest", d)
+    }
+  | d => of_sexp_error("cmi_digest_of_sexp: invalid digest", d);
+
+[@deriving sexp]
+type cmi_crcs = list((string, cmi_digest));
+let rec cmi_crcs_of_yojson = [%of_yojson: list((string, cmi_digest))]
+and cmi_crcs_to_yojson = [%to_yojson: list((string, cmi_digest))];
+
 [@deriving sexp]
-type cmi_crcs = [@sexp.opaque] list((string, option(Digest.t)));
-let rec cmi_crcs_of_yojson = [%of_yojson:
-  list((string, option(cmi_digest)))
-]
-and cmi_crcs_to_yojson = [%to_yojson: list((string, option(cmi_digest)))];
+type cmi_crc = cmi_digest;
+let rec cmi_crc_of_yojson = [%of_yojson: cmi_digest]
+and cmi_crc_to_yojson = [%to_yojson: cmi_digest];
 
 [@deriving (sexp, yojson)]
 type cmi_type_metadata = {
@@ -65,6 +78,7 @@ type cmi_infos = {
   cmi_name: string,
   cmi_sign: Types.signature,
   cmi_crcs,
+  cmi_crc,
   cmi_flags: list(pers_flags),
   cmi_type_metadata,
   cmi_config_sum: string,
@@ -75,25 +89,18 @@ type config_opt =
 
 let config_sum = Config.get_root_config_digest;
 
-let build_full_cmi = (~name, ~sign, ~crcs, ~flags, ~type_metadata) => {
-  let ns_sign = Marshal.to_bytes((name, sign, config_sum()), []);
-  let crc = Digest.bytes(ns_sign);
-  let crcs = [(name, Some(crc)), ...crcs];
-  let cmi_config_sum = config_sum();
-  {
-    cmi_name: name,
-    cmi_sign: sign,
-    cmi_crcs: crcs,
-    cmi_flags: flags,
-    cmi_type_metadata: type_metadata,
-    cmi_config_sum,
-  };
-};
+let build_crc = (~name: string, sign: Types.signature) => {
+  let subst_sign =
+    Subst.with_reset_state(() =>
+      Subst.signature(Subst.for_crc(Subst.identity), sign)
+    );
 
-let cmi_to_crc = ({cmi_name, cmi_sign, cmi_config_sum}) => {
-  let ns_sign = Marshal.to_bytes((cmi_name, cmi_sign, cmi_config_sum), []);
-  let crc = Digest.bytes(ns_sign);
-  crc;
+  let ns_sign =
+    Marshal.to_bytes(
+      (name, subst_sign, Config.get_root_config_digest()),
+      [],
+    );
+  Digest.bytes(ns_sign);
 };
 
 let input_cmi = ic =>
diff --git a/compiler/src/typed/cmi_format.rei b/compiler/src/typed/cmi_format.rei
index 746cab4ba2..1967f36bf5 100644
--- a/compiler/src/typed/cmi_format.rei
+++ b/compiler/src/typed/cmi_format.rei
@@ -28,7 +28,8 @@ type cmi_type_metadata = {
 type cmi_infos = {
   cmi_name: string,
   cmi_sign: list(Types.signature_item),
-  cmi_crcs: list((string, option(Digest.t))),
+  cmi_crcs: list((string, Digest.t)),
+  cmi_crc: Digest.t,
   cmi_flags: list(pers_flags),
   cmi_type_metadata,
   cmi_config_sum: string,
@@ -36,15 +37,7 @@ type cmi_infos = {
 
 let config_sum: unit => string;
 
-let build_full_cmi:
-  (
-    ~name: string,
-    ~sign: list(Types.signature_item),
-    ~crcs: list((string, option(Digest.t))),
-    ~flags: list(pers_flags),
-    ~type_metadata: cmi_type_metadata
-  ) =>
-  cmi_infos;
+let build_crc: (~name: string, Types.signature) => Digest.t;
 
 /* write the magic + the cmi information */
 let serialize_cmi: cmi_infos => bytes;
@@ -55,8 +48,6 @@ let input_cmi: in_channel => cmi_infos;
 /* read a cmi from a filename, checking the magic */
 let read_cmi: string => cmi_infos;
 
-let cmi_to_crc: cmi_infos => Digest.t;
-
 /* Error report */
 
 type error =
diff --git a/compiler/src/typed/env.re b/compiler/src/typed/env.re
index 8bb9894a30..a0e9c4cbc1 100644
--- a/compiler/src/typed/env.re
+++ b/compiler/src/typed/env.re
@@ -689,7 +689,8 @@ type pers_struct = {
   ps_name: string,
   ps_sig: Lazy.t(signature),
   ps_comps: module_components,
-  ps_crcs: list((string, option(Digest.t))),
+  ps_crcs: list((string, Digest.t)),
+  ps_crc: Digest.t,
   ps_filename: string,
   ps_flags: list(pers_flags),
 };
@@ -738,6 +739,7 @@ let with_cleared_imports = thunk => {
 
 let clear_imports = () => {
   Consistbl.clear(crc_units);
+  Hashtbl.clear(persistent_structures);
   imported_units := StringSet.empty;
   imported_opaque_units := StringSet.empty;
 };
@@ -745,24 +747,14 @@ let clear_imports = () => {
 let check_consistency = ps =>
   try(
     List.iter(
-      ((name, crco)) =>
-        switch (crco) {
-        | None => ()
-        | Some(crc) =>
-          let resolved_file_name =
-            Module_resolution.resolve_unit(
-              ~base_dir=Filepath.String.dirname(ps.ps_filename),
-              name,
-            );
-          Consistbl.check(
-            crc_units,
-            // This is a workaround; should address
-            // TODO(#1843): Investigate CRC behavior
-            Filepath.String.chop_suffix(resolved_file_name, ".gr"),
-            crc,
-            ps.ps_filename,
+      ((name, crc)) => {
+        let resolved_file_name =
+          Module_resolution.locate_unit_object_file(
+            ~base_dir=Filepath.String.dirname(ps.ps_filename),
+            name,
           );
-        },
+        Consistbl.check(crc_units, resolved_file_name, crc, ps.ps_filename);
+      },
       ps.ps_crcs,
     )
   ) {
@@ -772,16 +764,14 @@ let check_consistency = ps =>
 
 /* Reading persistent structures from .cmi files */
 
-let save_pers_struct = (crc, ps) => {
-  let filename = ps.ps_filename;
-  Hashtbl.add(persistent_structures, filename, Some(ps));
+let save_pers_struct = ps => {
+  Hashtbl.add(persistent_structures, ps.ps_filename, Some(ps));
   List.iter(
     fun
     | Unsafe_string => ()
-    | Opaque => add_imported_opaque(filename),
+    | Opaque => add_imported_opaque(ps.ps_filename),
     ps.ps_flags,
   );
-  Consistbl.set(crc_units, filename, crc, ps.ps_filename);
 };
 
 let get_dependency_chain = (~loc, unit_name) => {
@@ -843,6 +833,7 @@ let acknowledge_pers_struct = (check, {Persistent_signature.filename, cmi}) => {
   let name = cmi.cmi_name;
   let sign = cmi.cmi_sign;
   let crcs = cmi.cmi_crcs;
+  let crc = cmi.cmi_crc;
   let flags = cmi.cmi_flags;
   let comps =
     components_of_module'^(
@@ -859,6 +850,7 @@ let acknowledge_pers_struct = (check, {Persistent_signature.filename, cmi}) => {
     ps_sig: lazy(Subst.signature(Subst.identity, sign)),
     ps_comps: comps,
     ps_crcs: crcs,
+    ps_crc: crc,
     ps_filename: filename,
     ps_flags: flags,
   };
@@ -880,12 +872,6 @@ let acknowledge_pers_struct = (check, {Persistent_signature.filename, cmi}) => {
   ps;
 };
 
-let read_pers_struct = (check, filename) => {
-  add_import(filename);
-  let cmi = read_cmi(filename);
-  acknowledge_pers_struct(check, {Persistent_signature.filename, cmi});
-};
-
 let find_pers_struct = (~loc, check, filepath) => {
   switch (Hashtbl.find(persistent_structures, filepath)) {
   | Some(ps) => ps
@@ -954,8 +940,6 @@ let check_pers_struct = (~loc, name, filename) =>
     error(err);
   };
 
-let read_pers_struct = filename => read_pers_struct(true, filename);
-
 let find_pers_struct = filename => find_pers_struct(true, filename);
 
 let check_pers_struct = (~loc, name, filename) =>
@@ -2278,155 +2262,75 @@ let use_full_signature_of_initially_included_module = (root, env) => {
   use_full_signature(root, env);
 };
 
-/* Read a signature from a file */
-let read_signature = filename => {
-  let ps = read_pers_struct(filename);
-  Lazy.force(ps.ps_sig);
-};
-
 /* Return the CRC of the given compilation unit */
 let crc_of_unit = filename => {
-  let ps = find_pers_struct(~loc=Location.dummy_loc, filename);
-  let crco =
-    try(List.assoc(filename, ps.ps_crcs)) {
-    | Not_found => assert(false)
-    };
-
-  switch (crco) {
-  | None => assert(false)
-  | Some(crc) => crc
-  };
+  find_pers_struct(~loc=Location.dummy_loc, filename).ps_crc;
 };
 
 /* Return the list of imported interfaces with their CRCs */
 
 let imports = () => {
-  let ret =
-    Consistbl.extract(StringSet.elements(imported_units^), crc_units);
-  List.map(
-    ((unit, crc)) =>
-      switch (crc) {
-      | Some(_) => (unit, crc)
-      | None =>
-        try({
-          let cmi =
-            Module_resolution.read_file_cmi(
-              Module_resolution.locate_unit_object_file(unit),
-            );
-          (unit, Some(Cmi_format.cmi_to_crc(cmi)));
-        }) {
-        | _ => (unit, crc)
-        }
-      },
-    ret,
+  let imported_units = StringSet.elements(imported_units^);
+  let resolved_units =
+    List.map(
+      unit => Module_resolution.locate_unit_object_file(unit),
+      imported_units,
+    );
+  List.map2(
+    (unit, resolved_unit) => (unit, crc_of_unit(resolved_unit)),
+    imported_units,
+    resolved_units,
   );
 };
 
 /* Returns true if [s] is an imported opaque module */
 let is_imported_opaque = s => StringSet.mem(s, imported_opaque_units^);
 
-/* Save a signature to a file */
-/*
- let save_signature_with_imports ~deprecated sg modname filename imports =
-   (*prerr_endline filename;
-   List.iter (fun (name, crc) -> prerr_endline name) imports;*)
-   Btype.cleanup_abbrev ();
-   Subst.reset_for_saving ();
-   let sg = Subst.signature (Subst.for_saving Subst.identity) sg in
-   let flags = []
-   in
-   try
-     let cmi = {
-       cmi_name = modname;
-       cmi_sign = sg;
-       cmi_crcs = imports;
-       cmi_flags = flags;
-     } in
-     let crc =
-       output_to_file_via_temporary (* see MPR#7472, MPR#4991 *)
-          ~mode: [Open_binary] filename
-          (fun temp_filename oc -> output_cmi temp_filename oc cmi) in
-     (* Enter signature in persistent table so that imported_unit()
-        will also return its crc *)
-     let comps =
-       components_of_module ~deprecated ~loc:Location.dummy_loc
-         empty Subst.identity
-         (PIdent(Ident.create_persistent modname)) (TModSignature sg) in
-     let ps =
-       { ps_name = modname;
-         ps_sig = lazy (Subst.signature Subst.identity sg);
-         ps_comps = comps;
-         ps_crcs = (cmi.cmi_name, Some crc) :: imports;
-         ps_filename = filename;
-         ps_flags = cmi.cmi_flags;
-       } in
-     save_pers_struct crc ps;
-     cmi
-   with exn ->
-     remove_file filename;
-     raise exn
-
- let save_signature ~deprecated sg modname filename =
-   save_signature_with_imports ~deprecated sg modname filename (imports())
- */
-
 /* Build a module signature */
 let build_signature_with_imports =
     (~deprecated=?, sg, modname, filename, imports, type_metadata) => {
-  /*prerr_endline filename;
-    List.iter (fun (name, crc) -> prerr_endline name) imports;*/
   Btype.cleanup_abbrev();
-  Subst.reset_for_saving();
-  let sg = Subst.signature(Subst.for_saving(Subst.identity), sg);
+  let sg =
+    Subst.with_reset_state(() =>
+      Subst.signature(Subst.for_cmi(Subst.identity), sg)
+    );
+
   let flags = [];
+  let crc = Cmi_format.build_crc(~name=modname, sg);
 
-  try({
-    let full_cmi =
-      Cmi_format.build_full_cmi(
-        ~name=modname,
-        ~sign=sg,
-        ~crcs=imports,
-        ~flags,
-        ~type_metadata,
-      );
-    let cmi = {
-      cmi_name: modname,
-      cmi_sign: sg,
-      cmi_crcs: imports,
-      cmi_flags: flags,
-      cmi_type_metadata: type_metadata,
-      cmi_config_sum: full_cmi.cmi_config_sum,
-    };
-    let crc =
-      switch (full_cmi.cmi_crcs) {
-      | [(_, Some(crc)), ..._] => crc
-      | _ => failwith("Impossible")
-      };
+  let cmi = {
+    cmi_name: modname,
+    cmi_sign: sg,
+    cmi_crcs: imports,
+    cmi_crc: crc,
+    cmi_flags: flags,
+    cmi_type_metadata: type_metadata,
+    cmi_config_sum: Cmi_format.config_sum(),
+  };
 
-    /* Enter signature in persistent table so that imported_unit()
-       will also return its crc */
-    let comps =
-      components_of_module(
-        ~deprecated,
-        ~loc=Location.dummy_loc,
-        empty,
-        Subst.identity,
-        PIdent(Ident.create_persistent(modname)),
-        TModSignature(sg),
-      );
-    let ps = {
-      ps_name: modname,
-      ps_sig: lazy(Subst.signature(Subst.identity, sg)),
-      ps_comps: comps,
-      ps_crcs: full_cmi.cmi_crcs,
-      ps_filename: filename,
-      ps_flags: cmi.cmi_flags,
-    };
-    save_pers_struct(crc, ps);
-    cmi;
-  }) {
-  | exn => raise(exn)
+  let comps =
+    components_of_module(
+      ~deprecated,
+      ~loc=Location.dummy_loc,
+      empty,
+      Subst.identity,
+      PIdent(Ident.create_persistent(modname)),
+      TModSignature(sg),
+    );
+
+  let ps = {
+    ps_name: modname,
+    ps_sig: lazy(Subst.signature(Subst.identity, sg)),
+    ps_comps: comps,
+    ps_crcs: cmi.cmi_crcs,
+    ps_crc: cmi.cmi_crc,
+    ps_filename: Module_resolution.get_output_name(filename),
+    ps_flags: cmi.cmi_flags,
   };
+
+  save_pers_struct(ps);
+
+  cmi;
 };
 
 let build_signature = (~deprecated=?, sg, modname, filename, type_metadata) =>
diff --git a/compiler/src/typed/env.rei b/compiler/src/typed/env.rei
index 5390b7c863..7dfb46a179 100644
--- a/compiler/src/typed/env.rei
+++ b/compiler/src/typed/env.rei
@@ -175,9 +175,6 @@ let use_full_signature: (Path.t, t) => t;
 
 let use_full_signature_of_initially_included_module: (Path.t, t) => t;
 
-/* Read, save a signature to/from a file */
-
-let read_signature: string => signature;
 /* Arguments: module name, file name. Results: signature. */
 let build_signature:
   (
@@ -195,7 +192,7 @@ let build_signature_with_imports:
     signature,
     string,
     string,
-    list((string, option(Digest.t))),
+    list((string, Digest.t)),
     Cmi_format.cmi_type_metadata
   ) =>
   Cmi_format.cmi_infos;
@@ -208,7 +205,7 @@ let crc_of_unit: string => Digest.t;
 
 /* Return the set of compilation units imported, with their CRC */
 
-let imports: unit => list((string, option(Digest.t)));
+let imports: unit => list((string, Digest.t));
 
 /* [is_imported_opaque md] returns true if [md] is an opaque imported module  */
 let is_imported_opaque: string => bool;
diff --git a/compiler/src/typed/module_resolution.re b/compiler/src/typed/module_resolution.re
index 21e1229f9e..39b542cf31 100644
--- a/compiler/src/typed/module_resolution.re
+++ b/compiler/src/typed/module_resolution.re
@@ -404,38 +404,31 @@ module Dependency_graph =
           // the current compiler configuration. Otherwise, we need to recompile.
           let config_sum = Cmi_format.config_sum();
           let base_dir = Filepath.String.dirname(srcpath);
-          dn.dn_up_to_date :=
-            (
-              switch (read_file_cmi(objpath)) {
-              // Treat corrupted CMI as invalid
-              | exception (Cmi_format.Error(_)) => false
-              | cmi =>
-                config_sum == cmi.cmi_config_sum
-                && file_older(srcpath, objpath)
-                && List.for_all(
-                     ((name, crc)) => {
-                       let resolved = resolve_unit(~base_dir, name);
-                       let out_file_name = get_output_name(resolved);
-                       Fs_access.file_exists(out_file_name)
-                       && (
-                         switch (crc) {
-                         | None => false
-                         | Some(crc) =>
-                           try(
-                             Cmi_format.cmi_to_crc(
-                               read_file_cmi(out_file_name),
-                             )
-                             == crc
-                           ) {
-                           | _ => false
-                           }
-                         }
-                       );
-                     },
-                     cmi.cmi_crcs,
-                   )
-              }
-            );
+          let up_to_date =
+            switch (read_file_cmi(objpath)) {
+            // Treat corrupted CMI as invalid
+            | exception (Cmi_format.Error(_)) => false
+            | cmi =>
+              config_sum == cmi.cmi_config_sum
+              && file_older(srcpath, objpath)
+              && List.for_all(
+                   ((name, crc)) => {
+                     let resolved = resolve_unit(~base_dir, name);
+                     let out_file_name = get_output_name(resolved);
+                     Fs_access.file_exists(out_file_name)
+                     && (
+                       try(read_file_cmi(out_file_name).cmi_crc == crc) {
+                       | _ => false
+                       }
+                     );
+                   },
+                   cmi.cmi_crcs,
+                 )
+            };
+          if (!up_to_date) {
+            Hashtbl.remove(cmi_cache, objpath);
+          };
+          dn.dn_up_to_date := up_to_date;
         };
       };
 
diff --git a/compiler/src/typed/module_resolution.rei b/compiler/src/typed/module_resolution.rei
index 56f6d8622b..f82f1d2c34 100644
--- a/compiler/src/typed/module_resolution.rei
+++ b/compiler/src/typed/module_resolution.rei
@@ -1,3 +1,5 @@
+let get_output_name: string => string;
+
 let locate_module_file:
   (~loc: Grain_parsing.Location.t, ~disable_relpath: bool=?, string) => string;
 
diff --git a/compiler/src/typed/subst.re b/compiler/src/typed/subst.re
index c547af197f..3b3efcc184 100644
--- a/compiler/src/typed/subst.re
+++ b/compiler/src/typed/subst.re
@@ -35,14 +35,16 @@ type t = {
   types: PathMap.t(type_replacement),
   modules: PathMap.t(Path.t),
   modtypes: Tbl.t(Ident.t, module_type),
-  for_saving: bool,
+  for_cmi: bool,
+  for_crc: bool,
 };
 
 let identity = {
   types: PathMap.empty,
   modules: PathMap.empty,
   modtypes: Tbl.empty,
-  for_saving: false,
+  for_cmi: false,
+  for_crc: false,
 };
 
 let add_type_path = (id, p, s) => {
@@ -67,9 +69,15 @@ let add_modtype = (id, ty, s) => {
   modtypes: Tbl.add(id, ty, s.modtypes),
 };
 
-let for_saving = s => {...s, for_saving: true};
+let for_cmi = s => {...s, for_cmi: true};
+let for_crc = s => {...s, for_cmi: true, for_crc: true};
 
-let loc = (s, x) => x;
+let loc = (s, x) =>
+  if (s.for_crc) {
+    Location.dummy_loc;
+  } else {
+    x;
+  };
 
 let rec module_path = (s, path) =>
   try(PathMap.find(path, s.modules)) {
@@ -114,7 +122,17 @@ let to_subst_by_type_function = (s, p) =>
 /* Special type ids for saved signatures */
 
 let new_id = ref(-1);
-let reset_for_saving = () => new_id := (-1);
+
+let with_reset_state = f => {
+  let current_id = new_id^;
+  new_id := (-1);
+  let ident_state = Ident.save_state();
+  Ident.setup();
+  let result = f();
+  new_id := current_id;
+  Ident.restore_state(ident_state);
+  result;
+};
 
 let newpersty = desc => {
   decr(new_id);
@@ -132,16 +150,23 @@ let norm =
 
 let ctype_apply_env_empty = ref(_ => assert(false));
 
+let ident = (s, x) => Ident.rename(x);
+let rec path = (s, x) =>
+  switch (x) {
+  | PIdent(id) => PIdent(ident(s, id))
+  | PExternal(mod_, name) => PExternal(path(s, mod_), name)
+  };
+
 /* Similar to [Ctype.nondep_type_rec]. */
 let rec typexp = (s, ty) => {
   let ty = repr(ty);
   switch (ty.desc) {
   | (TTyVar(_) | TTyUniVar(_)) as desc =>
     /* Is this okay? This causes serialized type variables to lose their proper IDs. -Oscar */
-    /* if s.for_saving || ty.id < 0 then */
-    if (s.for_saving) {
+    /* if s.for_cmi || ty.id < 0 then */
+    if (s.for_cmi) {
       let ty' =
-        if (s.for_saving) {
+        if (s.for_cmi) {
           newpersty(norm(desc));
         } else {
           newty2(ty.level, desc);
@@ -159,7 +184,7 @@ let rec typexp = (s, ty) => {
     save_desc(ty, desc);
     /* Make a stub */
     let ty' =
-      if (s.for_saving) {
+      if (s.for_cmi) {
         newpersty(TTyVar(None));
       } else {
         newgenvar();
@@ -194,7 +219,7 @@ let type_expr = (s, ty) => {
 };
 
 let record_field = (s, l) => {
-  rf_name: l.rf_name,
+  rf_name: ident(s, l.rf_name),
   rf_mutable: l.rf_mutable,
   rf_type: typexp(s, l.rf_type),
   rf_loc: loc(s, l.rf_loc),
@@ -207,20 +232,13 @@ let constructor_arguments = s =>
   | TConstrSingleton => TConstrSingleton;
 
 let constructor_declaration = (s, c) => {
-  cd_id: c.cd_id,
+  cd_id: ident(s, c.cd_id),
   cd_args: constructor_arguments(s, c.cd_args),
   cd_res: Option.map(typexp(s), c.cd_res),
   cd_repr: c.cd_repr,
   cd_loc: loc(s, c.cd_loc),
 };
 
-let record_field = (s, f) => {
-  rf_name: f.rf_name,
-  rf_type: typexp(s, f.rf_type),
-  rf_mutable: f.rf_mutable,
-  rf_loc: loc(s, f.rf_loc),
-};
-
 let type_declaration = (s, decl) => {
   let decl = {
     type_params: List.map(typexp(s), decl.type_params),
@@ -241,7 +259,7 @@ let type_declaration = (s, decl) => {
       },
     type_newtype_level: None,
     type_loc: loc(s, decl.type_loc),
-    type_path: decl.type_path,
+    type_path: path(s, decl.type_path),
     type_allocation: decl.type_allocation,
   };
 
@@ -253,7 +271,12 @@ let value_description = (s, descr) => {
   val_type: type_expr(s, descr.val_type),
   val_repr: descr.val_repr,
   val_kind: descr.val_kind,
-  val_internalpath: descr.val_internalpath,
+  val_internalpath:
+    if (s.for_crc) {
+      path(s, descr.val_internalpath);
+    } else {
+      descr.val_internalpath;
+    },
   val_fullpath: Path.PIdent(Ident.create("<unknown>")),
   val_mutable: descr.val_mutable,
   val_global: descr.val_global,
@@ -329,11 +352,15 @@ and signature = (s, sg) => {
 
 and signature_component = (s, comp, newid) =>
   switch (comp) {
-  | TSigValue(_id, d) =>
-    TSigValue(
-      newid,
-      {...value_description(s, d), val_fullpath: Path.PIdent(_id)},
-    )
+  | TSigValue(id, d) =>
+    let vd = value_description(s, d);
+    let desc =
+      if (s.for_crc) {
+        vd;
+      } else {
+        {...vd, val_fullpath: Path.PIdent(id)};
+      };
+    TSigValue(newid, desc);
   | TSigType(_id, d, rs) => TSigType(newid, type_declaration(s, d), rs)
   | TSigTypeExt(_id, d, es) =>
     TSigTypeExt(newid, extension_constructor(s, d), es)
@@ -375,5 +402,6 @@ let compose = (s1, s2) => {
   types: merge_path_maps(type_replacement(s2), s1.types, s2.types),
   modules: merge_path_maps(module_path(s2), s1.modules, s2.modules),
   modtypes: merge_tbls(modtype(s2), s1.modtypes, s2.modtypes),
-  for_saving: s1.for_saving || s2.for_saving,
+  for_cmi: s1.for_cmi || s2.for_cmi,
+  for_crc: s1.for_crc || s2.for_crc,
 };
diff --git a/compiler/src/typed/subst.rei b/compiler/src/typed/subst.rei
index d1623c5eb1..97fb2437f2 100644
--- a/compiler/src/typed/subst.rei
+++ b/compiler/src/typed/subst.rei
@@ -41,8 +41,11 @@ let add_type_function:
 let add_module: (Ident.t, Path.t, t) => t;
 let add_module_path: (Path.t, Path.t, t) => t;
 let add_modtype: (Ident.t, module_type, t) => t;
-let for_saving: t => t;
-let reset_for_saving: unit => unit;
+/* Configuration for saving to a CMI */
+let for_cmi: t => t;
+/* Like for_cmi, but suitable for reproducible CRCs */
+let for_crc: t => t;
+let with_reset_state: (unit => 'a) => 'a;
 
 let module_path: (t, Path.t) => Path.t;
 let type_path: (t, Path.t) => Path.t;
diff --git a/compiler/src/typed/typecore.re b/compiler/src/typed/typecore.re
index 0b8bc43d37..a415dc9465 100644
--- a/compiler/src/typed/typecore.re
+++ b/compiler/src/typed/typecore.re
@@ -2381,9 +2381,9 @@ and type_cases =
     };
   let ty_arg_check =
     if (do_init) {
-      /* Hack: use for_saving to copy variables too */
+      /* Hack: use for_cmi to copy variables too */
       Subst.type_expr(
-        Subst.for_saving(Subst.identity),
+        Subst.for_cmi(Subst.identity),
         ty_arg,
       );
     } else {
diff --git a/compiler/test/__snapshots__/arrays.0f9e7d37.0.snapshot b/compiler/test/__snapshots__/arrays.0f9e7d37.0.snapshot
index 5c42d99064..e5c9a4010b 100644
--- a/compiler/test/__snapshots__/arrays.0f9e7d37.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.0f9e7d37.0.snapshot
@@ -246,5 +246,5 @@ arrays › array_access
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.1deb7b51.0.snapshot b/compiler/test/__snapshots__/arrays.1deb7b51.0.snapshot
index 81a9401365..43ccc57b0e 100644
--- a/compiler/test/__snapshots__/arrays.1deb7b51.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.1deb7b51.0.snapshot
@@ -261,5 +261,5 @@ arrays › array_access5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.24453e6e.0.snapshot b/compiler/test/__snapshots__/arrays.24453e6e.0.snapshot
index ef10d9ef05..617668248f 100644
--- a/compiler/test/__snapshots__/arrays.24453e6e.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.24453e6e.0.snapshot
@@ -61,5 +61,5 @@ arrays › array1_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.28fcc534.0.snapshot b/compiler/test/__snapshots__/arrays.28fcc534.0.snapshot
index 2715c0e989..d6b32719c8 100644
--- a/compiler/test/__snapshots__/arrays.28fcc534.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.28fcc534.0.snapshot
@@ -246,5 +246,5 @@ arrays › array_access4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.4c8c9f91.0.snapshot b/compiler/test/__snapshots__/arrays.4c8c9f91.0.snapshot
index 07accf4261..c660f7449e 100644
--- a/compiler/test/__snapshots__/arrays.4c8c9f91.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.4c8c9f91.0.snapshot
@@ -246,5 +246,5 @@ arrays › array_access2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.6eac4e1f.0.snapshot b/compiler/test/__snapshots__/arrays.6eac4e1f.0.snapshot
index 1c5e90059a..f845fb6622 100644
--- a/compiler/test/__snapshots__/arrays.6eac4e1f.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.6eac4e1f.0.snapshot
@@ -246,5 +246,5 @@ arrays › array_access3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.74d79181.0.snapshot b/compiler/test/__snapshots__/arrays.74d79181.0.snapshot
index 6057c70ddb..11a9b199a9 100644
--- a/compiler/test/__snapshots__/arrays.74d79181.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.74d79181.0.snapshot
@@ -246,5 +246,5 @@ arrays › array_access5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.9e17b4d1.0.snapshot b/compiler/test/__snapshots__/arrays.9e17b4d1.0.snapshot
index 0b5cbf392f..356b660f0c 100644
--- a/compiler/test/__snapshots__/arrays.9e17b4d1.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.9e17b4d1.0.snapshot
@@ -61,5 +61,5 @@ arrays › array3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/arrays.b85cb7fc.0.snapshot b/compiler/test/__snapshots__/arrays.b85cb7fc.0.snapshot
index 8465805fba..4ec5675f0c 100644
--- a/compiler/test/__snapshots__/arrays.b85cb7fc.0.snapshot
+++ b/compiler/test/__snapshots__/arrays.b85cb7fc.0.snapshot
@@ -61,5 +61,5 @@ arrays › array1_trailing_space
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.00bcbc39.0.snapshot b/compiler/test/__snapshots__/basic_functionality.00bcbc39.0.snapshot
index 9d8c13b275..761bd6d9f3 100644
--- a/compiler/test/__snapshots__/basic_functionality.00bcbc39.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.00bcbc39.0.snapshot
@@ -81,5 +81,5 @@ basic functionality › assignment1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.00cfdb2e.0.snapshot b/compiler/test/__snapshots__/basic_functionality.00cfdb2e.0.snapshot
index a49a9004aa..aa59bf5b19 100644
--- a/compiler/test/__snapshots__/basic_functionality.00cfdb2e.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.00cfdb2e.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › binop2.4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.03de4778.0.snapshot b/compiler/test/__snapshots__/basic_functionality.03de4778.0.snapshot
index a41264780b..10e9abfad9 100644
--- a/compiler/test/__snapshots__/basic_functionality.03de4778.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.03de4778.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › neg
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.040643b3.0.snapshot b/compiler/test/__snapshots__/basic_functionality.040643b3.0.snapshot
index fa502a6363..6235792196 100644
--- a/compiler/test/__snapshots__/basic_functionality.040643b3.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.040643b3.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.06bd2a80.0.snapshot b/compiler/test/__snapshots__/basic_functionality.06bd2a80.0.snapshot
index b04e355068..7dcb135c25 100644
--- a/compiler/test/__snapshots__/basic_functionality.06bd2a80.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.06bd2a80.0.snapshot
@@ -60,5 +60,5 @@ basic functionality › assignment1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0996c5f7.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0996c5f7.0.snapshot
index 03fb611ec9..cf6e106090 100644
--- a/compiler/test/__snapshots__/basic_functionality.0996c5f7.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0996c5f7.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › modulo4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0a230f18.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0a230f18.0.snapshot
index 7c7471c5f7..bc8734bd25 100644
--- a/compiler/test/__snapshots__/basic_functionality.0a230f18.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0a230f18.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › land4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0a2e4afa.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0a2e4afa.0.snapshot
index 769f499e34..dc2f4c8c0b 100644
--- a/compiler/test/__snapshots__/basic_functionality.0a2e4afa.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0a2e4afa.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lxor1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0c0b170b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0c0b170b.0.snapshot
index 64de14494f..2381f4173a 100644
--- a/compiler/test/__snapshots__/basic_functionality.0c0b170b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0c0b170b.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lor1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0c400bde.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0c400bde.0.snapshot
index 4a853781d1..1f2757e893 100644
--- a/compiler/test/__snapshots__/basic_functionality.0c400bde.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0c400bde.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › modulo6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0e812a39.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0e812a39.0.snapshot
index 2115166012..ac5ef3233b 100644
--- a/compiler/test/__snapshots__/basic_functionality.0e812a39.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0e812a39.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › precedence1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.0f79ce35.0.snapshot b/compiler/test/__snapshots__/basic_functionality.0f79ce35.0.snapshot
index e89b48e629..1ba18ed5d7 100644
--- a/compiler/test/__snapshots__/basic_functionality.0f79ce35.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.0f79ce35.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › comp16
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.10dda088.0.snapshot b/compiler/test/__snapshots__/basic_functionality.10dda088.0.snapshot
index 7f57af40e7..ac8a9e2d25 100644
--- a/compiler/test/__snapshots__/basic_functionality.10dda088.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.10dda088.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.122e74b0.0.snapshot b/compiler/test/__snapshots__/basic_functionality.122e74b0.0.snapshot
index 4dee5038ff..86fd6579ef 100644
--- a/compiler/test/__snapshots__/basic_functionality.122e74b0.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.122e74b0.0.snapshot
@@ -108,5 +108,5 @@ basic functionality › print_line_ending1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.125626a9.0.snapshot b/compiler/test/__snapshots__/basic_functionality.125626a9.0.snapshot
index 83e00977ef..e0f7a5415f 100644
--- a/compiler/test/__snapshots__/basic_functionality.125626a9.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.125626a9.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › orshadow
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.13335202.0.snapshot b/compiler/test/__snapshots__/basic_functionality.13335202.0.snapshot
index 84587fc1d5..da00cb8d1e 100644
--- a/compiler/test/__snapshots__/basic_functionality.13335202.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.13335202.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › precedence2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1ad0f349.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1ad0f349.0.snapshot
index c2ef4538ae..5d0d6a8655 100644
--- a/compiler/test/__snapshots__/basic_functionality.1ad0f349.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1ad0f349.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › precedence3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1ae16d82.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1ae16d82.0.snapshot
index 553cfec986..c4ac6bdb5e 100644
--- a/compiler/test/__snapshots__/basic_functionality.1ae16d82.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1ae16d82.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1b68c8db.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1b68c8db.0.snapshot
index 7f2a2ac53f..2754fe0c88 100644
--- a/compiler/test/__snapshots__/basic_functionality.1b68c8db.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1b68c8db.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lsl1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1bf5759c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1bf5759c.0.snapshot
index c5cc1222ef..1b7cb1b034 100644
--- a/compiler/test/__snapshots__/basic_functionality.1bf5759c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1bf5759c.0.snapshot
@@ -68,5 +68,5 @@ basic functionality › unsafe_wasm_globals
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 464
+ ;; custom section \"cmi\", size 509
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1d2ec323.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1d2ec323.0.snapshot
index 495f63c10c..020c5a1280 100644
--- a/compiler/test/__snapshots__/basic_functionality.1d2ec323.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1d2ec323.0.snapshot
@@ -256,5 +256,5 @@ basic functionality › comp22
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1e4b1f39.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1e4b1f39.0.snapshot
index 94789aca64..147bc96820 100644
--- a/compiler/test/__snapshots__/basic_functionality.1e4b1f39.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1e4b1f39.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › land1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.1f787365.0.snapshot b/compiler/test/__snapshots__/basic_functionality.1f787365.0.snapshot
index 986208a6d4..6039c5a95b 100644
--- a/compiler/test/__snapshots__/basic_functionality.1f787365.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.1f787365.0.snapshot
@@ -84,5 +84,5 @@ basic functionality › orshort2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.20f7581b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.20f7581b.0.snapshot
index fa4daac8ae..b793ef5c15 100644
--- a/compiler/test/__snapshots__/basic_functionality.20f7581b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.20f7581b.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › simple_min
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.240ef39e.0.snapshot b/compiler/test/__snapshots__/basic_functionality.240ef39e.0.snapshot
index 1c17d0ea92..a37c84ec63 100644
--- a/compiler/test/__snapshots__/basic_functionality.240ef39e.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.240ef39e.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2756b429.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2756b429.0.snapshot
index 45ec38e56c..269bbdd8a1 100644
--- a/compiler/test/__snapshots__/basic_functionality.2756b429.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2756b429.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › forty
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.27a7e2f7.0.snapshot b/compiler/test/__snapshots__/basic_functionality.27a7e2f7.0.snapshot
index 09d2177bbb..cdd63deb09 100644
--- a/compiler/test/__snapshots__/basic_functionality.27a7e2f7.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.27a7e2f7.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › bigint_start_pos
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.28405f1f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.28405f1f.0.snapshot
index 51680de804..e936146093 100644
--- a/compiler/test/__snapshots__/basic_functionality.28405f1f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.28405f1f.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › precedence4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.28bf4c9e.0.snapshot b/compiler/test/__snapshots__/basic_functionality.28bf4c9e.0.snapshot
index 1badc1e797..0237f8d80b 100644
--- a/compiler/test/__snapshots__/basic_functionality.28bf4c9e.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.28bf4c9e.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2bcc447b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2bcc447b.0.snapshot
index 4751e3e008..2096b8083b 100644
--- a/compiler/test/__snapshots__/basic_functionality.2bcc447b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2bcc447b.0.snapshot
@@ -182,5 +182,5 @@ basic functionality › assert2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2cb30a54.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2cb30a54.0.snapshot
index 4fa9e74286..8b73fb0d95 100644
--- a/compiler/test/__snapshots__/basic_functionality.2cb30a54.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2cb30a54.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › bigint_start_neg
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2d7e34cf.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2d7e34cf.0.snapshot
index c2eea5e422..ae9e0d8841 100644
--- a/compiler/test/__snapshots__/basic_functionality.2d7e34cf.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2d7e34cf.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › and2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2f2f8795.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2f2f8795.0.snapshot
index e581bc00dc..44f59ae1b2 100644
--- a/compiler/test/__snapshots__/basic_functionality.2f2f8795.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2f2f8795.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lsl2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2f53324c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2f53324c.0.snapshot
index 1239ee169f..64450037bd 100644
--- a/compiler/test/__snapshots__/basic_functionality.2f53324c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2f53324c.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › comp17
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.2f65c8cf.0.snapshot b/compiler/test/__snapshots__/basic_functionality.2f65c8cf.0.snapshot
index 092d80917c..cf253a5373 100644
--- a/compiler/test/__snapshots__/basic_functionality.2f65c8cf.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.2f65c8cf.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › fals
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.304ca65f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.304ca65f.0.snapshot
index e886176edf..857a37750a 100644
--- a/compiler/test/__snapshots__/basic_functionality.304ca65f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.304ca65f.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › oct_neg
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.31e0d562.0.snapshot b/compiler/test/__snapshots__/basic_functionality.31e0d562.0.snapshot
index 0f2002424d..0589e6612a 100644
--- a/compiler/test/__snapshots__/basic_functionality.31e0d562.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.31e0d562.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › infinity
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.32a8c452.0.snapshot b/compiler/test/__snapshots__/basic_functionality.32a8c452.0.snapshot
index 4e5f9a96d1..030c9ebdb3 100644
--- a/compiler/test/__snapshots__/basic_functionality.32a8c452.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.32a8c452.0.snapshot
@@ -98,5 +98,5 @@ basic functionality › complex2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.34dcfbdd.0.snapshot b/compiler/test/__snapshots__/basic_functionality.34dcfbdd.0.snapshot
index 415f82e64a..20ccce0ac1 100644
--- a/compiler/test/__snapshots__/basic_functionality.34dcfbdd.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.34dcfbdd.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › int64_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.3c2ba165.0.snapshot b/compiler/test/__snapshots__/basic_functionality.3c2ba165.0.snapshot
index 8a1aec8953..d38657bc3b 100644
--- a/compiler/test/__snapshots__/basic_functionality.3c2ba165.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.3c2ba165.0.snapshot
@@ -288,5 +288,5 @@ basic functionality › comp20
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.3e5f990b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.3e5f990b.0.snapshot
index a9c338a911..5cceacca29 100644
--- a/compiler/test/__snapshots__/basic_functionality.3e5f990b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.3e5f990b.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lor3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.3edefd23.0.snapshot b/compiler/test/__snapshots__/basic_functionality.3edefd23.0.snapshot
index ddfe509b36..eb7bdd441e 100644
--- a/compiler/test/__snapshots__/basic_functionality.3edefd23.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.3edefd23.0.snapshot
@@ -42,5 +42,5 @@ basic functionality › decr_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.3ffd0bf3.0.snapshot b/compiler/test/__snapshots__/basic_functionality.3ffd0bf3.0.snapshot
index 6f2309c3b5..b0e2e3dbcd 100644
--- a/compiler/test/__snapshots__/basic_functionality.3ffd0bf3.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.3ffd0bf3.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › orshort1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.427c6671.0.snapshot b/compiler/test/__snapshots__/basic_functionality.427c6671.0.snapshot
index 5c17ed1911..552237e7d7 100644
--- a/compiler/test/__snapshots__/basic_functionality.427c6671.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.427c6671.0.snapshot
@@ -49,5 +49,5 @@ basic functionality › uint64_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.448497ab.0.snapshot b/compiler/test/__snapshots__/basic_functionality.448497ab.0.snapshot
index e5382a15ad..547ac7c6c4 100644
--- a/compiler/test/__snapshots__/basic_functionality.448497ab.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.448497ab.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › binop5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.46348f36.0.snapshot b/compiler/test/__snapshots__/basic_functionality.46348f36.0.snapshot
index b9a5451175..43c408598f 100644
--- a/compiler/test/__snapshots__/basic_functionality.46348f36.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.46348f36.0.snapshot
@@ -72,5 +72,5 @@ basic functionality › precedence5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.48db380c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.48db380c.0.snapshot
index 4ccdf06d54..cb94986b24 100644
--- a/compiler/test/__snapshots__/basic_functionality.48db380c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.48db380c.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › if4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.4d1501b9.0.snapshot b/compiler/test/__snapshots__/basic_functionality.4d1501b9.0.snapshot
index cb307d864d..60072f874a 100644
--- a/compiler/test/__snapshots__/basic_functionality.4d1501b9.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.4d1501b9.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › nan
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.4d6f9417.0.snapshot b/compiler/test/__snapshots__/basic_functionality.4d6f9417.0.snapshot
index 31d7d53853..a40b2ea9f4 100644
--- a/compiler/test/__snapshots__/basic_functionality.4d6f9417.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.4d6f9417.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › not1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.4f5bd247.0.snapshot b/compiler/test/__snapshots__/basic_functionality.4f5bd247.0.snapshot
index f82cfcf37e..7dac306da3 100644
--- a/compiler/test/__snapshots__/basic_functionality.4f5bd247.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.4f5bd247.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › heap_number_i64_wrapper
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.52ca8e0e.0.snapshot b/compiler/test/__snapshots__/basic_functionality.52ca8e0e.0.snapshot
index 93b13062b4..d0364f37f0 100644
--- a/compiler/test/__snapshots__/basic_functionality.52ca8e0e.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.52ca8e0e.0.snapshot
@@ -257,5 +257,5 @@ basic functionality › func_shadow
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 329
+ ;; custom section \"cmi\", size 374
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.565dbeda.0.snapshot b/compiler/test/__snapshots__/basic_functionality.565dbeda.0.snapshot
index f7672143ed..f18cf7240f 100644
--- a/compiler/test/__snapshots__/basic_functionality.565dbeda.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.565dbeda.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › hex_neg
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.5705b20c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.5705b20c.0.snapshot
index 88dd18289a..c1004010ce 100644
--- a/compiler/test/__snapshots__/basic_functionality.5705b20c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.5705b20c.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › modulo5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.593b8d63.0.snapshot b/compiler/test/__snapshots__/basic_functionality.593b8d63.0.snapshot
index 9c7f095ebe..f451431079 100644
--- a/compiler/test/__snapshots__/basic_functionality.593b8d63.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.593b8d63.0.snapshot
@@ -109,5 +109,5 @@ basic functionality › if_one_sided6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.5b56d472.0.snapshot b/compiler/test/__snapshots__/basic_functionality.5b56d472.0.snapshot
index 51b8bc90e1..f18af66caa 100644
--- a/compiler/test/__snapshots__/basic_functionality.5b56d472.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.5b56d472.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › and3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.5cd54e52.0.snapshot b/compiler/test/__snapshots__/basic_functionality.5cd54e52.0.snapshot
index 433001e52a..9fa9298045 100644
--- a/compiler/test/__snapshots__/basic_functionality.5cd54e52.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.5cd54e52.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › or4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.5d973a3e.0.snapshot b/compiler/test/__snapshots__/basic_functionality.5d973a3e.0.snapshot
index d7e104c370..213e0f4ea8 100644
--- a/compiler/test/__snapshots__/basic_functionality.5d973a3e.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.5d973a3e.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.61c58118.0.snapshot b/compiler/test/__snapshots__/basic_functionality.61c58118.0.snapshot
index 9bc612483e..4ea5c5a801 100644
--- a/compiler/test/__snapshots__/basic_functionality.61c58118.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.61c58118.0.snapshot
@@ -74,5 +74,5 @@ basic functionality › block_no_expression
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.626b2e44.0.snapshot b/compiler/test/__snapshots__/basic_functionality.626b2e44.0.snapshot
index e882a11ff6..af8a0cb99c 100644
--- a/compiler/test/__snapshots__/basic_functionality.626b2e44.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.626b2e44.0.snapshot
@@ -106,5 +106,5 @@ basic functionality › if_one_sided5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.65d36891.0.snapshot b/compiler/test/__snapshots__/basic_functionality.65d36891.0.snapshot
index 063983d6ee..3db36ae851 100644
--- a/compiler/test/__snapshots__/basic_functionality.65d36891.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.65d36891.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lor2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.67d2cc45.0.snapshot b/compiler/test/__snapshots__/basic_functionality.67d2cc45.0.snapshot
index 1137f3d5ea..528e6e32c1 100644
--- a/compiler/test/__snapshots__/basic_functionality.67d2cc45.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.67d2cc45.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.684b6ecb.0.snapshot b/compiler/test/__snapshots__/basic_functionality.684b6ecb.0.snapshot
index 1b92c63cce..2456fd12ac 100644
--- a/compiler/test/__snapshots__/basic_functionality.684b6ecb.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.684b6ecb.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop2.2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.68d08483.0.snapshot b/compiler/test/__snapshots__/basic_functionality.68d08483.0.snapshot
index 2d3748e5ca..2ea4898657 100644
--- a/compiler/test/__snapshots__/basic_functionality.68d08483.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.68d08483.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › land2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.6f9706c2.0.snapshot b/compiler/test/__snapshots__/basic_functionality.6f9706c2.0.snapshot
index 37d78e40cf..d17a157cff 100644
--- a/compiler/test/__snapshots__/basic_functionality.6f9706c2.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.6f9706c2.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › or1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.704872bc.0.snapshot b/compiler/test/__snapshots__/basic_functionality.704872bc.0.snapshot
index a3d23bf6ab..42f12e1f22 100644
--- a/compiler/test/__snapshots__/basic_functionality.704872bc.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.704872bc.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › assert1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.711a4824.0.snapshot b/compiler/test/__snapshots__/basic_functionality.711a4824.0.snapshot
index 89da053f65..2c5df87c49 100644
--- a/compiler/test/__snapshots__/basic_functionality.711a4824.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.711a4824.0.snapshot
@@ -780,5 +780,5 @@ basic functionality › pattern_match_unsafe_wasm
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 341
+ ;; custom section \"cmi\", size 386
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7222ab37.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7222ab37.0.snapshot
index e0428b206e..9e228c6485 100644
--- a/compiler/test/__snapshots__/basic_functionality.7222ab37.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7222ab37.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › tru
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7287219f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7287219f.0.snapshot
index 4bd760e022..4362755621 100644
--- a/compiler/test/__snapshots__/basic_functionality.7287219f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7287219f.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › asr1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7599b5a6.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7599b5a6.0.snapshot
index 7780eb834f..95c86e8bb7 100644
--- a/compiler/test/__snapshots__/basic_functionality.7599b5a6.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7599b5a6.0.snapshot
@@ -81,5 +81,5 @@ basic functionality › assignment1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7848308f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7848308f.0.snapshot
index d8b50f0c81..42ffcc7678 100644
--- a/compiler/test/__snapshots__/basic_functionality.7848308f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7848308f.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › or3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.79ea1ccc.0.snapshot b/compiler/test/__snapshots__/basic_functionality.79ea1ccc.0.snapshot
index fe7bedb675..5ecd8659de 100644
--- a/compiler/test/__snapshots__/basic_functionality.79ea1ccc.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.79ea1ccc.0.snapshot
@@ -81,5 +81,5 @@ basic functionality › assignment1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7b13e79a.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7b13e79a.0.snapshot
index 9846e7f963..cad7a59606 100644
--- a/compiler/test/__snapshots__/basic_functionality.7b13e79a.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7b13e79a.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › and4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7bb7b0d4.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7bb7b0d4.0.snapshot
index 9af3801dd1..5f95dbf37e 100644
--- a/compiler/test/__snapshots__/basic_functionality.7bb7b0d4.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7bb7b0d4.0.snapshot
@@ -49,5 +49,5 @@ basic functionality › uint32_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7beffe4d.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7beffe4d.0.snapshot
index 2569fd0a00..8a64f95e17 100644
--- a/compiler/test/__snapshots__/basic_functionality.7beffe4d.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7beffe4d.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › hex_dec_exp5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7ccc4940.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7ccc4940.0.snapshot
index 58ae6d1c85..231d372984 100644
--- a/compiler/test/__snapshots__/basic_functionality.7ccc4940.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7ccc4940.0.snapshot
@@ -111,5 +111,5 @@ basic functionality › division1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.7d0640b4.0.snapshot b/compiler/test/__snapshots__/basic_functionality.7d0640b4.0.snapshot
index 12c9bf825b..0257d5678c 100644
--- a/compiler/test/__snapshots__/basic_functionality.7d0640b4.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.7d0640b4.0.snapshot
@@ -109,5 +109,5 @@ basic functionality › if_one_sided2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.83f51526.0.snapshot b/compiler/test/__snapshots__/basic_functionality.83f51526.0.snapshot
index f5ef5c9a1e..d3f39fb416 100644
--- a/compiler/test/__snapshots__/basic_functionality.83f51526.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.83f51526.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › hex_dec_exp3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.86f332c6.0.snapshot b/compiler/test/__snapshots__/basic_functionality.86f332c6.0.snapshot
index 367e0dccad..635eebae02 100644
--- a/compiler/test/__snapshots__/basic_functionality.86f332c6.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.86f332c6.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › bin_neg
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.8c8313f3.0.snapshot b/compiler/test/__snapshots__/basic_functionality.8c8313f3.0.snapshot
index 00de501567..b1dfe80c13 100644
--- a/compiler/test/__snapshots__/basic_functionality.8c8313f3.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.8c8313f3.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › hex_dec_exp2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.8e01d666.0.snapshot b/compiler/test/__snapshots__/basic_functionality.8e01d666.0.snapshot
index 695ebc2184..9c26197c02 100644
--- a/compiler/test/__snapshots__/basic_functionality.8e01d666.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.8e01d666.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › infinity_neg
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.903ff701.0.snapshot b/compiler/test/__snapshots__/basic_functionality.903ff701.0.snapshot
index b5aa226c19..c52ad996fa 100644
--- a/compiler/test/__snapshots__/basic_functionality.903ff701.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.903ff701.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › hex_dec_exp4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9110d0f5.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9110d0f5.0.snapshot
index cf73b3e492..9414e71f43 100644
--- a/compiler/test/__snapshots__/basic_functionality.9110d0f5.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9110d0f5.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › comp13
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9157dba1.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9157dba1.0.snapshot
index 1a250c55aa..adc57c3894 100644
--- a/compiler/test/__snapshots__/basic_functionality.9157dba1.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9157dba1.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › andshadow
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9379df0d.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9379df0d.0.snapshot
index 4197e79a8a..35429d4b8f 100644
--- a/compiler/test/__snapshots__/basic_functionality.9379df0d.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9379df0d.0.snapshot
@@ -274,5 +274,5 @@ basic functionality › comp21
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.950b8fda.0.snapshot b/compiler/test/__snapshots__/basic_functionality.950b8fda.0.snapshot
index 1bb59889cc..69cf61785d 100644
--- a/compiler/test/__snapshots__/basic_functionality.950b8fda.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.950b8fda.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › binop2.3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.970a2a2b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.970a2a2b.0.snapshot
index 1b578d1a2a..92753c8388 100644
--- a/compiler/test/__snapshots__/basic_functionality.970a2a2b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.970a2a2b.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › not2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.974b7936.0.snapshot b/compiler/test/__snapshots__/basic_functionality.974b7936.0.snapshot
index c038714210..765ff01bb0 100644
--- a/compiler/test/__snapshots__/basic_functionality.974b7936.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.974b7936.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lxor3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.994117f8.0.snapshot b/compiler/test/__snapshots__/basic_functionality.994117f8.0.snapshot
index 0d275094f4..c39ec95248 100644
--- a/compiler/test/__snapshots__/basic_functionality.994117f8.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.994117f8.0.snapshot
@@ -42,5 +42,5 @@ basic functionality › incr_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9b9c7047.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9b9c7047.0.snapshot
index ec2a37ba49..be05c133f3 100644
--- a/compiler/test/__snapshots__/basic_functionality.9b9c7047.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9b9c7047.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › void
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9c18b19d.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9c18b19d.0.snapshot
index 5b31e8db15..4276db4d61 100644
--- a/compiler/test/__snapshots__/basic_functionality.9c18b19d.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9c18b19d.0.snapshot
@@ -89,5 +89,5 @@ basic functionality › if_one_sided3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9df4a5e0.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9df4a5e0.0.snapshot
index e3cbe8aa1d..0b162d1e9d 100644
--- a/compiler/test/__snapshots__/basic_functionality.9df4a5e0.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9df4a5e0.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › and1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.9fb01eb5.0.snapshot b/compiler/test/__snapshots__/basic_functionality.9fb01eb5.0.snapshot
index 4e68ae3e8c..0844291c77 100644
--- a/compiler/test/__snapshots__/basic_functionality.9fb01eb5.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.9fb01eb5.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › simple_max
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a0045d1c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a0045d1c.0.snapshot
index 049fd08e2b..0174f48439 100644
--- a/compiler/test/__snapshots__/basic_functionality.a0045d1c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a0045d1c.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a0747361.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a0747361.0.snapshot
index f791d570f9..f9daffac27 100644
--- a/compiler/test/__snapshots__/basic_functionality.a0747361.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a0747361.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › hex
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a2e63440.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a2e63440.0.snapshot
index 09f9db91a9..bc63392a28 100644
--- a/compiler/test/__snapshots__/basic_functionality.a2e63440.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a2e63440.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp9
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a3f7e180.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a3f7e180.0.snapshot
index 666fc59373..21b4ff882e 100644
--- a/compiler/test/__snapshots__/basic_functionality.a3f7e180.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a3f7e180.0.snapshot
@@ -73,5 +73,5 @@ basic functionality › bigint_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a4ec9fca.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a4ec9fca.0.snapshot
index 92c9a31175..454c7501ab 100644
--- a/compiler/test/__snapshots__/basic_functionality.a4ec9fca.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a4ec9fca.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › andshort2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a58a9361.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a58a9361.0.snapshot
index eee3bcd594..4c82ef2406 100644
--- a/compiler/test/__snapshots__/basic_functionality.a58a9361.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a58a9361.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lxor2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a5d5182f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a5d5182f.0.snapshot
index fb5dabea4f..baecb81e8b 100644
--- a/compiler/test/__snapshots__/basic_functionality.a5d5182f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a5d5182f.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.a72898d0.0.snapshot b/compiler/test/__snapshots__/basic_functionality.a72898d0.0.snapshot
index 0756339167..0c4539f63e 100644
--- a/compiler/test/__snapshots__/basic_functionality.a72898d0.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.a72898d0.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp8
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.abd9d13c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.abd9d13c.0.snapshot
index 51c676cf7c..a6567f4015 100644
--- a/compiler/test/__snapshots__/basic_functionality.abd9d13c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.abd9d13c.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp7
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.b07cc734.0.snapshot b/compiler/test/__snapshots__/basic_functionality.b07cc734.0.snapshot
index 4564fb5e48..1990822d62 100644
--- a/compiler/test/__snapshots__/basic_functionality.b07cc734.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.b07cc734.0.snapshot
@@ -109,5 +109,5 @@ basic functionality › if_one_sided
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.b6a1b657.0.snapshot b/compiler/test/__snapshots__/basic_functionality.b6a1b657.0.snapshot
index b5b0a93c67..8bb888f3a4 100644
--- a/compiler/test/__snapshots__/basic_functionality.b6a1b657.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.b6a1b657.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lxor4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.b836b89a.0.snapshot b/compiler/test/__snapshots__/basic_functionality.b836b89a.0.snapshot
index b6f9e21307..ffc3d6867d 100644
--- a/compiler/test/__snapshots__/basic_functionality.b836b89a.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.b836b89a.0.snapshot
@@ -110,5 +110,5 @@ basic functionality › complex1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.bb137371.0.snapshot b/compiler/test/__snapshots__/basic_functionality.bb137371.0.snapshot
index ce5c3e4d16..f872336d95 100644
--- a/compiler/test/__snapshots__/basic_functionality.bb137371.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.bb137371.0.snapshot
@@ -81,5 +81,5 @@ basic functionality › assignment1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.bd891a1f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.bd891a1f.0.snapshot
index a78386b3b0..72c8fd2a5b 100644
--- a/compiler/test/__snapshots__/basic_functionality.bd891a1f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.bd891a1f.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › oct
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.bef9449e.0.snapshot b/compiler/test/__snapshots__/basic_functionality.bef9449e.0.snapshot
index a379c79098..29b7676c38 100644
--- a/compiler/test/__snapshots__/basic_functionality.bef9449e.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.bef9449e.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c1554a92.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c1554a92.0.snapshot
index dadf972bf7..18a423f3b9 100644
--- a/compiler/test/__snapshots__/basic_functionality.c1554a92.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c1554a92.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › or2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c2c74be4.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c2c74be4.0.snapshot
index 755e6941fc..dea3ec445d 100644
--- a/compiler/test/__snapshots__/basic_functionality.c2c74be4.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c2c74be4.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lsr2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c4090bb1.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c4090bb1.0.snapshot
index b7c9afdad0..572ea64e70 100644
--- a/compiler/test/__snapshots__/basic_functionality.c4090bb1.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c4090bb1.0.snapshot
@@ -303,5 +303,5 @@ basic functionality › toplevel_statements
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 337
+ ;; custom section \"cmi\", size 382
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c49928a5.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c49928a5.0.snapshot
index f241ed526e..474d01aa2b 100644
--- a/compiler/test/__snapshots__/basic_functionality.c49928a5.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c49928a5.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lsr1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c55feb83.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c55feb83.0.snapshot
index 29491fa3f7..8446a1ca82 100644
--- a/compiler/test/__snapshots__/basic_functionality.c55feb83.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c55feb83.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › comp14
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c8095f7c.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c8095f7c.0.snapshot
index 277d62a11a..35dfd430dd 100644
--- a/compiler/test/__snapshots__/basic_functionality.c8095f7c.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c8095f7c.0.snapshot
@@ -42,5 +42,5 @@ basic functionality › incr_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.c8144b17.0.snapshot b/compiler/test/__snapshots__/basic_functionality.c8144b17.0.snapshot
index 57059c498e..fdceacd95c 100644
--- a/compiler/test/__snapshots__/basic_functionality.c8144b17.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.c8144b17.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › bin
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.cb9c6c66.0.snapshot b/compiler/test/__snapshots__/basic_functionality.cb9c6c66.0.snapshot
index 7f14dfa25c..0c6a4249bb 100644
--- a/compiler/test/__snapshots__/basic_functionality.cb9c6c66.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.cb9c6c66.0.snapshot
@@ -42,5 +42,5 @@ basic functionality › incr_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.cdeddcd2.0.snapshot b/compiler/test/__snapshots__/basic_functionality.cdeddcd2.0.snapshot
index e8bd390860..bd5e3ee2f6 100644
--- a/compiler/test/__snapshots__/basic_functionality.cdeddcd2.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.cdeddcd2.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › modulo3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.cefeb364.0.snapshot b/compiler/test/__snapshots__/basic_functionality.cefeb364.0.snapshot
index 7b3d3fc825..46a2039c39 100644
--- a/compiler/test/__snapshots__/basic_functionality.cefeb364.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.cefeb364.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › lor4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d0c0c62b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d0c0c62b.0.snapshot
index 61540bb197..4df627fd26 100644
--- a/compiler/test/__snapshots__/basic_functionality.d0c0c62b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d0c0c62b.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › int64_pun_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d0cb4f44.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d0cb4f44.0.snapshot
index 638b4b8517..907cb6ea2c 100644
--- a/compiler/test/__snapshots__/basic_functionality.d0cb4f44.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d0cb4f44.0.snapshot
@@ -42,5 +42,5 @@ basic functionality › decr_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d124f931.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d124f931.0.snapshot
index 14be46c6ae..032be440d9 100644
--- a/compiler/test/__snapshots__/basic_functionality.d124f931.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d124f931.0.snapshot
@@ -31,5 +31,5 @@ basic functionality › nil
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d6ca4146.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d6ca4146.0.snapshot
index 1e55ddfd8d..41e3667f27 100644
--- a/compiler/test/__snapshots__/basic_functionality.d6ca4146.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d6ca4146.0.snapshot
@@ -84,5 +84,5 @@ basic functionality › andshort1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d8a7dcf9.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d8a7dcf9.0.snapshot
index 182a33bab4..071a69798b 100644
--- a/compiler/test/__snapshots__/basic_functionality.d8a7dcf9.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d8a7dcf9.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › modulo1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d8f6f027.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d8f6f027.0.snapshot
index ef84b1efa1..d7a97c55f4 100644
--- a/compiler/test/__snapshots__/basic_functionality.d8f6f027.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d8f6f027.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › hex_dec_exp1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.d9fc01df.0.snapshot b/compiler/test/__snapshots__/basic_functionality.d9fc01df.0.snapshot
index 1a040c11ae..a15bdbbe7a 100644
--- a/compiler/test/__snapshots__/basic_functionality.d9fc01df.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.d9fc01df.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › land3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.dbf5d3ff.0.snapshot b/compiler/test/__snapshots__/basic_functionality.dbf5d3ff.0.snapshot
index 44e2e24716..935e4d858a 100644
--- a/compiler/test/__snapshots__/basic_functionality.dbf5d3ff.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.dbf5d3ff.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › comp18
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.df4cd2bf.0.snapshot b/compiler/test/__snapshots__/basic_functionality.df4cd2bf.0.snapshot
index 5df58abf4e..a35d8162cc 100644
--- a/compiler/test/__snapshots__/basic_functionality.df4cd2bf.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.df4cd2bf.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › comp15
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.e2902464.0.snapshot b/compiler/test/__snapshots__/basic_functionality.e2902464.0.snapshot
index f04b31cceb..967fe61f2d 100644
--- a/compiler/test/__snapshots__/basic_functionality.e2902464.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.e2902464.0.snapshot
@@ -61,5 +61,5 @@ basic functionality › comp10
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.e3995c7d.0.snapshot b/compiler/test/__snapshots__/basic_functionality.e3995c7d.0.snapshot
index 6db414a5bb..3c5f193270 100644
--- a/compiler/test/__snapshots__/basic_functionality.e3995c7d.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.e3995c7d.0.snapshot
@@ -92,5 +92,5 @@ basic functionality › if_one_sided4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.e56cd2a2.0.snapshot b/compiler/test/__snapshots__/basic_functionality.e56cd2a2.0.snapshot
index 8b688adcbb..2e596f97f9 100644
--- a/compiler/test/__snapshots__/basic_functionality.e56cd2a2.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.e56cd2a2.0.snapshot
@@ -63,5 +63,5 @@ basic functionality › comp6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.e58c3266.0.snapshot b/compiler/test/__snapshots__/basic_functionality.e58c3266.0.snapshot
index b4c25f26c5..c5d698b87c 100644
--- a/compiler/test/__snapshots__/basic_functionality.e58c3266.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.e58c3266.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › asr2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.e6ea6b06.0.snapshot b/compiler/test/__snapshots__/basic_functionality.e6ea6b06.0.snapshot
index d3479fb5e7..54e8fca915 100644
--- a/compiler/test/__snapshots__/basic_functionality.e6ea6b06.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.e6ea6b06.0.snapshot
@@ -49,5 +49,5 @@ basic functionality › int32_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.e811c1e1.0.snapshot b/compiler/test/__snapshots__/basic_functionality.e811c1e1.0.snapshot
index 9e7b5e970b..92723cfb85 100644
--- a/compiler/test/__snapshots__/basic_functionality.e811c1e1.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.e811c1e1.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › binop2.1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.ee7c0ebc.0.snapshot b/compiler/test/__snapshots__/basic_functionality.ee7c0ebc.0.snapshot
index 53bd4d4547..5475bd1031 100644
--- a/compiler/test/__snapshots__/basic_functionality.ee7c0ebc.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.ee7c0ebc.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › modulo2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.f132ca8b.0.snapshot b/compiler/test/__snapshots__/basic_functionality.f132ca8b.0.snapshot
index 1f6d80a425..40b0c7922b 100644
--- a/compiler/test/__snapshots__/basic_functionality.f132ca8b.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.f132ca8b.0.snapshot
@@ -42,5 +42,5 @@ basic functionality › decr_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.f47797ca.0.snapshot b/compiler/test/__snapshots__/basic_functionality.f47797ca.0.snapshot
index 7cd390a94f..f4ce8713ed 100644
--- a/compiler/test/__snapshots__/basic_functionality.f47797ca.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.f47797ca.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › hex_dec_exp5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.f58be537.0.snapshot b/compiler/test/__snapshots__/basic_functionality.f58be537.0.snapshot
index a1899d62fa..0d283a38dd 100644
--- a/compiler/test/__snapshots__/basic_functionality.f58be537.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.f58be537.0.snapshot
@@ -306,5 +306,5 @@ basic functionality › comp19
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.f90a3baa.0.snapshot b/compiler/test/__snapshots__/basic_functionality.f90a3baa.0.snapshot
index be44fa6e99..16c4487ae8 100644
--- a/compiler/test/__snapshots__/basic_functionality.f90a3baa.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.f90a3baa.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › heap_number_i32_wrapper_max
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.f9743171.0.snapshot b/compiler/test/__snapshots__/basic_functionality.f9743171.0.snapshot
index 0428d67c56..e5af6f2030 100644
--- a/compiler/test/__snapshots__/basic_functionality.f9743171.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.f9743171.0.snapshot
@@ -53,5 +53,5 @@ basic functionality › heap_number_i32_wrapper
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.fd64a58f.0.snapshot b/compiler/test/__snapshots__/basic_functionality.fd64a58f.0.snapshot
index c46a70958d..947273f86b 100644
--- a/compiler/test/__snapshots__/basic_functionality.fd64a58f.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.fd64a58f.0.snapshot
@@ -44,5 +44,5 @@ basic functionality › int64_pun_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.fe19cffe.0.snapshot b/compiler/test/__snapshots__/basic_functionality.fe19cffe.0.snapshot
index b4a64240a5..84e0ed0270 100644
--- a/compiler/test/__snapshots__/basic_functionality.fe19cffe.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.fe19cffe.0.snapshot
@@ -65,5 +65,5 @@ basic functionality › bigint_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/basic_functionality.fe88cb04.0.snapshot b/compiler/test/__snapshots__/basic_functionality.fe88cb04.0.snapshot
index d46b2e621c..dfeb70294d 100644
--- a/compiler/test/__snapshots__/basic_functionality.fe88cb04.0.snapshot
+++ b/compiler/test/__snapshots__/basic_functionality.fe88cb04.0.snapshot
@@ -439,5 +439,5 @@ basic functionality › func_shadow_and_indirect_call
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 340
+ ;; custom section \"cmi\", size 385
 )
diff --git a/compiler/test/__snapshots__/boxes.08fca3f7.0.snapshot b/compiler/test/__snapshots__/boxes.08fca3f7.0.snapshot
index d754cadc47..28c3e5a3ae 100644
--- a/compiler/test/__snapshots__/boxes.08fca3f7.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.08fca3f7.0.snapshot
@@ -112,5 +112,5 @@ boxes › box_subtraction1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.0c59fc4e.0.snapshot b/compiler/test/__snapshots__/boxes.0c59fc4e.0.snapshot
index 9fc9b2a382..0fe2e435bf 100644
--- a/compiler/test/__snapshots__/boxes.0c59fc4e.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.0c59fc4e.0.snapshot
@@ -125,5 +125,5 @@ boxes › box_multiplication2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.17668725.0.snapshot b/compiler/test/__snapshots__/boxes.17668725.0.snapshot
index 221bb0889a..4734e61afc 100644
--- a/compiler/test/__snapshots__/boxes.17668725.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.17668725.0.snapshot
@@ -125,5 +125,5 @@ boxes › box_division2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.2b56febf.0.snapshot b/compiler/test/__snapshots__/boxes.2b56febf.0.snapshot
index a2b4ce71ea..f4831e6f97 100644
--- a/compiler/test/__snapshots__/boxes.2b56febf.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.2b56febf.0.snapshot
@@ -125,5 +125,5 @@ boxes › box_addition2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.7d564476.0.snapshot b/compiler/test/__snapshots__/boxes.7d564476.0.snapshot
index 4d1e9c637c..957fc0520a 100644
--- a/compiler/test/__snapshots__/boxes.7d564476.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.7d564476.0.snapshot
@@ -112,5 +112,5 @@ boxes › box_division1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.9035923e.0.snapshot b/compiler/test/__snapshots__/boxes.9035923e.0.snapshot
index ace9852bd8..f30ca37562 100644
--- a/compiler/test/__snapshots__/boxes.9035923e.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.9035923e.0.snapshot
@@ -125,5 +125,5 @@ boxes › box_subtraction2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.adbe1660.0.snapshot b/compiler/test/__snapshots__/boxes.adbe1660.0.snapshot
index d040c2b9d9..1f6ee78a0d 100644
--- a/compiler/test/__snapshots__/boxes.adbe1660.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.adbe1660.0.snapshot
@@ -112,5 +112,5 @@ boxes › box_addition1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.bc258c1b.0.snapshot b/compiler/test/__snapshots__/boxes.bc258c1b.0.snapshot
index 44a842cce5..21ab39f1b4 100644
--- a/compiler/test/__snapshots__/boxes.bc258c1b.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.bc258c1b.0.snapshot
@@ -112,5 +112,5 @@ boxes › box_multiplication1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/boxes.eb81e542.0.snapshot b/compiler/test/__snapshots__/boxes.eb81e542.0.snapshot
index 8603dd4478..6bf1af481a 100644
--- a/compiler/test/__snapshots__/boxes.eb81e542.0.snapshot
+++ b/compiler/test/__snapshots__/boxes.eb81e542.0.snapshot
@@ -92,5 +92,5 @@ boxes › test_set_extra1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.200d9e1a.0.snapshot b/compiler/test/__snapshots__/chars.200d9e1a.0.snapshot
index b16d320c83..eacb069aee 100644
--- a/compiler/test/__snapshots__/chars.200d9e1a.0.snapshot
+++ b/compiler/test/__snapshots__/chars.200d9e1a.0.snapshot
@@ -31,5 +31,5 @@ chars › char4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.259e330c.0.snapshot b/compiler/test/__snapshots__/chars.259e330c.0.snapshot
index d998a866c2..e670892db7 100644
--- a/compiler/test/__snapshots__/chars.259e330c.0.snapshot
+++ b/compiler/test/__snapshots__/chars.259e330c.0.snapshot
@@ -31,5 +31,5 @@ chars › char2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.27fb7f30.0.snapshot b/compiler/test/__snapshots__/chars.27fb7f30.0.snapshot
index 9c85163cd2..4c88bebb84 100644
--- a/compiler/test/__snapshots__/chars.27fb7f30.0.snapshot
+++ b/compiler/test/__snapshots__/chars.27fb7f30.0.snapshot
@@ -31,5 +31,5 @@ chars › char8
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.51010573.0.snapshot b/compiler/test/__snapshots__/chars.51010573.0.snapshot
index 803c35800e..e0d2df47ca 100644
--- a/compiler/test/__snapshots__/chars.51010573.0.snapshot
+++ b/compiler/test/__snapshots__/chars.51010573.0.snapshot
@@ -31,5 +31,5 @@ chars › char7
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.7e0f68db.0.snapshot b/compiler/test/__snapshots__/chars.7e0f68db.0.snapshot
index 58355b2dd5..eedcc32939 100644
--- a/compiler/test/__snapshots__/chars.7e0f68db.0.snapshot
+++ b/compiler/test/__snapshots__/chars.7e0f68db.0.snapshot
@@ -31,5 +31,5 @@ chars › char6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.af4b3613.0.snapshot b/compiler/test/__snapshots__/chars.af4b3613.0.snapshot
index 88ccb324a8..fa01c9a34a 100644
--- a/compiler/test/__snapshots__/chars.af4b3613.0.snapshot
+++ b/compiler/test/__snapshots__/chars.af4b3613.0.snapshot
@@ -31,5 +31,5 @@ chars › char5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/chars.e1cac8cd.0.snapshot b/compiler/test/__snapshots__/chars.e1cac8cd.0.snapshot
index 03ca54b8ad..67af1fbcaf 100644
--- a/compiler/test/__snapshots__/chars.e1cac8cd.0.snapshot
+++ b/compiler/test/__snapshots__/chars.e1cac8cd.0.snapshot
@@ -31,5 +31,5 @@ chars › char3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/comments.573e549e.0.snapshot b/compiler/test/__snapshots__/comments.573e549e.0.snapshot
index 9e74563f8c..7fcc08f0b4 100644
--- a/compiler/test/__snapshots__/comments.573e549e.0.snapshot
+++ b/compiler/test/__snapshots__/comments.573e549e.0.snapshot
@@ -31,5 +31,5 @@ comments › comment_alone
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/comments.8f52e899.0.snapshot b/compiler/test/__snapshots__/comments.8f52e899.0.snapshot
index 7e4cf57eca..5a4e6e383c 100644
--- a/compiler/test/__snapshots__/comments.8f52e899.0.snapshot
+++ b/compiler/test/__snapshots__/comments.8f52e899.0.snapshot
@@ -31,5 +31,5 @@ comments › comment_block
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/comments.ccf5fcf4.0.snapshot b/compiler/test/__snapshots__/comments.ccf5fcf4.0.snapshot
index 862e97a0dd..6cb5e597d4 100644
--- a/compiler/test/__snapshots__/comments.ccf5fcf4.0.snapshot
+++ b/compiler/test/__snapshots__/comments.ccf5fcf4.0.snapshot
@@ -31,5 +31,5 @@ comments › comment_shebang
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/comments.fd91c233.0.snapshot b/compiler/test/__snapshots__/comments.fd91c233.0.snapshot
index 6eb5133222..832ff9cad7 100644
--- a/compiler/test/__snapshots__/comments.fd91c233.0.snapshot
+++ b/compiler/test/__snapshots__/comments.fd91c233.0.snapshot
@@ -31,5 +31,5 @@ comments › comment_doc
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/early_return.1183a893.0.snapshot b/compiler/test/__snapshots__/early_return.1183a893.0.snapshot
index c5ea48c197..44bf4e8ece 100644
--- a/compiler/test/__snapshots__/early_return.1183a893.0.snapshot
+++ b/compiler/test/__snapshots__/early_return.1183a893.0.snapshot
@@ -13,10 +13,10 @@ early return › early_return3
  (import \"_genv\" \"metadataPtr\" (global $metadataPtr_0 i32))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$incRef\" (global $GRAIN$EXPORT$incRef_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$decRef\" (global $GRAIN$EXPORT$decRef_0 (mut i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$==\" (global $==_1118 (mut i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$==\" (global $==_1116 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"incRef\" (func $incRef_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"decRef\" (func $decRef_0 (param i32 i32) (result i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"==\" (func $==_1118 (param i32 i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"==\" (func $==_1116 (param i32 i32 i32) (result i32)))
  (global $foo_1113 (mut i32) (i32.const 0))
  (global $GRAIN$TABLE_SIZE i32 (i32.const 0))
  (memory $0 0)
@@ -38,10 +38,10 @@ early return › early_return3
   (block $compile_block.7
    (block $compile_store.2
     (local.set $7
-     (call $==_1118
+     (call $==_1116
       (call $incRef_0
        (global.get $GRAIN$EXPORT$incRef_0)
-       (global.get $==_1118)
+       (global.get $==_1116)
       )
       (i32.const 3)
       (i32.const 1)
@@ -110,5 +110,5 @@ early return › early_return3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 955
+ ;; custom section \"cmi\", size 1000
 )
diff --git a/compiler/test/__snapshots__/enums.aa34084a.0.snapshot b/compiler/test/__snapshots__/enums.aa34084a.0.snapshot
index 5d35ff4fb6..b75fc2c0f9 100644
--- a/compiler/test/__snapshots__/enums.aa34084a.0.snapshot
+++ b/compiler/test/__snapshots__/enums.aa34084a.0.snapshot
@@ -61,5 +61,5 @@ enums › adt_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 607
+ ;; custom section \"cmi\", size 652
 )
diff --git a/compiler/test/__snapshots__/enums.ae26523b.0.snapshot b/compiler/test/__snapshots__/enums.ae26523b.0.snapshot
index cc747e3e51..fc73935194 100644
--- a/compiler/test/__snapshots__/enums.ae26523b.0.snapshot
+++ b/compiler/test/__snapshots__/enums.ae26523b.0.snapshot
@@ -412,5 +412,5 @@ enums › enum_recursive_data_definition
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 885
+ ;; custom section \"cmi\", size 930
 )
diff --git a/compiler/test/__snapshots__/exceptions.a68ae348.0.snapshot b/compiler/test/__snapshots__/exceptions.a68ae348.0.snapshot
index 1694a4f58a..1a9cefb890 100644
--- a/compiler/test/__snapshots__/exceptions.a68ae348.0.snapshot
+++ b/compiler/test/__snapshots__/exceptions.a68ae348.0.snapshot
@@ -61,5 +61,5 @@ exceptions › exception_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1619
+ ;; custom section \"cmi\", size 1760
 )
diff --git a/compiler/test/__snapshots__/exceptions.ccac3e71.0.snapshot b/compiler/test/__snapshots__/exceptions.ccac3e71.0.snapshot
index 3e85a997ed..d62326d06a 100644
--- a/compiler/test/__snapshots__/exceptions.ccac3e71.0.snapshot
+++ b/compiler/test/__snapshots__/exceptions.ccac3e71.0.snapshot
@@ -61,5 +61,5 @@ exceptions › exception_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 847
+ ;; custom section \"cmi\", size 892
 )
diff --git a/compiler/test/__snapshots__/functions.06134c8a.0.snapshot b/compiler/test/__snapshots__/functions.06134c8a.0.snapshot
index 0135b7d043..5c6a9cf856 100644
--- a/compiler/test/__snapshots__/functions.06134c8a.0.snapshot
+++ b/compiler/test/__snapshots__/functions.06134c8a.0.snapshot
@@ -74,5 +74,5 @@ functions › dup_func
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.0b8146ea.0.snapshot b/compiler/test/__snapshots__/functions.0b8146ea.0.snapshot
index a8d057860b..0b5bf9f59d 100644
--- a/compiler/test/__snapshots__/functions.0b8146ea.0.snapshot
+++ b/compiler/test/__snapshots__/functions.0b8146ea.0.snapshot
@@ -81,5 +81,5 @@ functions › regression_1725
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.14922a92.0.snapshot b/compiler/test/__snapshots__/functions.14922a92.0.snapshot
index 55b2b435f1..4e5fe1589d 100644
--- a/compiler/test/__snapshots__/functions.14922a92.0.snapshot
+++ b/compiler/test/__snapshots__/functions.14922a92.0.snapshot
@@ -79,5 +79,5 @@ functions › shorthand_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.1be5ecd5.0.snapshot b/compiler/test/__snapshots__/functions.1be5ecd5.0.snapshot
index 39d2a699b2..5e47989221 100644
--- a/compiler/test/__snapshots__/functions.1be5ecd5.0.snapshot
+++ b/compiler/test/__snapshots__/functions.1be5ecd5.0.snapshot
@@ -74,5 +74,5 @@ functions › shorthand_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.23afd9c9.0.snapshot b/compiler/test/__snapshots__/functions.23afd9c9.0.snapshot
index 8886807841..b1308be3c5 100644
--- a/compiler/test/__snapshots__/functions.23afd9c9.0.snapshot
+++ b/compiler/test/__snapshots__/functions.23afd9c9.0.snapshot
@@ -406,5 +406,5 @@ functions › lam_destructure_5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.28e0f2b3.0.snapshot b/compiler/test/__snapshots__/functions.28e0f2b3.0.snapshot
index 23082a750c..6a6bcd7116 100644
--- a/compiler/test/__snapshots__/functions.28e0f2b3.0.snapshot
+++ b/compiler/test/__snapshots__/functions.28e0f2b3.0.snapshot
@@ -109,5 +109,5 @@ functions › lambda_pat_any
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.49ccab54.0.snapshot b/compiler/test/__snapshots__/functions.49ccab54.0.snapshot
index 71ffa618a9..2683530eff 100644
--- a/compiler/test/__snapshots__/functions.49ccab54.0.snapshot
+++ b/compiler/test/__snapshots__/functions.49ccab54.0.snapshot
@@ -165,5 +165,5 @@ functions › curried_func
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.6eacded0.0.snapshot b/compiler/test/__snapshots__/functions.6eacded0.0.snapshot
index e50d38347c..ad915f5820 100644
--- a/compiler/test/__snapshots__/functions.6eacded0.0.snapshot
+++ b/compiler/test/__snapshots__/functions.6eacded0.0.snapshot
@@ -14,20 +14,20 @@ functions › func_recursive_closure
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$malloc\" (global $GRAIN$EXPORT$malloc_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$incRef\" (global $GRAIN$EXPORT$incRef_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$decRef\" (global $GRAIN$EXPORT$decRef_0 (mut i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$-\" (global $-_1139 (mut i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$==\" (global $==_1134 (mut i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$+\" (global $+_1124 (mut i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$-\" (global $-_1137 (mut i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$==\" (global $==_1132 (mut i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$+\" (global $+_1122 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"malloc\" (func $malloc_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"incRef\" (func $incRef_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"decRef\" (func $decRef_0 (param i32 i32) (result i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"-\" (func $-_1139 (param i32 i32 i32) (result i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"==\" (func $==_1134 (param i32 i32 i32) (result i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"+\" (func $+_1124 (param i32 i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"-\" (func $-_1137 (param i32 i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"==\" (func $==_1132 (param i32 i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"+\" (func $+_1122 (param i32 i32 i32) (result i32)))
  (global $truc_1116 (mut i32) (i32.const 0))
  (global $makeAdder_1113 (mut i32) (i32.const 0))
  (global $GRAIN$TABLE_SIZE i32 (i32.const 1))
  (memory $0 0)
- (elem $elem (global.get $relocBase_0) $func_1147)
+ (elem $elem (global.get $relocBase_0) $func_1145)
  (export \"memory\" (memory $0))
  (export \"truc\" (func $truc_1116))
  (export \"GRAIN$EXPORT$truc\" (global $truc_1116))
@@ -118,7 +118,7 @@ functions › func_recursive_closure
    )
   )
  )
- (func $func_1147 (param $0 i32) (param $1 i32) (result i32)
+ (func $func_1145 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -144,10 +144,10 @@ functions › func_recursive_closure
       )
      )
     )
-    (return_call $+_1124
+    (return_call $+_1122
      (call $incRef_0
       (global.get $GRAIN$EXPORT$incRef_0)
-      (global.get $+_1124)
+      (global.get $+_1122)
      )
      (local.get $1)
      (local.get $2)
@@ -227,10 +227,10 @@ functions › func_recursive_closure
    )
    (block $compile_store.19
     (local.set $11
-     (call $==_1134
+     (call $==_1132
       (call $incRef_0
        (global.get $GRAIN$EXPORT$incRef_0)
-       (global.get $==_1134)
+       (global.get $==_1132)
       )
       (call $incRef_0
        (global.get $GRAIN$EXPORT$incRef_0)
@@ -255,10 +255,10 @@ functions › func_recursive_closure
       (block $compile_block.30
        (block $compile_store.23
         (local.set $12
-         (call $==_1134
+         (call $==_1132
           (call $incRef_0
            (global.get $GRAIN$EXPORT$incRef_0)
-           (global.get $==_1134)
+           (global.get $==_1132)
           )
           (call $incRef_0
            (global.get $GRAIN$EXPORT$incRef_0)
@@ -298,10 +298,10 @@ functions › func_recursive_closure
         (block $compile_block.29
          (block $compile_store.27
           (local.set $10
-           (call $-_1139
+           (call $-_1137
             (call $incRef_0
              (global.get $GRAIN$EXPORT$incRef_0)
-             (global.get $-_1139)
+             (global.get $-_1137)
             )
             (call $incRef_0
              (global.get $GRAIN$EXPORT$incRef_0)
@@ -431,10 +431,10 @@ functions › func_recursive_closure
       )
      )
     )
-    (return_call $+_1124
+    (return_call $+_1122
      (call $incRef_0
       (global.get $GRAIN$EXPORT$incRef_0)
-      (global.get $+_1124)
+      (global.get $+_1122)
      )
      (local.get $10)
      (local.get $11)
@@ -477,5 +477,5 @@ functions › func_recursive_closure
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 980
+ ;; custom section \"cmi\", size 1025
 )
diff --git a/compiler/test/__snapshots__/functions.7a8986a5.0.snapshot b/compiler/test/__snapshots__/functions.7a8986a5.0.snapshot
index 0912cdb01d..c1720ca673 100644
--- a/compiler/test/__snapshots__/functions.7a8986a5.0.snapshot
+++ b/compiler/test/__snapshots__/functions.7a8986a5.0.snapshot
@@ -69,5 +69,5 @@ functions › app_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.84b6e84b.0.snapshot b/compiler/test/__snapshots__/functions.84b6e84b.0.snapshot
index 70db623307..3a79d9bc68 100644
--- a/compiler/test/__snapshots__/functions.84b6e84b.0.snapshot
+++ b/compiler/test/__snapshots__/functions.84b6e84b.0.snapshot
@@ -74,5 +74,5 @@ functions › shorthand_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.8baf471f.0.snapshot b/compiler/test/__snapshots__/functions.8baf471f.0.snapshot
index 7cdc59f8be..92c03b5086 100644
--- a/compiler/test/__snapshots__/functions.8baf471f.0.snapshot
+++ b/compiler/test/__snapshots__/functions.8baf471f.0.snapshot
@@ -256,5 +256,5 @@ functions › lam_destructure_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.9223245d.0.snapshot b/compiler/test/__snapshots__/functions.9223245d.0.snapshot
index 740f76f462..e5c7a08c5f 100644
--- a/compiler/test/__snapshots__/functions.9223245d.0.snapshot
+++ b/compiler/test/__snapshots__/functions.9223245d.0.snapshot
@@ -363,5 +363,5 @@ functions › lam_destructure_7
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.9fd69835.0.snapshot b/compiler/test/__snapshots__/functions.9fd69835.0.snapshot
index 2236ec3b19..4776b97204 100644
--- a/compiler/test/__snapshots__/functions.9fd69835.0.snapshot
+++ b/compiler/test/__snapshots__/functions.9fd69835.0.snapshot
@@ -79,5 +79,5 @@ functions › shorthand_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.b37949b2.0.snapshot b/compiler/test/__snapshots__/functions.b37949b2.0.snapshot
index 92f04475fb..f9da9683a2 100644
--- a/compiler/test/__snapshots__/functions.b37949b2.0.snapshot
+++ b/compiler/test/__snapshots__/functions.b37949b2.0.snapshot
@@ -259,5 +259,5 @@ functions › lam_destructure_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.b3a8d88b.0.snapshot b/compiler/test/__snapshots__/functions.b3a8d88b.0.snapshot
index f16b6f0e3e..f53e729a68 100644
--- a/compiler/test/__snapshots__/functions.b3a8d88b.0.snapshot
+++ b/compiler/test/__snapshots__/functions.b3a8d88b.0.snapshot
@@ -366,5 +366,5 @@ functions › lam_destructure_8
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.b632a2ab.0.snapshot b/compiler/test/__snapshots__/functions.b632a2ab.0.snapshot
index d1591ded01..b1e84ed43a 100644
--- a/compiler/test/__snapshots__/functions.b632a2ab.0.snapshot
+++ b/compiler/test/__snapshots__/functions.b632a2ab.0.snapshot
@@ -104,5 +104,5 @@ functions › lam_destructure_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.c6e8a9aa.0.snapshot b/compiler/test/__snapshots__/functions.c6e8a9aa.0.snapshot
index 20503e9b94..ce918b7148 100644
--- a/compiler/test/__snapshots__/functions.c6e8a9aa.0.snapshot
+++ b/compiler/test/__snapshots__/functions.c6e8a9aa.0.snapshot
@@ -109,5 +109,5 @@ functions › lam_destructure_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.ce978f54.0.snapshot b/compiler/test/__snapshots__/functions.ce978f54.0.snapshot
index 2ee17b28c0..66f683d7f8 100644
--- a/compiler/test/__snapshots__/functions.ce978f54.0.snapshot
+++ b/compiler/test/__snapshots__/functions.ce978f54.0.snapshot
@@ -31,5 +31,5 @@ functions › multi_bind2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.d9466880.0.snapshot b/compiler/test/__snapshots__/functions.d9466880.0.snapshot
index 17d1dcaaa5..8a6c3d20c9 100644
--- a/compiler/test/__snapshots__/functions.d9466880.0.snapshot
+++ b/compiler/test/__snapshots__/functions.d9466880.0.snapshot
@@ -235,5 +235,5 @@ functions › func_record_associativity2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 581
+ ;; custom section \"cmi\", size 626
 )
diff --git a/compiler/test/__snapshots__/functions.e6c6212b.0.snapshot b/compiler/test/__snapshots__/functions.e6c6212b.0.snapshot
index 2b8e0457ad..99de1e8a5a 100644
--- a/compiler/test/__snapshots__/functions.e6c6212b.0.snapshot
+++ b/compiler/test/__snapshots__/functions.e6c6212b.0.snapshot
@@ -80,5 +80,5 @@ functions › fn_trailing_comma
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.f400bb7b.0.snapshot b/compiler/test/__snapshots__/functions.f400bb7b.0.snapshot
index 5e2de79a17..5ae53c6b0c 100644
--- a/compiler/test/__snapshots__/functions.f400bb7b.0.snapshot
+++ b/compiler/test/__snapshots__/functions.f400bb7b.0.snapshot
@@ -409,5 +409,5 @@ functions › lam_destructure_6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/functions.f647681b.0.snapshot b/compiler/test/__snapshots__/functions.f647681b.0.snapshot
index 186b0ff72a..ef38b07655 100644
--- a/compiler/test/__snapshots__/functions.f647681b.0.snapshot
+++ b/compiler/test/__snapshots__/functions.f647681b.0.snapshot
@@ -179,5 +179,5 @@ functions › func_record_associativity1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 451
+ ;; custom section \"cmi\", size 496
 )
diff --git a/compiler/test/__snapshots__/includes.1d829099.0.snapshot b/compiler/test/__snapshots__/includes.1d829099.0.snapshot
index 49b3b2fe39..4731179f70 100644
--- a/compiler/test/__snapshots__/includes.1d829099.0.snapshot
+++ b/compiler/test/__snapshots__/includes.1d829099.0.snapshot
@@ -32,5 +32,5 @@ includes › include_relative_path2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 408
+ ;; custom section \"cmi\", size 453
 )
diff --git a/compiler/test/__snapshots__/includes.46f78654.0.snapshot b/compiler/test/__snapshots__/includes.46f78654.0.snapshot
index 89d5eb15c8..cfa601d016 100644
--- a/compiler/test/__snapshots__/includes.46f78654.0.snapshot
+++ b/compiler/test/__snapshots__/includes.46f78654.0.snapshot
@@ -46,5 +46,5 @@ includes › include_some_multiple
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.5dfba7dd.0.snapshot b/compiler/test/__snapshots__/includes.5dfba7dd.0.snapshot
index c2f97e33fb..11a9fba19d 100644
--- a/compiler/test/__snapshots__/includes.5dfba7dd.0.snapshot
+++ b/compiler/test/__snapshots__/includes.5dfba7dd.0.snapshot
@@ -32,5 +32,5 @@ includes › include_alias
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.6c8d23dc.0.snapshot b/compiler/test/__snapshots__/includes.6c8d23dc.0.snapshot
index c2b282c9b3..eac4043ae3 100644
--- a/compiler/test/__snapshots__/includes.6c8d23dc.0.snapshot
+++ b/compiler/test/__snapshots__/includes.6c8d23dc.0.snapshot
@@ -46,5 +46,5 @@ includes › include_some_multiple_trailing2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.6e78c003.0.snapshot b/compiler/test/__snapshots__/includes.6e78c003.0.snapshot
index 3768b98f09..409acc60d0 100644
--- a/compiler/test/__snapshots__/includes.6e78c003.0.snapshot
+++ b/compiler/test/__snapshots__/includes.6e78c003.0.snapshot
@@ -46,5 +46,5 @@ includes › include_some_multiple_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.7afbe731.0.snapshot b/compiler/test/__snapshots__/includes.7afbe731.0.snapshot
index 068198b28b..8a13625134 100644
--- a/compiler/test/__snapshots__/includes.7afbe731.0.snapshot
+++ b/compiler/test/__snapshots__/includes.7afbe731.0.snapshot
@@ -32,5 +32,5 @@ includes › include_some
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.8222ee98.0.snapshot b/compiler/test/__snapshots__/includes.8222ee98.0.snapshot
index f19ddedd69..7027f8dcdc 100644
--- a/compiler/test/__snapshots__/includes.8222ee98.0.snapshot
+++ b/compiler/test/__snapshots__/includes.8222ee98.0.snapshot
@@ -32,5 +32,5 @@ includes › include_module
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.86ff4075.0.snapshot b/compiler/test/__snapshots__/includes.86ff4075.0.snapshot
index 97b7edd5e5..5fd1034367 100644
--- a/compiler/test/__snapshots__/includes.86ff4075.0.snapshot
+++ b/compiler/test/__snapshots__/includes.86ff4075.0.snapshot
@@ -46,5 +46,5 @@ includes › include_alias_multiple
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/includes.a3212bd0.0.snapshot b/compiler/test/__snapshots__/includes.a3212bd0.0.snapshot
index 3bb1247e7a..45a9450f9e 100644
--- a/compiler/test/__snapshots__/includes.a3212bd0.0.snapshot
+++ b/compiler/test/__snapshots__/includes.a3212bd0.0.snapshot
@@ -32,5 +32,5 @@ includes › include_relative_path3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 390
+ ;; custom section \"cmi\", size 435
 )
diff --git a/compiler/test/__snapshots__/includes.b3434679.0.snapshot b/compiler/test/__snapshots__/includes.b3434679.0.snapshot
index aebdfb692f..981458dbf2 100644
--- a/compiler/test/__snapshots__/includes.b3434679.0.snapshot
+++ b/compiler/test/__snapshots__/includes.b3434679.0.snapshot
@@ -45,7 +45,7 @@ includes › include_some_constructor
       )
       (i32.store offset=8
        (local.get $0)
-       (i32.const 2227)
+       (i32.const 2243)
       )
       (i32.store offset=12
        (local.get $0)
@@ -77,7 +77,7 @@ includes › include_some_constructor
     )
     (i32.store offset=8
      (local.get $0)
-     (i32.const 2227)
+     (i32.const 2243)
     )
     (i32.store offset=12
      (local.get $0)
@@ -104,5 +104,5 @@ includes › include_some_constructor
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 372
+ ;; custom section \"cmi\", size 417
 )
diff --git a/compiler/test/__snapshots__/includes.bd3eb3af.0.snapshot b/compiler/test/__snapshots__/includes.bd3eb3af.0.snapshot
index 459dfc9244..c46804bb9a 100644
--- a/compiler/test/__snapshots__/includes.bd3eb3af.0.snapshot
+++ b/compiler/test/__snapshots__/includes.bd3eb3af.0.snapshot
@@ -11,10 +11,10 @@ includes › include_some_mixed
  (import \"_genv\" \"metadataPtr\" (global $metadataPtr_0 i32))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$malloc\" (global $GRAIN$EXPORT$malloc_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$incRef\" (global $GRAIN$EXPORT$incRef_0 (mut i32)))
- (import \"GRAIN$MODULE$tlists.gr\" \"GRAIN$EXPORT$sum\" (global $sum_1120 (mut i32)))
+ (import \"GRAIN$MODULE$tlists.gr\" \"GRAIN$EXPORT$sum\" (global $sum_1126 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"malloc\" (func $malloc_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"incRef\" (func $incRef_0 (param i32 i32) (result i32)))
- (import \"GRAIN$MODULE$tlists.gr\" \"sum\" (func $sum_1120 (param i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$tlists.gr\" \"sum\" (func $sum_1126 (param i32 i32) (result i32)))
  (global $GRAIN$TABLE_SIZE i32 (i32.const 0))
  (memory $0 0)
  (elem $elem (global.get $relocBase_0))
@@ -50,7 +50,7 @@ includes › include_some_mixed
       )
       (i32.store offset=8
        (local.get $0)
-       (i32.const 2227)
+       (i32.const 2243)
       )
       (i32.store offset=12
        (local.get $0)
@@ -84,7 +84,7 @@ includes › include_some_mixed
       )
       (i32.store offset=8
        (local.get $0)
-       (i32.const 2227)
+       (i32.const 2243)
       )
       (i32.store offset=12
        (local.get $0)
@@ -108,10 +108,10 @@ includes › include_some_mixed
     (block $do_backpatches.5
     )
    )
-   (return_call $sum_1120
+   (return_call $sum_1126
     (call $incRef_0
      (global.get $GRAIN$EXPORT$incRef_0)
-     (global.get $sum_1120)
+     (global.get $sum_1126)
     )
     (local.get $7)
    )
@@ -122,5 +122,5 @@ includes › include_some_mixed
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 372
+ ;; custom section \"cmi\", size 417
 )
diff --git a/compiler/test/__snapshots__/includes.beda767e.0.snapshot b/compiler/test/__snapshots__/includes.beda767e.0.snapshot
index 27afcb9d78..f7c605b7fa 100644
--- a/compiler/test/__snapshots__/includes.beda767e.0.snapshot
+++ b/compiler/test/__snapshots__/includes.beda767e.0.snapshot
@@ -32,5 +32,5 @@ includes › include_relative_path1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 401
+ ;; custom section \"cmi\", size 446
 )
diff --git a/compiler/test/__snapshots__/includes.c0c0d5ca.0.snapshot b/compiler/test/__snapshots__/includes.c0c0d5ca.0.snapshot
index 4d9fcf1186..92f4e5f892 100644
--- a/compiler/test/__snapshots__/includes.c0c0d5ca.0.snapshot
+++ b/compiler/test/__snapshots__/includes.c0c0d5ca.0.snapshot
@@ -97,5 +97,5 @@ includes › include_relative_path4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 374
+ ;; custom section \"cmi\", size 419
 )
diff --git a/compiler/test/__snapshots__/includes.c62f45f8.0.snapshot b/compiler/test/__snapshots__/includes.c62f45f8.0.snapshot
index ae318ebb8b..1c43486098 100644
--- a/compiler/test/__snapshots__/includes.c62f45f8.0.snapshot
+++ b/compiler/test/__snapshots__/includes.c62f45f8.0.snapshot
@@ -11,7 +11,7 @@ includes › include_muliple_modules
  (import \"_genv\" \"metadataPtr\" (global $metadataPtr_0 i32))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$malloc\" (global $GRAIN$EXPORT$malloc_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$incRef\" (global $GRAIN$EXPORT$incRef_0 (mut i32)))
- (import \"GRAIN$MODULE$provideAll.gr\" \"GRAIN$EXPORT$x\" (global $x_1130 (mut i32)))
+ (import \"GRAIN$MODULE$provideAll.gr\" \"GRAIN$EXPORT$x\" (global $x_1136 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"malloc\" (func $malloc_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"incRef\" (func $incRef_0 (param i32 i32) (result i32)))
  (global $GRAIN$TABLE_SIZE i32 (i32.const 0))
@@ -48,7 +48,7 @@ includes › include_muliple_modules
       )
       (i32.store offset=8
        (local.get $0)
-       (i32.const 2227)
+       (i32.const 2243)
       )
       (i32.store offset=12
        (local.get $0)
@@ -80,7 +80,7 @@ includes › include_muliple_modules
     )
     (i32.store offset=8
      (local.get $0)
-     (i32.const 2227)
+     (i32.const 2243)
     )
     (i32.store offset=12
      (local.get $0)
@@ -94,7 +94,7 @@ includes › include_muliple_modules
      (local.get $0)
      (call $incRef_0
       (global.get $GRAIN$EXPORT$incRef_0)
-      (global.get $x_1130)
+      (global.get $x_1136)
      )
     )
     (i32.store offset=24
@@ -110,5 +110,5 @@ includes › include_muliple_modules
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 425
+ ;; custom section \"cmi\", size 470
 )
diff --git a/compiler/test/__snapshots__/includes.cedde8e9.0.snapshot b/compiler/test/__snapshots__/includes.cedde8e9.0.snapshot
index 3e180c4b0d..706b117ef8 100644
--- a/compiler/test/__snapshots__/includes.cedde8e9.0.snapshot
+++ b/compiler/test/__snapshots__/includes.cedde8e9.0.snapshot
@@ -45,7 +45,7 @@ includes › include_same_module_unify
       )
       (i32.store offset=8
        (local.get $0)
-       (i32.const 2227)
+       (i32.const 2243)
       )
       (i32.store offset=12
        (local.get $0)
@@ -77,7 +77,7 @@ includes › include_same_module_unify
     )
     (i32.store offset=8
      (local.get $0)
-     (i32.const 2227)
+     (i32.const 2243)
     )
     (i32.store offset=12
      (local.get $0)
@@ -104,5 +104,5 @@ includes › include_same_module_unify
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 372
+ ;; custom section \"cmi\", size 417
 )
diff --git a/compiler/test/__snapshots__/includes.de6b420f.0.snapshot b/compiler/test/__snapshots__/includes.de6b420f.0.snapshot
index e05f891eae..37b3b08a0b 100644
--- a/compiler/test/__snapshots__/includes.de6b420f.0.snapshot
+++ b/compiler/test/__snapshots__/includes.de6b420f.0.snapshot
@@ -42,7 +42,7 @@ includes › annotation_across_import
     )
     (i32.store offset=8
      (local.get $0)
-     (i32.const 2227)
+     (i32.const 2243)
     )
     (i32.store offset=12
      (local.get $0)
@@ -61,5 +61,5 @@ includes › annotation_across_import
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 372
+ ;; custom section \"cmi\", size 417
 )
diff --git a/compiler/test/__snapshots__/includes.f2bf866b.0.snapshot b/compiler/test/__snapshots__/includes.f2bf866b.0.snapshot
index 19cafeebf4..d10c38b449 100644
--- a/compiler/test/__snapshots__/includes.f2bf866b.0.snapshot
+++ b/compiler/test/__snapshots__/includes.f2bf866b.0.snapshot
@@ -45,7 +45,7 @@ includes › include_all_constructor
       )
       (i32.store offset=8
        (local.get $0)
-       (i32.const 2227)
+       (i32.const 2243)
       )
       (i32.store offset=12
        (local.get $0)
@@ -77,7 +77,7 @@ includes › include_all_constructor
     )
     (i32.store offset=8
      (local.get $0)
-     (i32.const 2227)
+     (i32.const 2243)
     )
     (i32.store offset=12
      (local.get $0)
@@ -104,5 +104,5 @@ includes › include_all_constructor
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 372
+ ;; custom section \"cmi\", size 417
 )
diff --git a/compiler/test/__snapshots__/includes.f4ba5583.0.snapshot b/compiler/test/__snapshots__/includes.f4ba5583.0.snapshot
index d7789bc435..9e852f7236 100644
--- a/compiler/test/__snapshots__/includes.f4ba5583.0.snapshot
+++ b/compiler/test/__snapshots__/includes.f4ba5583.0.snapshot
@@ -46,5 +46,5 @@ includes › include_module2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/let_mut.00e05fe2.0.snapshot b/compiler/test/__snapshots__/let_mut.00e05fe2.0.snapshot
index 561567a327..8e8647a680 100644
--- a/compiler/test/__snapshots__/let_mut.00e05fe2.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.00e05fe2.0.snapshot
@@ -81,5 +81,5 @@ let mut › let-mut_division1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.1176df90.0.snapshot b/compiler/test/__snapshots__/let_mut.1176df90.0.snapshot
index 293e70a010..21f3c3cda8 100644
--- a/compiler/test/__snapshots__/let_mut.1176df90.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.1176df90.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_multiplication2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.3307d5a7.0.snapshot b/compiler/test/__snapshots__/let_mut.3307d5a7.0.snapshot
index 2eaaa5f29b..d61ed4bbfb 100644
--- a/compiler/test/__snapshots__/let_mut.3307d5a7.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.3307d5a7.0.snapshot
@@ -68,5 +68,5 @@ let mut › let-mut3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.43f6980c.0.snapshot b/compiler/test/__snapshots__/let_mut.43f6980c.0.snapshot
index 90d0b863cc..087c385be3 100644
--- a/compiler/test/__snapshots__/let_mut.43f6980c.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.43f6980c.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_division3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.48249b50.0.snapshot b/compiler/test/__snapshots__/let_mut.48249b50.0.snapshot
index 5b10cb169a..41325073ac 100644
--- a/compiler/test/__snapshots__/let_mut.48249b50.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.48249b50.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.4c3f3b2b.0.snapshot b/compiler/test/__snapshots__/let_mut.4c3f3b2b.0.snapshot
index f80320c6b0..cd74f4d8ed 100644
--- a/compiler/test/__snapshots__/let_mut.4c3f3b2b.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.4c3f3b2b.0.snapshot
@@ -96,5 +96,5 @@ let mut › let-mut2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.4c75261e.0.snapshot b/compiler/test/__snapshots__/let_mut.4c75261e.0.snapshot
index 36b1b71324..9e8b4d5e11 100644
--- a/compiler/test/__snapshots__/let_mut.4c75261e.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.4c75261e.0.snapshot
@@ -81,5 +81,5 @@ let mut › let-mut_multiplication1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.634331f0.0.snapshot b/compiler/test/__snapshots__/let_mut.634331f0.0.snapshot
index fb3b38766e..b99c66a0f4 100644
--- a/compiler/test/__snapshots__/let_mut.634331f0.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.634331f0.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_multiplication3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.63c16374.0.snapshot b/compiler/test/__snapshots__/let_mut.63c16374.0.snapshot
index a458680e1c..b4cc9a238f 100644
--- a/compiler/test/__snapshots__/let_mut.63c16374.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.63c16374.0.snapshot
@@ -68,5 +68,5 @@ let mut › let-mut4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.6796c72d.0.snapshot b/compiler/test/__snapshots__/let_mut.6796c72d.0.snapshot
index 42c60965aa..95ffb67ecc 100644
--- a/compiler/test/__snapshots__/let_mut.6796c72d.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.6796c72d.0.snapshot
@@ -81,5 +81,5 @@ let mut › let-mut_subtraction1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.baaea1d3.0.snapshot b/compiler/test/__snapshots__/let_mut.baaea1d3.0.snapshot
index e8386d3392..ea552860f0 100644
--- a/compiler/test/__snapshots__/let_mut.baaea1d3.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.baaea1d3.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_subtraction2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.cbbbaeb4.0.snapshot b/compiler/test/__snapshots__/let_mut.cbbbaeb4.0.snapshot
index 29a6dddcda..f77cfefd09 100644
--- a/compiler/test/__snapshots__/let_mut.cbbbaeb4.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.cbbbaeb4.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_addition2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.d2de286b.0.snapshot b/compiler/test/__snapshots__/let_mut.d2de286b.0.snapshot
index 4032c2ae53..97735a2e47 100644
--- a/compiler/test/__snapshots__/let_mut.d2de286b.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.d2de286b.0.snapshot
@@ -81,5 +81,5 @@ let mut › let-mut_addition1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.e90db621.0.snapshot b/compiler/test/__snapshots__/let_mut.e90db621.0.snapshot
index 19c4ccddab..27bf2fafca 100644
--- a/compiler/test/__snapshots__/let_mut.e90db621.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.e90db621.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_subtraction3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.f8f208a2.0.snapshot b/compiler/test/__snapshots__/let_mut.f8f208a2.0.snapshot
index 958ba50718..42357fccf5 100644
--- a/compiler/test/__snapshots__/let_mut.f8f208a2.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.f8f208a2.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_addition3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.f9e32f30.0.snapshot b/compiler/test/__snapshots__/let_mut.f9e32f30.0.snapshot
index f5d50d280b..a57b08f22b 100644
--- a/compiler/test/__snapshots__/let_mut.f9e32f30.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.f9e32f30.0.snapshot
@@ -89,5 +89,5 @@ let mut › let-mut_division2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/let_mut.fcc9c65d.0.snapshot b/compiler/test/__snapshots__/let_mut.fcc9c65d.0.snapshot
index 2b0db2ae93..d6c372eeb9 100644
--- a/compiler/test/__snapshots__/let_mut.fcc9c65d.0.snapshot
+++ b/compiler/test/__snapshots__/let_mut.fcc9c65d.0.snapshot
@@ -39,5 +39,5 @@ let mut › let-mut1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/lists.884ce894.0.snapshot b/compiler/test/__snapshots__/lists.884ce894.0.snapshot
index e55cb52630..52e737b7e8 100644
--- a/compiler/test/__snapshots__/lists.884ce894.0.snapshot
+++ b/compiler/test/__snapshots__/lists.884ce894.0.snapshot
@@ -233,5 +233,5 @@ lists › list_spread
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/lists.d9fd46fb.0.snapshot b/compiler/test/__snapshots__/lists.d9fd46fb.0.snapshot
index fc0109d583..85cd722772 100644
--- a/compiler/test/__snapshots__/lists.d9fd46fb.0.snapshot
+++ b/compiler/test/__snapshots__/lists.d9fd46fb.0.snapshot
@@ -190,5 +190,5 @@ lists › list1_trailing_space
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/lists.e5378351.0.snapshot b/compiler/test/__snapshots__/lists.e5378351.0.snapshot
index 79745c7c2f..5a371e9f30 100644
--- a/compiler/test/__snapshots__/lists.e5378351.0.snapshot
+++ b/compiler/test/__snapshots__/lists.e5378351.0.snapshot
@@ -190,5 +190,5 @@ lists › list1_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/loops.0a25def1.0.snapshot b/compiler/test/__snapshots__/loops.0a25def1.0.snapshot
index f1b27a7df8..38725f2826 100644
--- a/compiler/test/__snapshots__/loops.0a25def1.0.snapshot
+++ b/compiler/test/__snapshots__/loops.0a25def1.0.snapshot
@@ -257,5 +257,5 @@ loops › loop2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/loops.0fafc5f0.0.snapshot b/compiler/test/__snapshots__/loops.0fafc5f0.0.snapshot
index 9d160a4672..19a0a186d8 100644
--- a/compiler/test/__snapshots__/loops.0fafc5f0.0.snapshot
+++ b/compiler/test/__snapshots__/loops.0fafc5f0.0.snapshot
@@ -182,5 +182,5 @@ loops › loop5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/loops.c2b7bfc6.0.snapshot b/compiler/test/__snapshots__/loops.c2b7bfc6.0.snapshot
index 15ce2c80b1..e5fe786174 100644
--- a/compiler/test/__snapshots__/loops.c2b7bfc6.0.snapshot
+++ b/compiler/test/__snapshots__/loops.c2b7bfc6.0.snapshot
@@ -130,5 +130,5 @@ loops › loop3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/loops.f1c03b79.0.snapshot b/compiler/test/__snapshots__/loops.f1c03b79.0.snapshot
index 23f29089d9..b2f373ac3a 100644
--- a/compiler/test/__snapshots__/loops.f1c03b79.0.snapshot
+++ b/compiler/test/__snapshots__/loops.f1c03b79.0.snapshot
@@ -182,5 +182,5 @@ loops › loop4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/modules.52d25a2f.0.snapshot b/compiler/test/__snapshots__/modules.52d25a2f.0.snapshot
index b73f81fa8e..52fc1828b4 100644
--- a/compiler/test/__snapshots__/modules.52d25a2f.0.snapshot
+++ b/compiler/test/__snapshots__/modules.52d25a2f.0.snapshot
@@ -31,5 +31,5 @@ modules › smallest_submodule
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/optimizations.d72b00c6.0.snapshot b/compiler/test/__snapshots__/optimizations.d72b00c6.0.snapshot
index 481dcf69b4..b3858414a8 100644
--- a/compiler/test/__snapshots__/optimizations.d72b00c6.0.snapshot
+++ b/compiler/test/__snapshots__/optimizations.d72b00c6.0.snapshot
@@ -82,5 +82,5 @@ optimizations › trs1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/optimizations.ff6d5bfb.0.snapshot b/compiler/test/__snapshots__/optimizations.ff6d5bfb.0.snapshot
index 8b3ae2358b..4181471b71 100644
--- a/compiler/test/__snapshots__/optimizations.ff6d5bfb.0.snapshot
+++ b/compiler/test/__snapshots__/optimizations.ff6d5bfb.0.snapshot
@@ -176,5 +176,5 @@ optimizations › test_dead_branch_elimination_5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.0539d13e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.0539d13e.0.snapshot
index 4df0d154d2..f768a3ae70 100644
--- a/compiler/test/__snapshots__/pattern_matching.0539d13e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.0539d13e.0.snapshot
@@ -226,5 +226,5 @@ pattern matching › record_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.05b60a1e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.05b60a1e.0.snapshot
index 61ff00f874..b0da5a7ecf 100644
--- a/compiler/test/__snapshots__/pattern_matching.05b60a1e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.05b60a1e.0.snapshot
@@ -347,5 +347,5 @@ pattern matching › adt_match_deep
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 441
+ ;; custom section \"cmi\", size 486
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.0ad4ac05.0.snapshot b/compiler/test/__snapshots__/pattern_matching.0ad4ac05.0.snapshot
index a6d8e5acc1..4c38937f6d 100644
--- a/compiler/test/__snapshots__/pattern_matching.0ad4ac05.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.0ad4ac05.0.snapshot
@@ -1256,5 +1256,5 @@ pattern matching › tuple_match_deep4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.0bb6923e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.0bb6923e.0.snapshot
index 45f8881dd1..19bd2aa073 100644
--- a/compiler/test/__snapshots__/pattern_matching.0bb6923e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.0bb6923e.0.snapshot
@@ -977,5 +977,5 @@ pattern matching › adt_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.0fa61137.0.snapshot b/compiler/test/__snapshots__/pattern_matching.0fa61137.0.snapshot
index f7b4308b7a..5ca2c3fa14 100644
--- a/compiler/test/__snapshots__/pattern_matching.0fa61137.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.0fa61137.0.snapshot
@@ -238,5 +238,5 @@ pattern matching › low_level_constant_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.14dc7554.0.snapshot b/compiler/test/__snapshots__/pattern_matching.14dc7554.0.snapshot
index aa384e3b28..ccb644d83e 100644
--- a/compiler/test/__snapshots__/pattern_matching.14dc7554.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.14dc7554.0.snapshot
@@ -200,5 +200,5 @@ pattern matching › record_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.16cd197e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.16cd197e.0.snapshot
index a83c7b295c..e305b50368 100644
--- a/compiler/test/__snapshots__/pattern_matching.16cd197e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.16cd197e.0.snapshot
@@ -173,5 +173,5 @@ pattern matching › constant_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.16eb3dbf.0.snapshot b/compiler/test/__snapshots__/pattern_matching.16eb3dbf.0.snapshot
index c92b9eb0ee..18b26529ab 100644
--- a/compiler/test/__snapshots__/pattern_matching.16eb3dbf.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.16eb3dbf.0.snapshot
@@ -398,5 +398,5 @@ pattern matching › guarded_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.25930935.0.snapshot b/compiler/test/__snapshots__/pattern_matching.25930935.0.snapshot
index becedbd25c..49b0de7576 100644
--- a/compiler/test/__snapshots__/pattern_matching.25930935.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.25930935.0.snapshot
@@ -238,5 +238,5 @@ pattern matching › low_level_constant_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.3722b060.0.snapshot b/compiler/test/__snapshots__/pattern_matching.3722b060.0.snapshot
index 94a48f2246..685a2a8748 100644
--- a/compiler/test/__snapshots__/pattern_matching.3722b060.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.3722b060.0.snapshot
@@ -421,5 +421,5 @@ pattern matching › tuple_match_deep
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.46f91987.0.snapshot b/compiler/test/__snapshots__/pattern_matching.46f91987.0.snapshot
index e9a7c85556..2ab39508f5 100644
--- a/compiler/test/__snapshots__/pattern_matching.46f91987.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.46f91987.0.snapshot
@@ -200,5 +200,5 @@ pattern matching › record_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.5b158103.0.snapshot b/compiler/test/__snapshots__/pattern_matching.5b158103.0.snapshot
index 6af5aa3e3d..3731854f3d 100644
--- a/compiler/test/__snapshots__/pattern_matching.5b158103.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.5b158103.0.snapshot
@@ -458,5 +458,5 @@ pattern matching › constant_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.5b6ff2d3.0.snapshot b/compiler/test/__snapshots__/pattern_matching.5b6ff2d3.0.snapshot
index 08cf7de3b4..39d17adb63 100644
--- a/compiler/test/__snapshots__/pattern_matching.5b6ff2d3.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.5b6ff2d3.0.snapshot
@@ -477,5 +477,5 @@ pattern matching › alias_match_5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.5ff49e44.0.snapshot b/compiler/test/__snapshots__/pattern_matching.5ff49e44.0.snapshot
index 761be7fa3d..3f9a96e102 100644
--- a/compiler/test/__snapshots__/pattern_matching.5ff49e44.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.5ff49e44.0.snapshot
@@ -307,5 +307,5 @@ pattern matching › record_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.64686134.0.snapshot b/compiler/test/__snapshots__/pattern_matching.64686134.0.snapshot
index 455c9be049..7d4ae7b590 100644
--- a/compiler/test/__snapshots__/pattern_matching.64686134.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.64686134.0.snapshot
@@ -331,5 +331,5 @@ pattern matching › constant_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.702ed9b0.0.snapshot b/compiler/test/__snapshots__/pattern_matching.702ed9b0.0.snapshot
index 41be358d34..b1799f2bd2 100644
--- a/compiler/test/__snapshots__/pattern_matching.702ed9b0.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.702ed9b0.0.snapshot
@@ -1342,5 +1342,5 @@ pattern matching › tuple_match_deep6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.7082d3ca.0.snapshot b/compiler/test/__snapshots__/pattern_matching.7082d3ca.0.snapshot
index 776641deb8..2d56c895dc 100644
--- a/compiler/test/__snapshots__/pattern_matching.7082d3ca.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.7082d3ca.0.snapshot
@@ -297,5 +297,5 @@ pattern matching › tuple_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.79346fef.0.snapshot b/compiler/test/__snapshots__/pattern_matching.79346fef.0.snapshot
index b5db7d5abe..1bce284be1 100644
--- a/compiler/test/__snapshots__/pattern_matching.79346fef.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.79346fef.0.snapshot
@@ -1213,5 +1213,5 @@ pattern matching › tuple_match_deep3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.7f7fe4ef.0.snapshot b/compiler/test/__snapshots__/pattern_matching.7f7fe4ef.0.snapshot
index a90de13916..aaf65d1a7e 100644
--- a/compiler/test/__snapshots__/pattern_matching.7f7fe4ef.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.7f7fe4ef.0.snapshot
@@ -75,5 +75,5 @@ pattern matching › alias_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.8614dff3.0.snapshot b/compiler/test/__snapshots__/pattern_matching.8614dff3.0.snapshot
index 277f779961..dc72edb084 100644
--- a/compiler/test/__snapshots__/pattern_matching.8614dff3.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.8614dff3.0.snapshot
@@ -102,5 +102,5 @@ pattern matching › alias_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.8c0dc67a.0.snapshot b/compiler/test/__snapshots__/pattern_matching.8c0dc67a.0.snapshot
index 73af2e2426..c7631c5004 100644
--- a/compiler/test/__snapshots__/pattern_matching.8c0dc67a.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.8c0dc67a.0.snapshot
@@ -848,5 +848,5 @@ pattern matching › adt_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.9561763b.0.snapshot b/compiler/test/__snapshots__/pattern_matching.9561763b.0.snapshot
index 8a69d6191f..6572cce0aa 100644
--- a/compiler/test/__snapshots__/pattern_matching.9561763b.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.9561763b.0.snapshot
@@ -787,5 +787,5 @@ pattern matching › tuple_match_deep2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.98756c45.0.snapshot b/compiler/test/__snapshots__/pattern_matching.98756c45.0.snapshot
index 0cc6b7527d..46e6520039 100644
--- a/compiler/test/__snapshots__/pattern_matching.98756c45.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.98756c45.0.snapshot
@@ -221,5 +221,5 @@ pattern matching › record_match_deep
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 561
+ ;; custom section \"cmi\", size 606
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.9ffaa7a7.0.snapshot b/compiler/test/__snapshots__/pattern_matching.9ffaa7a7.0.snapshot
index f815ef2016..fd6241d725 100644
--- a/compiler/test/__snapshots__/pattern_matching.9ffaa7a7.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.9ffaa7a7.0.snapshot
@@ -238,5 +238,5 @@ pattern matching › low_level_constant_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.aa8d2963.0.snapshot b/compiler/test/__snapshots__/pattern_matching.aa8d2963.0.snapshot
index e42bed72d4..5a15c3c938 100644
--- a/compiler/test/__snapshots__/pattern_matching.aa8d2963.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.aa8d2963.0.snapshot
@@ -427,5 +427,5 @@ pattern matching › guarded_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.ac58ffc3.0.snapshot b/compiler/test/__snapshots__/pattern_matching.ac58ffc3.0.snapshot
index 1a58b5dae1..4ee68d69f8 100644
--- a/compiler/test/__snapshots__/pattern_matching.ac58ffc3.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.ac58ffc3.0.snapshot
@@ -398,5 +398,5 @@ pattern matching › guarded_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.b1b060ad.0.snapshot b/compiler/test/__snapshots__/pattern_matching.b1b060ad.0.snapshot
index 739b746621..1bfcf1ba1a 100644
--- a/compiler/test/__snapshots__/pattern_matching.b1b060ad.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.b1b060ad.0.snapshot
@@ -891,5 +891,5 @@ pattern matching › adt_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.b9db0dd9.0.snapshot b/compiler/test/__snapshots__/pattern_matching.b9db0dd9.0.snapshot
index ccf3c04749..55e79a2aec 100644
--- a/compiler/test/__snapshots__/pattern_matching.b9db0dd9.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.b9db0dd9.0.snapshot
@@ -427,5 +427,5 @@ pattern matching › guarded_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.be46eb0e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.be46eb0e.0.snapshot
index 2ae9dbbfb5..5bd625281e 100644
--- a/compiler/test/__snapshots__/pattern_matching.be46eb0e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.be46eb0e.0.snapshot
@@ -244,5 +244,5 @@ pattern matching › low_level_constant_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.c91eac29.0.snapshot b/compiler/test/__snapshots__/pattern_matching.c91eac29.0.snapshot
index 08fa51866c..84517d7d64 100644
--- a/compiler/test/__snapshots__/pattern_matching.c91eac29.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.c91eac29.0.snapshot
@@ -934,5 +934,5 @@ pattern matching › adt_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.c9582b6d.0.snapshot b/compiler/test/__snapshots__/pattern_matching.c9582b6d.0.snapshot
index 100e3758c8..7c85f281a0 100644
--- a/compiler/test/__snapshots__/pattern_matching.c9582b6d.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.c9582b6d.0.snapshot
@@ -360,5 +360,5 @@ pattern matching › alias_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.d048ece0.0.snapshot b/compiler/test/__snapshots__/pattern_matching.d048ece0.0.snapshot
index b84af04044..95070d1379 100644
--- a/compiler/test/__snapshots__/pattern_matching.d048ece0.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.d048ece0.0.snapshot
@@ -1020,5 +1020,5 @@ pattern matching › adt_match_5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.e17bcd61.0.snapshot b/compiler/test/__snapshots__/pattern_matching.e17bcd61.0.snapshot
index 4690d6faf3..36b12463de 100644
--- a/compiler/test/__snapshots__/pattern_matching.e17bcd61.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.e17bcd61.0.snapshot
@@ -123,5 +123,5 @@ pattern matching › or_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.e41ad64e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.e41ad64e.0.snapshot
index 92fb414775..8d2cd1933f 100644
--- a/compiler/test/__snapshots__/pattern_matching.e41ad64e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.e41ad64e.0.snapshot
@@ -1299,5 +1299,5 @@ pattern matching › tuple_match_deep5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.eb4334e1.0.snapshot b/compiler/test/__snapshots__/pattern_matching.eb4334e1.0.snapshot
index 13ea7a4300..5904371f3e 100644
--- a/compiler/test/__snapshots__/pattern_matching.eb4334e1.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.eb4334e1.0.snapshot
@@ -469,5 +469,5 @@ pattern matching › constant_match_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.f0c08ea4.0.snapshot b/compiler/test/__snapshots__/pattern_matching.f0c08ea4.0.snapshot
index 95eea4c966..2a8dc8d2f8 100644
--- a/compiler/test/__snapshots__/pattern_matching.f0c08ea4.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.f0c08ea4.0.snapshot
@@ -1385,5 +1385,5 @@ pattern matching › tuple_match_deep7
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.f25e0163.0.snapshot b/compiler/test/__snapshots__/pattern_matching.f25e0163.0.snapshot
index f7fbf9f089..efc203dd12 100644
--- a/compiler/test/__snapshots__/pattern_matching.f25e0163.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.f25e0163.0.snapshot
@@ -575,5 +575,5 @@ pattern matching › or_match_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.f3d48b0e.0.snapshot b/compiler/test/__snapshots__/pattern_matching.f3d48b0e.0.snapshot
index 0d6ddf2c9c..a84858cc74 100644
--- a/compiler/test/__snapshots__/pattern_matching.f3d48b0e.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.f3d48b0e.0.snapshot
@@ -123,5 +123,5 @@ pattern matching › or_match_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/pattern_matching.f6c9c89c.0.snapshot b/compiler/test/__snapshots__/pattern_matching.f6c9c89c.0.snapshot
index 9fcdc288a5..d8eaa83cbf 100644
--- a/compiler/test/__snapshots__/pattern_matching.f6c9c89c.0.snapshot
+++ b/compiler/test/__snapshots__/pattern_matching.f6c9c89c.0.snapshot
@@ -321,5 +321,5 @@ pattern matching › or_match_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/provides.0ef7e7b3.0.snapshot b/compiler/test/__snapshots__/provides.0ef7e7b3.0.snapshot
index becbc1865b..abec48340f 100644
--- a/compiler/test/__snapshots__/provides.0ef7e7b3.0.snapshot
+++ b/compiler/test/__snapshots__/provides.0ef7e7b3.0.snapshot
@@ -32,5 +32,5 @@ provides › provide7
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/provides.10f4f118.0.snapshot b/compiler/test/__snapshots__/provides.10f4f118.0.snapshot
index a4bdbaf2ff..15e820e4fa 100644
--- a/compiler/test/__snapshots__/provides.10f4f118.0.snapshot
+++ b/compiler/test/__snapshots__/provides.10f4f118.0.snapshot
@@ -46,5 +46,5 @@ provides › provide9
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/provides.2a5f527b.0.snapshot b/compiler/test/__snapshots__/provides.2a5f527b.0.snapshot
index 06225e312f..ce34cf02ec 100644
--- a/compiler/test/__snapshots__/provides.2a5f527b.0.snapshot
+++ b/compiler/test/__snapshots__/provides.2a5f527b.0.snapshot
@@ -41,5 +41,5 @@ provides › multiple_provides_8
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1390
+ ;; custom section \"cmi\", size 1435
 )
diff --git a/compiler/test/__snapshots__/provides.30cbc409.0.snapshot b/compiler/test/__snapshots__/provides.30cbc409.0.snapshot
index d6b8325cea..2da57f3f21 100644
--- a/compiler/test/__snapshots__/provides.30cbc409.0.snapshot
+++ b/compiler/test/__snapshots__/provides.30cbc409.0.snapshot
@@ -13,11 +13,11 @@ provides › provide_start_function
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$malloc\" (global $GRAIN$EXPORT$malloc_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$incRef\" (global $GRAIN$EXPORT$incRef_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$decRef\" (global $GRAIN$EXPORT$decRef_0 (mut i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$print\" (global $print_1117 (mut i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$print\" (global $print_1115 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"malloc\" (func $malloc_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"incRef\" (func $incRef_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"decRef\" (func $decRef_0 (param i32 i32) (result i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"print\" (func $print_1117 (param i32 i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"print\" (func $print_1115 (param i32 i32 i32) (result i32)))
  (global $_start_1113 (mut i32) (i32.const 0))
  (global $GRAIN$TABLE_SIZE i32 (i32.const 0))
  (memory $0 0)
@@ -109,10 +109,10 @@ provides › provide_start_function
      )
     )
    )
-   (return_call $print_1117
+   (return_call $print_1115
     (call $incRef_0
      (global.get $GRAIN$EXPORT$incRef_0)
-     (global.get $print_1117)
+     (global.get $print_1115)
     )
     (local.get $8)
     (local.get $7)
@@ -190,10 +190,10 @@ provides › provide_start_function
     )
    )
    (drop
-    (call $print_1117
+    (call $print_1115
      (call $incRef_0
       (global.get $GRAIN$EXPORT$incRef_0)
-      (global.get $print_1117)
+      (global.get $print_1115)
      )
      (local.get $7)
      (local.get $6)
@@ -209,5 +209,5 @@ provides › provide_start_function
    (i32.const 1879048190)
   )
  )
- ;; custom section \"cmi\", size 976
+ ;; custom section \"cmi\", size 1021
 )
diff --git a/compiler/test/__snapshots__/provides.82c10ab4.0.snapshot b/compiler/test/__snapshots__/provides.82c10ab4.0.snapshot
index fe23ef975a..10189488d5 100644
--- a/compiler/test/__snapshots__/provides.82c10ab4.0.snapshot
+++ b/compiler/test/__snapshots__/provides.82c10ab4.0.snapshot
@@ -13,21 +13,21 @@ provides › provide12
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$malloc\" (global $GRAIN$EXPORT$malloc_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$incRef\" (global $GRAIN$EXPORT$incRef_0 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"GRAIN$EXPORT$decRef\" (global $GRAIN$EXPORT$decRef_0 (mut i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$print\" (global $print_1198 (mut i32)))
- (import \"GRAIN$MODULE$providedType.gr\" \"GRAIN$EXPORT$apply\" (global $apply_1196 (mut i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"GRAIN$EXPORT$print\" (global $print_1203 (mut i32)))
+ (import \"GRAIN$MODULE$providedType.gr\" \"GRAIN$EXPORT$apply\" (global $apply_1201 (mut i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"malloc\" (func $malloc_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"incRef\" (func $incRef_0 (param i32 i32) (result i32)))
  (import \"GRAIN$MODULE$runtime/gc.gr\" \"decRef\" (func $decRef_0 (param i32 i32) (result i32)))
- (import \"GRAIN$MODULE$pervasives.gr\" \"print\" (func $print_1198 (param i32 i32 i32) (result i32)))
- (import \"GRAIN$MODULE$providedType.gr\" \"apply\" (func $apply_1196 (param i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$pervasives.gr\" \"print\" (func $print_1203 (param i32 i32 i32) (result i32)))
+ (import \"GRAIN$MODULE$providedType.gr\" \"apply\" (func $apply_1201 (param i32 i32) (result i32)))
  (global $GRAIN$TABLE_SIZE i32 (i32.const 1))
  (memory $0 0)
- (elem $elem (global.get $relocBase_0) $lam_lambda_1197)
+ (elem $elem (global.get $relocBase_0) $lam_lambda_1202)
  (export \"memory\" (memory $0))
  (export \"_gmain\" (func $_gmain))
  (export \"_start\" (func $_start))
  (export \"GRAIN$TABLE_SIZE\" (global $GRAIN$TABLE_SIZE))
- (func $lam_lambda_1197 (param $0 i32) (param $1 i32) (result i32)
+ (func $lam_lambda_1202 (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -112,10 +112,10 @@ provides › provide12
       )
      )
     )
-    (return_call $print_1198
+    (return_call $print_1203
      (call $incRef_0
       (global.get $GRAIN$EXPORT$incRef_0)
-      (global.get $print_1198)
+      (global.get $print_1203)
      )
      (local.get $9)
      (local.get $8)
@@ -168,10 +168,10 @@ provides › provide12
      )
     )
    )
-   (return_call $apply_1196
+   (return_call $apply_1201
     (call $incRef_0
      (global.get $GRAIN$EXPORT$incRef_0)
-     (global.get $apply_1196)
+     (global.get $apply_1201)
     )
     (local.get $6)
    )
@@ -182,5 +182,5 @@ provides › provide12
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 378
+ ;; custom section \"cmi\", size 423
 )
diff --git a/compiler/test/__snapshots__/provides.c3bb4eff.0.snapshot b/compiler/test/__snapshots__/provides.c3bb4eff.0.snapshot
index d288f94666..bb49a490ea 100644
--- a/compiler/test/__snapshots__/provides.c3bb4eff.0.snapshot
+++ b/compiler/test/__snapshots__/provides.c3bb4eff.0.snapshot
@@ -64,5 +64,5 @@ provides › provide8
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 376
+ ;; custom section \"cmi\", size 421
 )
diff --git a/compiler/test/__snapshots__/provides.c6bf4567.0.snapshot b/compiler/test/__snapshots__/provides.c6bf4567.0.snapshot
index e3833a81b0..69c76d9996 100644
--- a/compiler/test/__snapshots__/provides.c6bf4567.0.snapshot
+++ b/compiler/test/__snapshots__/provides.c6bf4567.0.snapshot
@@ -69,5 +69,5 @@ provides › let_rec_provide
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 960
+ ;; custom section \"cmi\", size 1005
 )
diff --git a/compiler/test/__snapshots__/provides.f378d570.0.snapshot b/compiler/test/__snapshots__/provides.f378d570.0.snapshot
index e2ae800254..13ab88e83f 100644
--- a/compiler/test/__snapshots__/provides.f378d570.0.snapshot
+++ b/compiler/test/__snapshots__/provides.f378d570.0.snapshot
@@ -32,5 +32,5 @@ provides › provide4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 379
+ ;; custom section \"cmi\", size 424
 )
diff --git a/compiler/test/__snapshots__/records.012b017b.0.snapshot b/compiler/test/__snapshots__/records.012b017b.0.snapshot
index 16a09f4b99..789b61a653 100644
--- a/compiler/test/__snapshots__/records.012b017b.0.snapshot
+++ b/compiler/test/__snapshots__/records.012b017b.0.snapshot
@@ -31,5 +31,5 @@ records › record_spread_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 517
+ ;; custom section \"cmi\", size 562
 )
diff --git a/compiler/test/__snapshots__/records.02742729.0.snapshot b/compiler/test/__snapshots__/records.02742729.0.snapshot
index 5553c147d6..55c1d7fc9f 100644
--- a/compiler/test/__snapshots__/records.02742729.0.snapshot
+++ b/compiler/test/__snapshots__/records.02742729.0.snapshot
@@ -121,5 +121,5 @@ records › record_get_multiple
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 517
+ ;; custom section \"cmi\", size 562
 )
diff --git a/compiler/test/__snapshots__/records.02af5946.0.snapshot b/compiler/test/__snapshots__/records.02af5946.0.snapshot
index 32a4241d14..e3087d5ed5 100644
--- a/compiler/test/__snapshots__/records.02af5946.0.snapshot
+++ b/compiler/test/__snapshots__/records.02af5946.0.snapshot
@@ -61,5 +61,5 @@ records › record_definition_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1224
+ ;; custom section \"cmi\", size 1272
 )
diff --git a/compiler/test/__snapshots__/records.2dc39420.0.snapshot b/compiler/test/__snapshots__/records.2dc39420.0.snapshot
index 22a190dbf6..2e4b2a5e8c 100644
--- a/compiler/test/__snapshots__/records.2dc39420.0.snapshot
+++ b/compiler/test/__snapshots__/records.2dc39420.0.snapshot
@@ -61,5 +61,5 @@ records › record_pun
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1160
+ ;; custom section \"cmi\", size 1208
 )
diff --git a/compiler/test/__snapshots__/records.49dfc6ff.0.snapshot b/compiler/test/__snapshots__/records.49dfc6ff.0.snapshot
index a4517a19d8..beda98bf05 100644
--- a/compiler/test/__snapshots__/records.49dfc6ff.0.snapshot
+++ b/compiler/test/__snapshots__/records.49dfc6ff.0.snapshot
@@ -156,5 +156,5 @@ records › record_destruct_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/records.54f5977c.0.snapshot b/compiler/test/__snapshots__/records.54f5977c.0.snapshot
index 538a91e694..8c1a0c3d55 100644
--- a/compiler/test/__snapshots__/records.54f5977c.0.snapshot
+++ b/compiler/test/__snapshots__/records.54f5977c.0.snapshot
@@ -243,5 +243,5 @@ records › record_destruct_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/records.5f340064.0.snapshot b/compiler/test/__snapshots__/records.5f340064.0.snapshot
index 3b6cb8bd5b..0d2e67f599 100644
--- a/compiler/test/__snapshots__/records.5f340064.0.snapshot
+++ b/compiler/test/__snapshots__/records.5f340064.0.snapshot
@@ -61,5 +61,5 @@ records › record_value_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1204
+ ;; custom section \"cmi\", size 1252
 )
diff --git a/compiler/test/__snapshots__/records.60c0a141.0.snapshot b/compiler/test/__snapshots__/records.60c0a141.0.snapshot
index 74d6bd8943..7c405aa26b 100644
--- a/compiler/test/__snapshots__/records.60c0a141.0.snapshot
+++ b/compiler/test/__snapshots__/records.60c0a141.0.snapshot
@@ -312,5 +312,5 @@ records › record_recursive_data_definition
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 561
+ ;; custom section \"cmi\", size 606
 )
diff --git a/compiler/test/__snapshots__/records.60c7acc4.0.snapshot b/compiler/test/__snapshots__/records.60c7acc4.0.snapshot
index 4639691f71..2652845e5b 100644
--- a/compiler/test/__snapshots__/records.60c7acc4.0.snapshot
+++ b/compiler/test/__snapshots__/records.60c7acc4.0.snapshot
@@ -65,5 +65,5 @@ records › record_pun_mixed_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1651
+ ;; custom section \"cmi\", size 1702
 )
diff --git a/compiler/test/__snapshots__/records.63a951b8.0.snapshot b/compiler/test/__snapshots__/records.63a951b8.0.snapshot
index 5d223b1e6e..b55a5d8210 100644
--- a/compiler/test/__snapshots__/records.63a951b8.0.snapshot
+++ b/compiler/test/__snapshots__/records.63a951b8.0.snapshot
@@ -156,5 +156,5 @@ records › record_destruct_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/records.89d08e01.0.snapshot b/compiler/test/__snapshots__/records.89d08e01.0.snapshot
index 632b666076..6d79ebb27f 100644
--- a/compiler/test/__snapshots__/records.89d08e01.0.snapshot
+++ b/compiler/test/__snapshots__/records.89d08e01.0.snapshot
@@ -61,5 +61,5 @@ records › record_pun_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1196
+ ;; custom section \"cmi\", size 1244
 )
diff --git a/compiler/test/__snapshots__/records.98824516.0.snapshot b/compiler/test/__snapshots__/records.98824516.0.snapshot
index b167f94c75..b5995c0442 100644
--- a/compiler/test/__snapshots__/records.98824516.0.snapshot
+++ b/compiler/test/__snapshots__/records.98824516.0.snapshot
@@ -177,5 +177,5 @@ records › record_destruct_deep
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 561
+ ;; custom section \"cmi\", size 606
 )
diff --git a/compiler/test/__snapshots__/records.a3299dd2.0.snapshot b/compiler/test/__snapshots__/records.a3299dd2.0.snapshot
index d9759bacf3..5fd798c84c 100644
--- a/compiler/test/__snapshots__/records.a3299dd2.0.snapshot
+++ b/compiler/test/__snapshots__/records.a3299dd2.0.snapshot
@@ -185,5 +185,5 @@ records › record_destruct_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/records.a702778a.0.snapshot b/compiler/test/__snapshots__/records.a702778a.0.snapshot
index 685b489b66..2da4a3d91b 100644
--- a/compiler/test/__snapshots__/records.a702778a.0.snapshot
+++ b/compiler/test/__snapshots__/records.a702778a.0.snapshot
@@ -151,5 +151,5 @@ records › record_get_multilevel
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 637
+ ;; custom section \"cmi\", size 682
 )
diff --git a/compiler/test/__snapshots__/records.a9c472b1.0.snapshot b/compiler/test/__snapshots__/records.a9c472b1.0.snapshot
index 31835dc483..4cc32e7113 100644
--- a/compiler/test/__snapshots__/records.a9c472b1.0.snapshot
+++ b/compiler/test/__snapshots__/records.a9c472b1.0.snapshot
@@ -96,5 +96,5 @@ records › record_multiple_fields_definition_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 2225
+ ;; custom section \"cmi\", size 2279
 )
diff --git a/compiler/test/__snapshots__/records.b50d234d.0.snapshot b/compiler/test/__snapshots__/records.b50d234d.0.snapshot
index 8a8f45ff25..debc2f64ea 100644
--- a/compiler/test/__snapshots__/records.b50d234d.0.snapshot
+++ b/compiler/test/__snapshots__/records.b50d234d.0.snapshot
@@ -91,5 +91,5 @@ records › record_get_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 441
+ ;; custom section \"cmi\", size 486
 )
diff --git a/compiler/test/__snapshots__/records.d34c4740.0.snapshot b/compiler/test/__snapshots__/records.d34c4740.0.snapshot
index af197470b3..1dbe4be57c 100644
--- a/compiler/test/__snapshots__/records.d34c4740.0.snapshot
+++ b/compiler/test/__snapshots__/records.d34c4740.0.snapshot
@@ -65,5 +65,5 @@ records › record_pun_mixed
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1597
+ ;; custom section \"cmi\", size 1648
 )
diff --git a/compiler/test/__snapshots__/records.d393173c.0.snapshot b/compiler/test/__snapshots__/records.d393173c.0.snapshot
index 78fec4a3cc..983becb252 100644
--- a/compiler/test/__snapshots__/records.d393173c.0.snapshot
+++ b/compiler/test/__snapshots__/records.d393173c.0.snapshot
@@ -243,5 +243,5 @@ records › record_destruct_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/records.d44e8007.0.snapshot b/compiler/test/__snapshots__/records.d44e8007.0.snapshot
index b1a3c587a6..e58a07ab56 100644
--- a/compiler/test/__snapshots__/records.d44e8007.0.snapshot
+++ b/compiler/test/__snapshots__/records.d44e8007.0.snapshot
@@ -65,5 +65,5 @@ records › record_pun_mixed_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1609
+ ;; custom section \"cmi\", size 1660
 )
diff --git a/compiler/test/__snapshots__/records.e4326567.0.snapshot b/compiler/test/__snapshots__/records.e4326567.0.snapshot
index 5e541a8e54..edabd34e98 100644
--- a/compiler/test/__snapshots__/records.e4326567.0.snapshot
+++ b/compiler/test/__snapshots__/records.e4326567.0.snapshot
@@ -96,5 +96,5 @@ records › record_multiple_fields_both_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 2177
+ ;; custom section \"cmi\", size 2231
 )
diff --git a/compiler/test/__snapshots__/records.e5b56da8.0.snapshot b/compiler/test/__snapshots__/records.e5b56da8.0.snapshot
index e066740cfc..312fe16b26 100644
--- a/compiler/test/__snapshots__/records.e5b56da8.0.snapshot
+++ b/compiler/test/__snapshots__/records.e5b56da8.0.snapshot
@@ -61,5 +61,5 @@ records › record_both_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1200
+ ;; custom section \"cmi\", size 1248
 )
diff --git a/compiler/test/__snapshots__/records.e705a980.0.snapshot b/compiler/test/__snapshots__/records.e705a980.0.snapshot
index e99cda7e64..932be85286 100644
--- a/compiler/test/__snapshots__/records.e705a980.0.snapshot
+++ b/compiler/test/__snapshots__/records.e705a980.0.snapshot
@@ -65,5 +65,5 @@ records › record_pun_multiple
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1615
+ ;; custom section \"cmi\", size 1666
 )
diff --git a/compiler/test/__snapshots__/records.f6e43cdb.0.snapshot b/compiler/test/__snapshots__/records.f6e43cdb.0.snapshot
index 33acd37a89..8a6e10a22d 100644
--- a/compiler/test/__snapshots__/records.f6e43cdb.0.snapshot
+++ b/compiler/test/__snapshots__/records.f6e43cdb.0.snapshot
@@ -65,5 +65,5 @@ records › record_pun_multiple_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1669
+ ;; custom section \"cmi\", size 1720
 )
diff --git a/compiler/test/__snapshots__/records.f6feee77.0.snapshot b/compiler/test/__snapshots__/records.f6feee77.0.snapshot
index 6c1a3072ac..ed098ed639 100644
--- a/compiler/test/__snapshots__/records.f6feee77.0.snapshot
+++ b/compiler/test/__snapshots__/records.f6feee77.0.snapshot
@@ -96,5 +96,5 @@ records › record_multiple_fields_value_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 2185
+ ;; custom section \"cmi\", size 2239
 )
diff --git a/compiler/test/__snapshots__/records.fae50a8e.0.snapshot b/compiler/test/__snapshots__/records.fae50a8e.0.snapshot
index 19552edcd5..05099a271f 100644
--- a/compiler/test/__snapshots__/records.fae50a8e.0.snapshot
+++ b/compiler/test/__snapshots__/records.fae50a8e.0.snapshot
@@ -65,5 +65,5 @@ records › record_pun_mixed_2_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 1663
+ ;; custom section \"cmi\", size 1714
 )
diff --git a/compiler/test/__snapshots__/stdlib.179d20b9.0.snapshot b/compiler/test/__snapshots__/stdlib.179d20b9.0.snapshot
index c1a3e457d6..66b90f4c43 100644
--- a/compiler/test/__snapshots__/stdlib.179d20b9.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.179d20b9.0.snapshot
@@ -44,5 +44,5 @@ stdlib › stdlib_equal_4
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.1c0b04b7.0.snapshot b/compiler/test/__snapshots__/stdlib.1c0b04b7.0.snapshot
index 54f8f22a64..cedd34bb2a 100644
--- a/compiler/test/__snapshots__/stdlib.1c0b04b7.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.1c0b04b7.0.snapshot
@@ -186,5 +186,5 @@ stdlib › stdlib_equal_20
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/stdlib.24cb9bbf.0.snapshot b/compiler/test/__snapshots__/stdlib.24cb9bbf.0.snapshot
index 042cc3bc92..ec38f730b4 100644
--- a/compiler/test/__snapshots__/stdlib.24cb9bbf.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.24cb9bbf.0.snapshot
@@ -100,5 +100,5 @@ stdlib › stdlib_equal_18
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.323e410a.0.snapshot b/compiler/test/__snapshots__/stdlib.323e410a.0.snapshot
index 74d47d4170..09a369e7e7 100644
--- a/compiler/test/__snapshots__/stdlib.323e410a.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.323e410a.0.snapshot
@@ -126,5 +126,5 @@ stdlib › stdlib_equal_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.37483d2d.0.snapshot b/compiler/test/__snapshots__/stdlib.37483d2d.0.snapshot
index bd5344ce2b..2581e25af8 100644
--- a/compiler/test/__snapshots__/stdlib.37483d2d.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.37483d2d.0.snapshot
@@ -190,5 +190,5 @@ stdlib › stdlib_cons
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.4a5061c2.0.snapshot b/compiler/test/__snapshots__/stdlib.4a5061c2.0.snapshot
index 2507558b98..f83220a0c8 100644
--- a/compiler/test/__snapshots__/stdlib.4a5061c2.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.4a5061c2.0.snapshot
@@ -186,5 +186,5 @@ stdlib › stdlib_equal_19
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/stdlib.5fe88631.0.snapshot b/compiler/test/__snapshots__/stdlib.5fe88631.0.snapshot
index e1a5820e0f..9c9c5dea1e 100644
--- a/compiler/test/__snapshots__/stdlib.5fe88631.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.5fe88631.0.snapshot
@@ -100,5 +100,5 @@ stdlib › stdlib_equal_16
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.648f406e.0.snapshot b/compiler/test/__snapshots__/stdlib.648f406e.0.snapshot
index 6e413fc6c9..44eb181a1a 100644
--- a/compiler/test/__snapshots__/stdlib.648f406e.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.648f406e.0.snapshot
@@ -124,5 +124,5 @@ stdlib › stdlib_equal_12
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.69635cff.0.snapshot b/compiler/test/__snapshots__/stdlib.69635cff.0.snapshot
index 3289469b32..51ead1b95c 100644
--- a/compiler/test/__snapshots__/stdlib.69635cff.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.69635cff.0.snapshot
@@ -186,5 +186,5 @@ stdlib › stdlib_equal_21
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/stdlib.6bf88430.0.snapshot b/compiler/test/__snapshots__/stdlib.6bf88430.0.snapshot
index 439e20f3ed..9fc3d8c016 100644
--- a/compiler/test/__snapshots__/stdlib.6bf88430.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.6bf88430.0.snapshot
@@ -96,5 +96,5 @@ stdlib › stdlib_equal_15
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.6de47be2.0.snapshot b/compiler/test/__snapshots__/stdlib.6de47be2.0.snapshot
index 6bf6a25fea..d157d5d81b 100644
--- a/compiler/test/__snapshots__/stdlib.6de47be2.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.6de47be2.0.snapshot
@@ -96,5 +96,5 @@ stdlib › stdlib_equal_14
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.8300ad7c.0.snapshot b/compiler/test/__snapshots__/stdlib.8300ad7c.0.snapshot
index 35643b2234..cccebc51b1 100644
--- a/compiler/test/__snapshots__/stdlib.8300ad7c.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.8300ad7c.0.snapshot
@@ -374,5 +374,5 @@ stdlib › stdlib_equal_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.91a94037.0.snapshot b/compiler/test/__snapshots__/stdlib.91a94037.0.snapshot
index f86159aaa8..cdbdfc76a7 100644
--- a/compiler/test/__snapshots__/stdlib.91a94037.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.91a94037.0.snapshot
@@ -104,5 +104,5 @@ stdlib › stdlib_equal_11
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.a70e79ca.0.snapshot b/compiler/test/__snapshots__/stdlib.a70e79ca.0.snapshot
index 89defb08b9..a11b7ab880 100644
--- a/compiler/test/__snapshots__/stdlib.a70e79ca.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.a70e79ca.0.snapshot
@@ -96,5 +96,5 @@ stdlib › stdlib_equal_9
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.b30d7785.0.snapshot b/compiler/test/__snapshots__/stdlib.b30d7785.0.snapshot
index 24b8a5a862..3ccae1ee78 100644
--- a/compiler/test/__snapshots__/stdlib.b30d7785.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.b30d7785.0.snapshot
@@ -108,5 +108,5 @@ stdlib › stdlib_equal_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.c09a513a.0.snapshot b/compiler/test/__snapshots__/stdlib.c09a513a.0.snapshot
index a2fe7b00e7..90c01a2a84 100644
--- a/compiler/test/__snapshots__/stdlib.c09a513a.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.c09a513a.0.snapshot
@@ -44,5 +44,5 @@ stdlib › stdlib_equal_6
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.cbf0318e.0.snapshot b/compiler/test/__snapshots__/stdlib.cbf0318e.0.snapshot
index 08526c4fb2..eacd026e89 100644
--- a/compiler/test/__snapshots__/stdlib.cbf0318e.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.cbf0318e.0.snapshot
@@ -186,5 +186,5 @@ stdlib › stdlib_equal_22
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 598
+ ;; custom section \"cmi\", size 643
 )
diff --git a/compiler/test/__snapshots__/stdlib.d28dee65.0.snapshot b/compiler/test/__snapshots__/stdlib.d28dee65.0.snapshot
index 3c93a4b160..3f42a7ba6b 100644
--- a/compiler/test/__snapshots__/stdlib.d28dee65.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.d28dee65.0.snapshot
@@ -100,5 +100,5 @@ stdlib › stdlib_equal_10
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.d4faa5bf.0.snapshot b/compiler/test/__snapshots__/stdlib.d4faa5bf.0.snapshot
index a50fffe67c..7791c712be 100644
--- a/compiler/test/__snapshots__/stdlib.d4faa5bf.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.d4faa5bf.0.snapshot
@@ -92,5 +92,5 @@ stdlib › stdlib_equal_13
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.d887bb04.0.snapshot b/compiler/test/__snapshots__/stdlib.d887bb04.0.snapshot
index c701b77927..4b35e05810 100644
--- a/compiler/test/__snapshots__/stdlib.d887bb04.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.d887bb04.0.snapshot
@@ -44,5 +44,5 @@ stdlib › stdlib_equal_7
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.dae8b12a.0.snapshot b/compiler/test/__snapshots__/stdlib.dae8b12a.0.snapshot
index 8705d719cd..182200a619 100644
--- a/compiler/test/__snapshots__/stdlib.dae8b12a.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.dae8b12a.0.snapshot
@@ -44,5 +44,5 @@ stdlib › stdlib_equal_5
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.e306600a.0.snapshot b/compiler/test/__snapshots__/stdlib.e306600a.0.snapshot
index 182aacd2e7..b78f955ff5 100644
--- a/compiler/test/__snapshots__/stdlib.e306600a.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.e306600a.0.snapshot
@@ -92,5 +92,5 @@ stdlib › stdlib_equal_8
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/stdlib.e6349872.0.snapshot b/compiler/test/__snapshots__/stdlib.e6349872.0.snapshot
index bca90d6cfd..106abb6422 100644
--- a/compiler/test/__snapshots__/stdlib.e6349872.0.snapshot
+++ b/compiler/test/__snapshots__/stdlib.e6349872.0.snapshot
@@ -100,5 +100,5 @@ stdlib › stdlib_equal_17
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/strings.434adad0.0.snapshot b/compiler/test/__snapshots__/strings.434adad0.0.snapshot
index c6098b4d73..7cd70f8531 100644
--- a/compiler/test/__snapshots__/strings.434adad0.0.snapshot
+++ b/compiler/test/__snapshots__/strings.434adad0.0.snapshot
@@ -53,5 +53,5 @@ strings › string2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/strings.a67428df.0.snapshot b/compiler/test/__snapshots__/strings.a67428df.0.snapshot
index bbbd80382c..efb0c5357d 100644
--- a/compiler/test/__snapshots__/strings.a67428df.0.snapshot
+++ b/compiler/test/__snapshots__/strings.a67428df.0.snapshot
@@ -53,5 +53,5 @@ strings › string1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/strings.b2ad5a89.0.snapshot b/compiler/test/__snapshots__/strings.b2ad5a89.0.snapshot
index e0af5e813d..40504cc52d 100644
--- a/compiler/test/__snapshots__/strings.b2ad5a89.0.snapshot
+++ b/compiler/test/__snapshots__/strings.b2ad5a89.0.snapshot
@@ -69,5 +69,5 @@ strings › string3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/strings.fb85549f.0.snapshot b/compiler/test/__snapshots__/strings.fb85549f.0.snapshot
index e9db7e7377..53992937e5 100644
--- a/compiler/test/__snapshots__/strings.fb85549f.0.snapshot
+++ b/compiler/test/__snapshots__/strings.fb85549f.0.snapshot
@@ -100,5 +100,5 @@ strings › concat
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.1451773e.0.snapshot b/compiler/test/__snapshots__/tuples.1451773e.0.snapshot
index 72227d3814..a614ea7825 100644
--- a/compiler/test/__snapshots__/tuples.1451773e.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.1451773e.0.snapshot
@@ -318,5 +318,5 @@ tuples › nested_tup_3
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.1d60b40c.0.snapshot b/compiler/test/__snapshots__/tuples.1d60b40c.0.snapshot
index b8eed58153..5119175418 100644
--- a/compiler/test/__snapshots__/tuples.1d60b40c.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.1d60b40c.0.snapshot
@@ -219,5 +219,5 @@ tuples › nested_tup_1
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.2c91b91d.0.snapshot b/compiler/test/__snapshots__/tuples.2c91b91d.0.snapshot
index 333e6ccf6f..2de95ddb65 100644
--- a/compiler/test/__snapshots__/tuples.2c91b91d.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.2c91b91d.0.snapshot
@@ -201,5 +201,5 @@ tuples › tup1_destruct_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.8d1f0463.0.snapshot b/compiler/test/__snapshots__/tuples.8d1f0463.0.snapshot
index 5a0eba6261..93890627ef 100644
--- a/compiler/test/__snapshots__/tuples.8d1f0463.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.8d1f0463.0.snapshot
@@ -61,5 +61,5 @@ tuples › tup1_trailing
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.a34621a0.0.snapshot b/compiler/test/__snapshots__/tuples.a34621a0.0.snapshot
index 49e265dc3b..fa6830fdae 100644
--- a/compiler/test/__snapshots__/tuples.a34621a0.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.a34621a0.0.snapshot
@@ -245,5 +245,5 @@ tuples › big_tup_access
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.b4f702d8.0.snapshot b/compiler/test/__snapshots__/tuples.b4f702d8.0.snapshot
index c6906c59ac..332d91f8ed 100644
--- a/compiler/test/__snapshots__/tuples.b4f702d8.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.b4f702d8.0.snapshot
@@ -31,5 +31,5 @@ tuples › no_non_trailing_comma_singleton_tup
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.c1eb0a50.0.snapshot b/compiler/test/__snapshots__/tuples.c1eb0a50.0.snapshot
index 5ad1b97aac..29f8fc8d68 100644
--- a/compiler/test/__snapshots__/tuples.c1eb0a50.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.c1eb0a50.0.snapshot
@@ -318,5 +318,5 @@ tuples › nested_tup_2
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/__snapshots__/tuples.f206002b.0.snapshot b/compiler/test/__snapshots__/tuples.f206002b.0.snapshot
index 041056d4ed..714f171f66 100644
--- a/compiler/test/__snapshots__/tuples.f206002b.0.snapshot
+++ b/compiler/test/__snapshots__/tuples.f206002b.0.snapshot
@@ -61,5 +61,5 @@ tuples › tup1_trailing_space
    (call $_gmain)
   )
  )
- ;; custom section \"cmi\", size 323
+ ;; custom section \"cmi\", size 368
 )
diff --git a/compiler/test/suites/crcs.re b/compiler/test/suites/crcs.re
new file mode 100644
index 0000000000..7ba446b5db
--- /dev/null
+++ b/compiler/test/suites/crcs.re
@@ -0,0 +1,107 @@
+open Grain_tests.TestFramework;
+open Grain_tests.Runner;
+open Grain_utils;
+
+describe("cyclic redundancy checks", ({test}) => {
+  let assertMatchingCRCs = (~config_fn=?, name, program_str1, program_str2) => {
+    test(
+      name,
+      ({expect}) => {
+        let prog1 =
+          compile(
+            ~config_fn?,
+            ~hook=Grain.Compile.stop_after_typed,
+            name,
+            program_str1,
+          );
+        let prog2 =
+          compile(
+            ~config_fn?,
+            ~hook=Grain.Compile.stop_after_typed,
+            name,
+            program_str2,
+          );
+
+        let crc1 =
+          switch (prog1.cstate_desc) {
+          | TypeChecked(typed) => Digest.to_hex(typed.signature.cmi_crc)
+          | _ => failwith("impossible")
+          };
+        let crc2 =
+          switch (prog2.cstate_desc) {
+          | TypeChecked(typed) => Digest.to_hex(typed.signature.cmi_crc)
+          | _ => failwith("impossible")
+          };
+        expect.string(crc1).toEqual(crc2);
+      },
+    );
+  };
+
+  assertMatchingCRCs("test_empty_modules", "module Main", "module Main");
+  assertMatchingCRCs(
+    "test_same_module",
+    {|
+      module Main
+
+      provide let foo = 5
+      provide let bar = "string"
+
+      provide enum Foo {
+        Bar(String),
+        Qux{num: Number}
+      }
+
+      provide module Bar {
+        provide let baz = Bar("bar")
+      }
+    |},
+    {|
+      module Main
+
+      provide let foo = 5
+      provide let bar = "string"
+
+      provide enum Foo {
+        Bar(String),
+        Qux{num: Number}
+      }
+
+      provide module Bar {
+        provide let baz = Bar("bar")
+      }
+    |},
+  );
+  assertMatchingCRCs(
+    "test_different_module_same_interface",
+    {|
+      module Main
+
+      provide let foo = 5
+      provide let bar = "string"
+
+      provide enum Foo {
+        Bar(String),
+        Qux{num: Number}
+      }
+
+      provide module Bar {
+        provide let baz = Bar("bar")
+      }
+    |},
+    {|
+      module Main
+
+      provide let foo = 17
+      provide let bar = "different string"
+
+      provide enum Foo {
+        Bar(String),
+        Qux{num: Number}
+      }
+
+      provide module Bar {
+        provide let baz = Qux{num: 6}
+      }
+    |},
+  );
+});