diff --git a/jscomp/test/belt_list_ntest.js b/jscomp/test/belt_list_ntest.js
index ecdabdd65f..b0746daae4 100644
--- a/jscomp/test/belt_list_ntest.js
+++ b/jscomp/test/belt_list_ntest.js
@@ -229,7 +229,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 50, characters 7-14", Belt_List.concatMany([
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 51, characters 6-13", Belt_List.concatMany([
       /* [] */0,
       /* [] */0,
       {
@@ -261,7 +261,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 51, characters 7-14", Belt_List.concatMany([{
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 55, characters 7-14", Belt_List.concatMany([{
         hd: 1,
         tl: {
           hd: 2,
@@ -282,15 +282,15 @@ Nodetest.describe("Belt.List", () => {
     });
   });
   Nodetest.test("concat", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 56, characters 6-13", Belt_List.toArray(Belt_List.concat(Belt_List.makeBy(100, i => i), Belt_List.makeBy(100, i => i))), Belt_Array.concat(Belt_Array.makeBy(100, i => i), Belt_Array.makeBy(100, i => i)));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 61, characters 7-14", Belt_List.concat({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 60, characters 6-13", Belt_List.toArray(Belt_List.concat(Belt_List.makeBy(100, i => i), Belt_List.makeBy(100, i => i))), Belt_Array.concat(Belt_Array.makeBy(100, i => i), Belt_Array.makeBy(100, i => i)));
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 65, characters 7-14", Belt_List.concat({
       hd: 1,
       tl: /* [] */0
     }, /* [] */0), {
       hd: 1,
       tl: /* [] */0
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 62, characters 7-14", Belt_List.concat(/* [] */0, {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 66, characters 7-14", Belt_List.concat(/* [] */0, {
       hd: 1,
       tl: /* [] */0
     }), {
@@ -299,7 +299,7 @@ Nodetest.describe("Belt.List", () => {
     });
   });
   Nodetest.test("zip", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 66, characters 7-14", Belt_List.zip({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 70, characters 7-14", Belt_List.zip({
       hd: 1,
       tl: {
         hd: 2,
@@ -327,12 +327,12 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 67, characters 7-14", Belt_List.zip(/* [] */0, {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 71, characters 7-14", Belt_List.zip(/* [] */0, {
       hd: 1,
       tl: /* [] */0
     }), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 68, characters 7-14", Belt_List.zip(/* [] */0, /* [] */0), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 69, characters 7-14", Belt_List.zip({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 72, characters 7-14", Belt_List.zip(/* [] */0, /* [] */0), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 73, characters 7-14", Belt_List.zip({
       hd: 1,
       tl: {
         hd: 2,
@@ -342,7 +342,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, /* [] */0), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 70, characters 7-14", Belt_List.zip({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 74, characters 7-14", Belt_List.zip({
       hd: 1,
       tl: {
         hd: 2,
@@ -383,7 +383,7 @@ Nodetest.describe("Belt.List", () => {
   let mod2 = x => x % 2 === 0;
   let evenIndex = (_x, i) => i % 2 === 0;
   Nodetest.test("partition", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 77, characters 7-14", Belt_List.partition({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 81, characters 7-14", Belt_List.partition({
       hd: 1,
       tl: {
         hd: 2,
@@ -423,7 +423,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 78, characters 7-14", Belt_List.partition({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 82, characters 7-14", Belt_List.partition({
       hd: 2,
       tl: {
         hd: 2,
@@ -451,7 +451,7 @@ Nodetest.describe("Belt.List", () => {
       },
       /* [] */0
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 79, characters 7-14", Belt_List.partition({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 83, characters 7-14", Belt_List.partition({
       hd: 2,
       tl: {
         hd: 2,
@@ -479,17 +479,17 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 80, characters 7-14", Belt_List.partition(/* [] */0, mod2), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 84, characters 7-14", Belt_List.partition(/* [] */0, mod2), [
       /* [] */0,
       /* [] */0
     ]);
   });
   Nodetest.test("unzip", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 84, characters 7-14", Belt_List.unzip(/* [] */0), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 88, characters 7-14", Belt_List.unzip(/* [] */0), [
       /* [] */0,
       /* [] */0
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 85, characters 7-14", Belt_List.unzip({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 89, characters 7-14", Belt_List.unzip({
       hd: [
         1,
         2
@@ -505,7 +505,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 86, characters 7-14", Belt_List.unzip({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 90, characters 7-14", Belt_List.unzip({
       hd: [
         1,
         2
@@ -535,7 +535,7 @@ Nodetest.describe("Belt.List", () => {
     ]);
   });
   Nodetest.test("filter", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 90, characters 7-14", Belt_List.keep({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 94, characters 7-14", Belt_List.keep({
       hd: 1,
       tl: {
         hd: 2,
@@ -554,7 +554,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 91, characters 7-14", Belt_List.keep({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 95, characters 7-14", Belt_List.keep({
       hd: 1,
       tl: {
         hd: 3,
@@ -564,8 +564,8 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, mod2), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 92, characters 7-14", Belt_List.keep(/* [] */0, mod2), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 93, characters 7-14", Belt_List.keep({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 96, characters 7-14", Belt_List.keep(/* [] */0, mod2), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 97, characters 7-14", Belt_List.keep({
       hd: 2,
       tl: {
         hd: 2,
@@ -598,8 +598,8 @@ Nodetest.describe("Belt.List", () => {
     });
   });
   Nodetest.test("keepWithIndex", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 97, characters 7-14", Belt_List.keepWithIndex(/* [] */0, evenIndex), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 98, characters 7-14", Belt_List.keepWithIndex({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 101, characters 7-14", Belt_List.keepWithIndex(/* [] */0, evenIndex), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 102, characters 7-14", Belt_List.keepWithIndex({
       hd: 1,
       tl: {
         hd: 2,
@@ -618,7 +618,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 99, characters 7-14", Belt_List.keepWithIndex({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 103, characters 7-14", Belt_List.keepWithIndex({
       hd: 0,
       tl: {
         hd: 1,
@@ -658,7 +658,7 @@ Nodetest.describe("Belt.List", () => {
   });
   let id = x => x;
   Nodetest.test("map", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 105, characters 7-14", Belt_List.map(Belt_List.makeBy(5, id), x => (x << 1)), {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 109, characters 7-14", Belt_List.map(Belt_List.makeBy(5, id), x => (x << 1)), {
       hd: 0,
       tl: {
         hd: 2,
@@ -674,8 +674,8 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 106, characters 7-14", Belt_List.map(/* [] */0, id), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 107, characters 7-14", Belt_List.map({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 110, characters 7-14", Belt_List.map(/* [] */0, id), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 111, characters 7-14", Belt_List.map({
       hd: 1,
       tl: /* [] */0
     }, x => -x | 0), {
@@ -688,17 +688,17 @@ Nodetest.describe("Belt.List", () => {
   let length_8_id = Belt_List.makeBy(8, id);
   Nodetest.test("mapWithIndex etc.", () => {
     let d = Belt_List.makeBy(10, x => (x << 1));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 120, characters 7-14", Belt_List.zipBy(length_10_id, length_10_id, add), d);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 121, characters 7-14", Belt_List.zipBy(/* [] */0, {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 124, characters 7-14", Belt_List.zipBy(length_10_id, length_10_id, add), d);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 125, characters 7-14", Belt_List.zipBy(/* [] */0, {
       hd: 1,
       tl: /* [] */0
     }, add), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 122, characters 7-14", Belt_List.zipBy({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 126, characters 7-14", Belt_List.zipBy({
       hd: 1,
       tl: /* [] */0
     }, /* [] */0, add), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 123, characters 7-14", Belt_List.zipBy(/* [] */0, /* [] */0, add), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 125, characters 6-13", Belt_List.zipBy(length_10_id, length_10_id, add), Belt_List.concat(Belt_List.map(length_8_id, x => (x << 1)), {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 127, characters 7-14", Belt_List.zipBy(/* [] */0, /* [] */0, add), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 128, characters 7-14", Belt_List.zipBy(length_10_id, length_10_id, add), Belt_List.concat(Belt_List.map(length_8_id, x => (x << 1)), {
       hd: 16,
       tl: {
         hd: 18,
@@ -706,11 +706,11 @@ Nodetest.describe("Belt.List", () => {
       }
     }));
     Node_test_util.eq("File \"belt_list_ntest.res\", line 129, characters 7-14", Belt_List.zipBy(length_10_id, length_8_id, add), Belt_List.mapWithIndex(length_8_id, (i, x) => i + x | 0));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 133, characters 7-14", Belt_List.reverse(Belt_List.mapReverse2(length_10_id, length_10_id, add)), Belt_List.map(length_10_id, x => (x << 1)));
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 131, characters 6-13", Belt_List.reverse(Belt_List.mapReverse2(length_10_id, length_10_id, add)), Belt_List.map(length_10_id, x => (x << 1)));
     let xs = Belt_List.reverse(Belt_List.mapReverse2(length_8_id, length_10_id, add));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 135, characters 7-14", Belt_List.length(xs), 8);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 136, characters 7-14", xs, Belt_List.zipBy(length_10_id, length_8_id, add));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 137, characters 7-14", Belt_List.mapReverse2({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 136, characters 7-14", Belt_List.length(xs), 8);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 137, characters 7-14", xs, Belt_List.zipBy(length_10_id, length_8_id, add));
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 138, characters 7-14", Belt_List.mapReverse2({
       hd: 1,
       tl: {
         hd: 2,
@@ -734,7 +734,7 @@ Nodetest.describe("Belt.List", () => {
     });
   });
   Nodetest.test("take", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 141, characters 7-14", Belt_List.take({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 142, characters 7-14", Belt_List.take({
       hd: 1,
       tl: {
         hd: 2,
@@ -750,15 +750,15 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 142, characters 7-14", Belt_List.take(/* [] */0, 1), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 143, characters 7-14", Belt_List.take({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 143, characters 7-14", Belt_List.take(/* [] */0, 1), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 144, characters 7-14", Belt_List.take({
       hd: 1,
       tl: {
         hd: 2,
         tl: /* [] */0
       }
     }, 3), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 144, characters 7-14", Belt_List.take({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 145, characters 7-14", Belt_List.take({
       hd: 1,
       tl: {
         hd: 2,
@@ -771,31 +771,31 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 145, characters 7-14", Belt_List.take(length_10_id, 8), length_8_id);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 146, characters 7-14", Belt_List.take(length_10_id, 0), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 147, characters 7-14", Belt_List.take(length_8_id, -2), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 146, characters 7-14", Belt_List.take(length_10_id, 8), length_8_id);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 147, characters 7-14", Belt_List.take(length_10_id, 0), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 148, characters 7-14", Belt_List.take(length_8_id, -2), undefined);
   });
   Nodetest.test("droo", () => {
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 151, characters 7-14", Belt_List.drop(length_10_id, 10), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 152, characters 7-14", Belt_List.drop(length_10_id, 8), {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 152, characters 7-14", Belt_List.drop(length_10_id, 10), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 153, characters 7-14", Belt_List.drop(length_10_id, 8), {
       hd: 8,
       tl: {
         hd: 9,
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 153, characters 7-14", Belt_List.drop(length_10_id, 0), length_10_id);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 154, characters 7-14", Belt_List.drop(length_8_id, -1), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 154, characters 7-14", Belt_List.drop(length_10_id, 0), length_10_id);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 155, characters 7-14", Belt_List.drop(length_8_id, -1), undefined);
   });
   Nodetest.test("splitAt", () => {
     let a = Belt_List.makeBy(5, id);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 159, characters 7-14", Belt_List.splitAt(/* [] */0, 1), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 160, characters 7-14", Belt_List.splitAt(a, 6), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 161, characters 7-14", Belt_List.splitAt(a, 5), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 160, characters 7-14", Belt_List.splitAt(/* [] */0, 1), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 161, characters 7-14", Belt_List.splitAt(a, 6), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 162, characters 7-14", Belt_List.splitAt(a, 5), [
       a,
       /* [] */0
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 162, characters 7-14", Belt_List.splitAt(a, 4), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 163, characters 7-14", Belt_List.splitAt(a, 4), [
       {
         hd: 0,
         tl: {
@@ -814,7 +814,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 163, characters 7-14", Belt_List.splitAt(a, 3), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 164, characters 7-14", Belt_List.splitAt(a, 3), [
       {
         hd: 0,
         tl: {
@@ -833,7 +833,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 164, characters 7-14", Belt_List.splitAt(a, 2), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 165, characters 7-14", Belt_List.splitAt(a, 2), [
       {
         hd: 0,
         tl: {
@@ -852,7 +852,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 165, characters 7-14", Belt_List.splitAt(a, 1), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 166, characters 7-14", Belt_List.splitAt(a, 1), [
       {
         hd: 0,
         tl: /* [] */0
@@ -871,15 +871,15 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 166, characters 7-14", Belt_List.splitAt(a, 0), [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 167, characters 7-14", Belt_List.splitAt(a, 0), [
       /* [] */0,
       a
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 167, characters 7-14", Belt_List.splitAt(a, -1), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 168, characters 7-14", Belt_List.splitAt(a, -1), undefined);
   });
   Nodetest.test("removeAssoc", () => {
     let eqx = (x, y) => x === y;
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 173, characters 7-14", Belt_List.hasAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 174, characters 7-14", Belt_List.hasAssoc({
       hd: [
         1,
         "1"
@@ -898,7 +898,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, 2, (prim0, prim1) => prim0 === prim1));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 174, characters 7-14", !Belt_List.hasAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 175, characters 7-14", !Belt_List.hasAssoc({
       hd: [
         1,
         "1"
@@ -917,7 +917,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, 4, (prim0, prim1) => prim0 === prim1));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 175, characters 7-14", Belt_List.hasAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 176, characters 7-14", Belt_List.hasAssoc({
       hd: [
         1,
         "1"
@@ -936,7 +936,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, 4, (x, y) => (x + 1 | 0) === y));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 176, characters 7-14", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 178, characters 6-13", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -967,7 +967,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 177, characters 7-14", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 183, characters 6-13", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -998,7 +998,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 178, characters 7-14", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 188, characters 6-13", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -1029,7 +1029,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 180, characters 6-13", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 193, characters 6-13", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -1066,7 +1066,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 185, characters 7-14", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 198, characters 7-14", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -1097,7 +1097,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 186, characters 7-14", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 199, characters 7-14", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -1128,7 +1128,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 187, characters 7-14", Belt_List.removeAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 200, characters 7-14", Belt_List.removeAssoc({
       hd: [
         1,
         "1"
@@ -1159,7 +1159,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 188, characters 7-14", Belt_List.removeAssoc(/* [] */0, 2, eqx), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 201, characters 7-14", Belt_List.removeAssoc(/* [] */0, 2, eqx), /* [] */0);
     let ll = {
       hd: [
         1,
@@ -1180,9 +1180,9 @@ Nodetest.describe("Belt.List", () => {
       }
     };
     let ll0 = Belt_List.removeAssoc(ll, 0, eqx);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 191, characters 7-14", ll === ll0);
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 204, characters 7-14", ll === ll0);
     let ll1 = Belt_List.setAssoc(ll, 2, "22", (prim0, prim1) => prim0 === prim1);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 193, characters 7-14", ll1, {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 206, characters 7-14", ll1, {
       hd: [
         1,
         "1"
@@ -1202,15 +1202,15 @@ Nodetest.describe("Belt.List", () => {
       }
     });
     let ll2 = Belt_List.setAssoc(ll1, 22, "2", (prim0, prim1) => prim0 === prim1);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 195, characters 7-14", Caml_obj.equal(ll2, {
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 208, characters 7-14", Caml_obj.equal(ll2, {
       hd: [
         22,
         "2"
       ],
       tl: ll1
     }));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 196, characters 7-14", Belt_List.tailExn(ll2) === ll1);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 198, characters 6-13", Caml_obj.equal(Belt_List.setAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 209, characters 7-14", Belt_List.tailExn(ll2) === ll1);
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 211, characters 6-13", Caml_obj.equal(Belt_List.setAssoc({
       hd: [
         1,
         "a"
@@ -1247,7 +1247,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 203, characters 6-13", Caml_obj.equal(Belt_List.setAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 216, characters 6-13", Caml_obj.equal(Belt_List.setAssoc({
       hd: [
         1,
         "a"
@@ -1278,14 +1278,14 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 206, characters 7-14", Belt_List.setAssoc(/* [] */0, 1, "1", (prim0, prim1) => prim0 === prim1), {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 219, characters 7-14", Belt_List.setAssoc(/* [] */0, 1, "1", (prim0, prim1) => prim0 === prim1), {
       hd: [
         1,
         "1"
       ],
       tl: /* [] */0
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 207, characters 7-14", Belt_List.setAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 220, characters 7-14", Belt_List.setAssoc({
       hd: [
         1,
         "2"
@@ -1298,7 +1298,7 @@ Nodetest.describe("Belt.List", () => {
       ],
       tl: /* [] */0
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 209, characters 7-14", Belt_List.setAssoc({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 222, characters 7-14", Belt_List.setAssoc({
       hd: [
         0,
         "0"
@@ -1323,7 +1323,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 210, characters 7-14", Caml_obj.equal(Belt_List.getAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 223, characters 7-14", Caml_obj.equal(Belt_List.getAssoc({
       hd: [
         1,
         "a"
@@ -1342,7 +1342,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, 2, (prim0, prim1) => prim0 === prim1), "b"));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 211, characters 7-14", Belt_List.getAssoc({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 224, characters 7-14", Belt_List.getAssoc({
       hd: [
         1,
         "a"
@@ -1364,19 +1364,19 @@ Nodetest.describe("Belt.List", () => {
   });
   Nodetest.test("head/tail etc.", () => {
     let succx = x => x + 1 | 0;
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 219, characters 6-13", [
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 230, characters 7-14", [
       Belt_List.head(length_10_id),
       Belt_List.tail(length_10_id)
     ], [
       0,
       Belt_List.drop(length_10_id, 1)
     ]);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 223, characters 7-14", Belt_List.head(/* [] */0), undefined);
-    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 224, characters 10-17", () => Belt_List.headExn(/* [] */0));
-    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 225, characters 10-17", () => {
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 231, characters 7-14", Belt_List.head(/* [] */0), undefined);
+    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 232, characters 10-17", () => Belt_List.headExn(/* [] */0));
+    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 233, characters 10-17", () => {
       Belt_List.tailExn(/* [] */0);
     });
-    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 226, characters 10-17", () => {
+    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 234, characters 10-17", () => {
       Belt_List.getExn({
         hd: 0,
         tl: {
@@ -1385,7 +1385,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }, -1);
     });
-    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 227, characters 10-17", () => {
+    Node_test_util.$$throw("File \"belt_list_ntest.res\", line 235, characters 10-17", () => {
       Belt_List.getExn({
         hd: 0,
         tl: {
@@ -1394,7 +1394,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }, 2);
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 228, characters 7-14", Belt_List.map({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 236, characters 7-14", Belt_List.map({
       hd: 0,
       tl: {
         hd: 1,
@@ -1413,25 +1413,25 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 229, characters 7-14", Belt_List.headExn({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 237, characters 7-14", Belt_List.headExn({
       hd: 1,
       tl: /* [] */0
     }), 1);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 230, characters 7-14", Belt_List.tailExn({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 238, characters 7-14", Belt_List.tailExn({
       hd: 1,
       tl: /* [] */0
     }), /* [] */0);
-    Belt_List.forEachWithIndex(length_10_id, (i, x) => Node_test_util.eq("File \"belt_list_ntest.res\", line 231, characters 50-57", Belt_List.get(length_10_id, i), x));
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 232, characters 7-14", Belt_List.tail(/* [] */0), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 233, characters 7-14", Belt_List.drop(/* [] */0, 3), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 234, characters 7-14", Belt_List.mapWithIndex(/* [] */0, (i, x) => i + x | 0), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 235, characters 7-14", Belt_List.get(length_10_id, -1), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 236, characters 7-14", Belt_List.get(length_10_id, 12), undefined);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 237, characters 7-14", sum(/* [] */0), 0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 238, characters 7-14", sum(length_10_id), 45);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 239, characters 7-14", Belt_List.makeBy(0, id), /* [] */0);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 241, characters 6-13", Belt_List.reverse(Belt_List.reverse(length_10_id)), length_10_id);
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 246, characters 6-13", Belt_List.reverse(Belt_List.reverse(length_8_id)), length_8_id);
+    Belt_List.forEachWithIndex(length_10_id, (i, x) => Node_test_util.eq("File \"belt_list_ntest.res\", line 239, characters 50-57", Belt_List.get(length_10_id, i), x));
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 240, characters 7-14", Belt_List.tail(/* [] */0), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 241, characters 7-14", Belt_List.drop(/* [] */0, 3), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 242, characters 7-14", Belt_List.mapWithIndex(/* [] */0, (i, x) => i + x | 0), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 243, characters 7-14", Belt_List.get(length_10_id, -1), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 244, characters 7-14", Belt_List.get(length_10_id, 12), undefined);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 245, characters 7-14", sum(/* [] */0), 0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 246, characters 7-14", sum(length_10_id), 45);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 247, characters 7-14", Belt_List.makeBy(0, id), /* [] */0);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 248, characters 7-14", Belt_List.reverse(Belt_List.reverse(length_10_id)), length_10_id);
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 249, characters 7-14", Belt_List.reverse(Belt_List.reverse(length_8_id)), length_8_id);
     Node_test_util.eq("File \"belt_list_ntest.res\", line 250, characters 7-14", Belt_List.reverse(/* [] */0), /* [] */0);
     Node_test_util.eq("File \"belt_list_ntest.res\", line 251, characters 7-14", Belt_List.reverse(Belt_List.mapReverse(length_10_id, succx)), Belt_List.map(length_10_id, succx));
     Node_test_util.eq("File \"belt_list_ntest.res\", line 252, characters 7-14", Belt_List.reduce(length_10_id, 0, add), 45);
@@ -1791,7 +1791,7 @@ Nodetest.describe("Belt.List", () => {
       }
     }, (x, y) => x === y), false);
   });
-  Nodetest.test("add", () => Node_test_util.eq("File \"belt_list_ntest.res\", line 308, characters 7-14", {
+  Nodetest.test("add", () => Node_test_util.eq("File \"belt_list_ntest.res\", line 307, characters 7-14", {
     hd: 2,
     tl: {
       hd: 3,
@@ -1805,7 +1805,7 @@ Nodetest.describe("Belt.List", () => {
     }
   }));
   Nodetest.test("cmp", () => {
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 312, characters 7-14", Belt_List.cmp({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 311, characters 7-14", Belt_List.cmp({
       hd: 1,
       tl: {
         hd: 2,
@@ -1827,7 +1827,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, Caml.int_compare) > 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 313, characters 7-14", Belt_List.cmp({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 312, characters 7-14", Belt_List.cmp({
       hd: 1,
       tl: {
         hd: 2,
@@ -1849,7 +1849,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, Caml.int_compare) > 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 314, characters 7-14", Belt_List.cmp({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 313, characters 7-14", Belt_List.cmp({
       hd: 1,
       tl: {
         hd: 2,
@@ -1871,7 +1871,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, Caml.int_compare) < 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 315, characters 7-14", Belt_List.cmp({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 314, characters 7-14", Belt_List.cmp({
       hd: 1,
       tl: {
         hd: 2,
@@ -1890,7 +1890,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, Caml.int_compare) > 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 316, characters 7-14", Belt_List.cmp({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 315, characters 7-14", Belt_List.cmp({
       hd: 1,
       tl: {
         hd: 2,
@@ -1909,7 +1909,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, Caml.int_compare) === 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 317, characters 7-14", Belt_List.cmp({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 316, characters 7-14", Belt_List.cmp({
       hd: 1,
       tl: {
         hd: 2,
@@ -1930,16 +1930,16 @@ Nodetest.describe("Belt.List", () => {
     }, Caml.int_compare) > 0);
   });
   Nodetest.test("cmpByLength", () => {
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 321, characters 7-14", Belt_List.cmpByLength(/* [] */0, /* [] */0) === 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 322, characters 7-14", Belt_List.cmpByLength({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 320, characters 7-14", Belt_List.cmpByLength(/* [] */0, /* [] */0) === 0);
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 321, characters 7-14", Belt_List.cmpByLength({
       hd: 1,
       tl: /* [] */0
     }, /* [] */0) > 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 323, characters 7-14", Belt_List.cmpByLength(/* [] */0, {
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 322, characters 7-14", Belt_List.cmpByLength(/* [] */0, {
       hd: 1,
       tl: /* [] */0
     }) < 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 324, characters 7-14", Belt_List.cmpByLength({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 323, characters 7-14", Belt_List.cmpByLength({
       hd: 1,
       tl: {
         hd: 2,
@@ -1949,7 +1949,7 @@ Nodetest.describe("Belt.List", () => {
       hd: 1,
       tl: /* [] */0
     }) > 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 325, characters 7-14", Belt_List.cmpByLength({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 324, characters 7-14", Belt_List.cmpByLength({
       hd: 1,
       tl: /* [] */0
     }, {
@@ -1959,7 +1959,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     }) < 0);
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 326, characters 7-14", Belt_List.cmpByLength({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 325, characters 7-14", Belt_List.cmpByLength({
       hd: 1,
       tl: {
         hd: 3,
@@ -1974,7 +1974,7 @@ Nodetest.describe("Belt.List", () => {
     }) === 0);
   });
   Nodetest.test("makeBy", () => {
-    let makeTest = n => Node_test_util.eq("File \"belt_list_ntest.res\", line 330, characters 27-34", Belt_List.make(n, 3), Belt_List.makeBy(n, param => 3));
+    let makeTest = n => Node_test_util.eq("File \"belt_list_ntest.res\", line 329, characters 27-34", Belt_List.make(n, 3), Belt_List.makeBy(n, param => 3));
     makeTest(0);
     makeTest(1);
     makeTest(2);
@@ -1982,7 +1982,7 @@ Nodetest.describe("Belt.List", () => {
   });
   Nodetest.test("sort", () => {
     let cmp = (a, b) => a - b | 0;
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 340, characters 7-14", Belt_List.sort({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 339, characters 7-14", Belt_List.sort({
       hd: 5,
       tl: {
         hd: 4,
@@ -2007,7 +2007,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     });
-    Node_test_util.eq("File \"belt_list_ntest.res\", line 341, characters 7-14", Belt_List.sort({
+    Node_test_util.eq("File \"belt_list_ntest.res\", line 340, characters 7-14", Belt_List.sort({
       hd: 3,
       tl: {
         hd: 9,
@@ -2040,7 +2040,7 @@ Nodetest.describe("Belt.List", () => {
     });
   });
   Nodetest.test("eq", () => {
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 345, characters 7-14", !Belt_List.eq({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 344, characters 7-14", !Belt_List.eq({
       hd: 1,
       tl: {
         hd: 2,
@@ -2056,7 +2056,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     }, (x, y) => x === y));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 346, characters 7-14", Belt_List.eq({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 345, characters 7-14", Belt_List.eq({
       hd: 1,
       tl: {
         hd: 2,
@@ -2075,7 +2075,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, (x, y) => x === y));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 347, characters 7-14", !Belt_List.eq({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 346, characters 7-14", !Belt_List.eq({
       hd: 1,
       tl: {
         hd: 2,
@@ -2094,7 +2094,7 @@ Nodetest.describe("Belt.List", () => {
         }
       }
     }, (x, y) => x === y));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 348, characters 7-14", !Belt_List.eq({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 347, characters 7-14", !Belt_List.eq({
       hd: 1,
       tl: {
         hd: 2,
@@ -2159,7 +2159,7 @@ Nodetest.describe("Belt.List", () => {
         tl: /* [] */0
       }
     }));
-    Node_test_util.ok("File \"belt_list_ntest.res\", line 376, characters 6-13", Belt_List.keepMap({
+    Node_test_util.ok("File \"belt_list_ntest.res\", line 377, characters 6-13", Belt_List.keepMap({
       hd: 1,
       tl: {
         hd: 2,
diff --git a/jscomp/test/bigint_test.js b/jscomp/test/bigint_test.js
index f48666d8cb..e864d3cd76 100644
--- a/jscomp/test/bigint_test.js
+++ b/jscomp/test/bigint_test.js
@@ -106,65 +106,65 @@ eq("File \"bigint_test.res\", line 36, characters 5-12", Caml.bigint_compare(1n,
 
 eq("File \"bigint_test.res\", line 37, characters 5-12", Caml_obj.compare(1n, 1n), 0);
 
-eq("File \"bigint_test.res\", line 38, characters 5-12", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, true);
+eq("File \"bigint_test.res\", line 39, characters 4-11", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, true);
 
-eq("File \"bigint_test.res\", line 39, characters 5-12", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), true);
+eq("File \"bigint_test.res\", line 47, characters 4-11", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), true);
 
-eq("File \"bigint_test.res\", line 40, characters 5-12", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n, false);
+eq("File \"bigint_test.res\", line 55, characters 4-11", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n, false);
 
-eq("File \"bigint_test.res\", line 41, characters 5-12", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n), false);
+eq("File \"bigint_test.res\", line 63, characters 4-11", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n), false);
 
-eq("File \"bigint_test.res\", line 42, characters 5-12", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, false);
+eq("File \"bigint_test.res\", line 71, characters 4-11", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, false);
 
-eq("File \"bigint_test.res\", line 43, characters 5-12", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), false);
+eq("File \"bigint_test.res\", line 79, characters 4-11", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), false);
 
-eq("File \"bigint_test.res\", line 44, characters 5-12", (
+eq("File \"bigint_test.res\", line 87, characters 4-11", (
   1n !== 1n ? (
       1n !== 2n ? 0n : 4n
     ) : 3n
 ) === 3n, true);
 
-eq("File \"bigint_test.res\", line 49, characters 5-12", Caml_obj.equal(1n !== 1n ? (
+eq("File \"bigint_test.res\", line 99, characters 4-11", Caml_obj.equal(1n !== 1n ? (
     1n !== 2n ? 0n : 4n
   ) : 3n, 3n), true);
 
-eq("File \"bigint_test.res\", line 54, characters 5-12", (
+eq("File \"bigint_test.res\", line 111, characters 4-11", (
   -1n !== -2n ? (
       -1n !== -1n ? 0n : 3n
     ) : 4n
 ) === 3n, true);
 
-eq("File \"bigint_test.res\", line 59, characters 5-12", Caml_obj.equal(-1n !== -1n ? (
+eq("File \"bigint_test.res\", line 123, characters 4-11", Caml_obj.equal(-1n !== -1n ? (
     -1n !== 2n ? 0n : 4n
   ) : 3n, 3n), true);
 
-eq("File \"bigint_test.res\", line 64, characters 5-12", (
+eq("File \"bigint_test.res\", line 135, characters 4-11", (
   -1000n !== -1000n ? (
       -1000n !== -2n ? 0n : 4n
     ) : 3n
 ) === 3n, true);
 
-eq("File \"bigint_test.res\", line 69, characters 5-12", Caml_obj.equal(-1000n !== -1000n ? (
+eq("File \"bigint_test.res\", line 147, characters 4-11", Caml_obj.equal(-1000n !== -1000n ? (
     -1000n !== -2n ? 0n : 4n
   ) : 3n, 3n), true);
 
-eq("File \"bigint_test.res\", line 74, characters 5-12", 9n & 1n, 1n);
+eq("File \"bigint_test.res\", line 158, characters 5-12", 9n & 1n, 1n);
 
-eq("File \"bigint_test.res\", line 75, characters 5-12", 9n | 1n, 9n);
+eq("File \"bigint_test.res\", line 159, characters 5-12", 9n | 1n, 9n);
 
-eq("File \"bigint_test.res\", line 76, characters 5-12", 9n ^ 1n, 8n);
+eq("File \"bigint_test.res\", line 160, characters 5-12", 9n ^ 1n, 8n);
 
-eq("File \"bigint_test.res\", line 77, characters 5-12", (9n << 1n), 18n);
+eq("File \"bigint_test.res\", line 161, characters 5-12", (9n << 1n), 18n);
 
-eq("File \"bigint_test.res\", line 78, characters 5-12", (9n << -1n), 4n);
+eq("File \"bigint_test.res\", line 162, characters 5-12", (9n << -1n), 4n);
 
-eq("File \"bigint_test.res\", line 79, characters 5-12", (9n >> 1n), 4n);
+eq("File \"bigint_test.res\", line 163, characters 5-12", (9n >> 1n), 4n);
 
-eq("File \"bigint_test.res\", line 80, characters 5-12", (9n >> -1n), 18n);
+eq("File \"bigint_test.res\", line 164, characters 5-12", (9n >> -1n), 18n);
 
-eq("File \"bigint_test.res\", line 81, characters 5-12", (-9n >> 1n), -5n);
+eq("File \"bigint_test.res\", line 165, characters 5-12", (-9n >> 1n), -5n);
 
-eq("File \"bigint_test.res\", line 82, characters 5-12", (-9n >> -1n), -18n);
+eq("File \"bigint_test.res\", line 166, characters 5-12", (-9n >> -1n), -18n);
 
 Mt.from_pair_suites("Bigint_test", suites.contents);
 
diff --git a/jscomp/test/bs_set_int_test.js b/jscomp/test/bs_set_int_test.js
index 7cf08f608f..e2eeb5971f 100644
--- a/jscomp/test/bs_set_int_test.js
+++ b/jscomp/test/bs_set_int_test.js
@@ -66,7 +66,7 @@ let v = Belt_SetInt.fromArray($$Array.append(range(100, 1000), revRange(400, 150
 
 let i = range(100, 1500);
 
-b("File \"bs_set_int_test.res\", line 37, characters 4-11", Belt_SetInt.eq(Belt_SetInt.fromArray(i), v));
+b("File \"bs_set_int_test.res\", line 36, characters 4-11", Belt_SetInt.eq(Belt_SetInt.fromArray(i), v));
 
 let match = Belt_SetInt.partition(v, x => x % 3 === 0);
 
@@ -86,45 +86,45 @@ let nl = l;
 
 let nr = r;
 
-b("File \"bs_set_int_test.res\", line 50, characters 4-11", Belt_SetInt.eq(match[0], nl));
+b("File \"bs_set_int_test.res\", line 49, characters 4-11", Belt_SetInt.eq(match[0], nl));
 
-b("File \"bs_set_int_test.res\", line 51, characters 4-11", Belt_SetInt.eq(match[1], nr));
+b("File \"bs_set_int_test.res\", line 50, characters 4-11", Belt_SetInt.eq(match[1], nr));
 
 let i$2 = range(50, 100);
 
 let s = Belt_SetInt.intersect(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200)));
 
-b("File \"bs_set_int_test.res\", line 55, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$2), s));
+b("File \"bs_set_int_test.res\", line 54, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$2), s));
 
 let i$3 = range(1, 200);
 
 let s$1 = Belt_SetInt.union(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200)));
 
-b("File \"bs_set_int_test.res\", line 66, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$3), s$1));
+b("File \"bs_set_int_test.res\", line 65, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$3), s$1));
 
 let i$4 = range(1, 49);
 
 let s$2 = Belt_SetInt.diff(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200)));
 
-b("File \"bs_set_int_test.res\", line 77, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$4), s$2));
+b("File \"bs_set_int_test.res\", line 76, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$4), s$2));
 
 let i$5 = revRange(50, 100);
 
 let s$3 = Belt_SetInt.intersect(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200)));
 
-b("File \"bs_set_int_test.res\", line 88, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$5), s$3));
+b("File \"bs_set_int_test.res\", line 87, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$5), s$3));
 
 let i$6 = revRange(1, 200);
 
 let s$4 = Belt_SetInt.union(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200)));
 
-b("File \"bs_set_int_test.res\", line 99, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$6), s$4));
+b("File \"bs_set_int_test.res\", line 98, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$6), s$4));
 
 let i$7 = revRange(1, 49);
 
 let s$5 = Belt_SetInt.diff(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200)));
 
-b("File \"bs_set_int_test.res\", line 110, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$7), s$5));
+b("File \"bs_set_int_test.res\", line 109, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$7), s$5));
 
 let ss = [
   1,
@@ -156,11 +156,11 @@ function approx(loc, x, y) {
   b(loc, x === y);
 }
 
-eq("File \"bs_set_int_test.res\", line 125, characters 5-12", Belt_SetInt.reduce(v$1, 0, (x, y) => x + y | 0), Belt_Array.reduce(ss, 0, (prim0, prim1) => prim0 + prim1 | 0));
+eq("File \"bs_set_int_test.res\", line 124, characters 5-12", Belt_SetInt.reduce(v$1, 0, (x, y) => x + y | 0), Belt_Array.reduce(ss, 0, (prim0, prim1) => prim0 + prim1 | 0));
 
-approx("File \"bs_set_int_test.res\", line 126, characters 9-16", -1, minv);
+approx("File \"bs_set_int_test.res\", line 125, characters 9-16", -1, minv);
 
-approx("File \"bs_set_int_test.res\", line 127, characters 9-16", 222, maxv);
+approx("File \"bs_set_int_test.res\", line 126, characters 9-16", 222, maxv);
 
 let v$2 = Belt_SetInt.remove(v$1, 3);
 
@@ -168,9 +168,9 @@ let minv$1 = Belt_SetInt.minimum(v$2);
 
 let maxv$1 = Belt_SetInt.maximum(v$2);
 
-eq("File \"bs_set_int_test.res\", line 130, characters 5-12", minv$1, -1);
+eq("File \"bs_set_int_test.res\", line 129, characters 5-12", minv$1, -1);
 
-eq("File \"bs_set_int_test.res\", line 131, characters 5-12", maxv$1, 222);
+eq("File \"bs_set_int_test.res\", line 130, characters 5-12", maxv$1, 222);
 
 let v$3 = Belt_SetInt.remove(v$2, 222);
 
@@ -178,9 +178,9 @@ let minv$2 = Belt_SetInt.minimum(v$3);
 
 let maxv$2 = Belt_SetInt.maximum(v$3);
 
-eq("File \"bs_set_int_test.res\", line 134, characters 5-12", minv$2, -1);
+eq("File \"bs_set_int_test.res\", line 133, characters 5-12", minv$2, -1);
 
-eq("File \"bs_set_int_test.res\", line 135, characters 5-12", maxv$2, 33);
+eq("File \"bs_set_int_test.res\", line 134, characters 5-12", maxv$2, 33);
 
 let v$4 = Belt_SetInt.remove(v$3, -1);
 
@@ -188,9 +188,9 @@ let minv$3 = Belt_SetInt.minimum(v$4);
 
 let maxv$3 = Belt_SetInt.maximum(v$4);
 
-eq("File \"bs_set_int_test.res\", line 138, characters 5-12", minv$3, 0);
+eq("File \"bs_set_int_test.res\", line 137, characters 5-12", minv$3, 0);
 
-eq("File \"bs_set_int_test.res\", line 139, characters 5-12", maxv$3, 33);
+eq("File \"bs_set_int_test.res\", line 138, characters 5-12", maxv$3, 33);
 
 let v$5 = Belt_SetInt.remove(v$4, 0);
 
@@ -204,7 +204,7 @@ let v$9 = Belt_SetInt.remove(v$8, 4);
 
 let v$10 = Belt_SetInt.remove(v$9, 1);
 
-b("File \"bs_set_int_test.res\", line 146, characters 4-11", Belt_SetInt.isEmpty(v$10));
+b("File \"bs_set_int_test.res\", line 145, characters 4-11", Belt_SetInt.isEmpty(v$10));
 
 let v$11 = Belt_Array.makeByAndShuffle(1000000, i => i);
 
@@ -218,7 +218,7 @@ let xx = Belt_Array.reduce(firstHalf, u$1, Belt_SetInt.remove);
 
 Belt_SetInt.checkInvariantInternal(u$1);
 
-b("File \"bs_set_int_test.res\", line 158, characters 4-11", Belt_SetInt.eq(Belt_SetInt.union(Belt_SetInt.fromArray(firstHalf), xx), u$1));
+b("File \"bs_set_int_test.res\", line 157, characters 4-11", Belt_SetInt.eq(Belt_SetInt.union(Belt_SetInt.fromArray(firstHalf), xx), u$1));
 
 let aa = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100));
 
@@ -228,17 +228,17 @@ let cc = Belt_SetInt.fromArray(Array_data_util.randomRange(120, 200));
 
 let dd = Belt_SetInt.union(aa, cc);
 
-b("File \"bs_set_int_test.res\", line 171, characters 4-11", Belt_SetInt.subset(aa, bb));
+b("File \"bs_set_int_test.res\", line 170, characters 4-11", Belt_SetInt.subset(aa, bb));
 
-b("File \"bs_set_int_test.res\", line 172, characters 4-11", Belt_SetInt.subset(dd, bb));
+b("File \"bs_set_int_test.res\", line 171, characters 4-11", Belt_SetInt.subset(dd, bb));
 
-b("File \"bs_set_int_test.res\", line 173, characters 4-11", Belt_SetInt.subset(Belt_SetInt.add(dd, 200), bb));
+b("File \"bs_set_int_test.res\", line 172, characters 4-11", Belt_SetInt.subset(Belt_SetInt.add(dd, 200), bb));
 
-b("File \"bs_set_int_test.res\", line 174, characters 4-11", Belt_SetInt.add(dd, 200) === dd);
+b("File \"bs_set_int_test.res\", line 173, characters 4-11", Belt_SetInt.add(dd, 200) === dd);
 
-b("File \"bs_set_int_test.res\", line 175, characters 4-11", Belt_SetInt.add(dd, 0) === dd);
+b("File \"bs_set_int_test.res\", line 174, characters 4-11", Belt_SetInt.add(dd, 0) === dd);
 
-b("File \"bs_set_int_test.res\", line 176, characters 4-11", !Belt_SetInt.subset(Belt_SetInt.add(dd, 201), bb));
+b("File \"bs_set_int_test.res\", line 175, characters 4-11", !Belt_SetInt.subset(Belt_SetInt.add(dd, 201), bb));
 
 let aa$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100));
 
@@ -250,13 +250,13 @@ let dd$1 = Belt_SetInt.remove(bb$1, 99);
 
 let ee = Belt_SetInt.add(dd$1, 101);
 
-b("File \"bs_set_int_test.res\", line 185, characters 4-11", Belt_SetInt.eq(aa$1, bb$1));
+b("File \"bs_set_int_test.res\", line 184, characters 4-11", Belt_SetInt.eq(aa$1, bb$1));
 
-b("File \"bs_set_int_test.res\", line 186, characters 4-11", !Belt_SetInt.eq(aa$1, cc$1));
+b("File \"bs_set_int_test.res\", line 185, characters 4-11", !Belt_SetInt.eq(aa$1, cc$1));
 
-b("File \"bs_set_int_test.res\", line 187, characters 4-11", !Belt_SetInt.eq(dd$1, cc$1));
+b("File \"bs_set_int_test.res\", line 186, characters 4-11", !Belt_SetInt.eq(dd$1, cc$1));
 
-b("File \"bs_set_int_test.res\", line 188, characters 4-11", !Belt_SetInt.eq(bb$1, ee));
+b("File \"bs_set_int_test.res\", line 187, characters 4-11", !Belt_SetInt.eq(bb$1, ee));
 
 let a1 = Belt_SetInt.mergeMany(undefined, Array_data_util.randomRange(0, 100));
 
@@ -272,17 +272,17 @@ let a5 = match$2[1];
 
 let a4 = match$2[0];
 
-b("File \"bs_set_int_test.res\", line 197, characters 4-11", Belt_SetInt.eq(a1, Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100))));
+b("File \"bs_set_int_test.res\", line 196, characters 4-11", Belt_SetInt.eq(a1, Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100))));
 
-b("File \"bs_set_int_test.res\", line 198, characters 4-11", Belt_SetInt.eq(a2, a3));
+b("File \"bs_set_int_test.res\", line 197, characters 4-11", Belt_SetInt.eq(a2, a3));
 
-b("File \"bs_set_int_test.res\", line 199, characters 4-11", match$1[1]);
+b("File \"bs_set_int_test.res\", line 198, characters 4-11", match$1[1]);
 
-b("File \"bs_set_int_test.res\", line 200, characters 4-11", Belt_SetInt.eq(a3, a4));
+b("File \"bs_set_int_test.res\", line 199, characters 4-11", Belt_SetInt.eq(a3, a4));
 
 let a6 = Belt_SetInt.remove(Belt_SetInt.removeMany(a1, Array_data_util.randomRange(0, 39)), 40);
 
-b("File \"bs_set_int_test.res\", line 202, characters 4-11", Belt_SetInt.eq(a5, a6));
+b("File \"bs_set_int_test.res\", line 201, characters 4-11", Belt_SetInt.eq(a5, a6));
 
 let a7 = Belt_SetInt.remove(a1, 40);
 
@@ -292,29 +292,29 @@ let match$4 = match$3[0];
 
 let a9 = match$4[1];
 
-b("File \"bs_set_int_test.res\", line 205, characters 4-11", !match$3[1]);
+b("File \"bs_set_int_test.res\", line 204, characters 4-11", !match$3[1]);
 
-b("File \"bs_set_int_test.res\", line 206, characters 4-11", Belt_SetInt.eq(a4, match$4[0]));
+b("File \"bs_set_int_test.res\", line 205, characters 4-11", Belt_SetInt.eq(a4, match$4[0]));
 
-b("File \"bs_set_int_test.res\", line 207, characters 4-11", Belt_SetInt.eq(a5, a9));
+b("File \"bs_set_int_test.res\", line 206, characters 4-11", Belt_SetInt.eq(a5, a9));
 
 let a10 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(42, 2000));
 
-eq("File \"bs_set_int_test.res\", line 209, characters 5-12", Belt_SetInt.size(a10), 1);
+eq("File \"bs_set_int_test.res\", line 208, characters 5-12", Belt_SetInt.size(a10), 1);
 
 let a11 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(0, 2000));
 
-b("File \"bs_set_int_test.res\", line 211, characters 4-11", Belt_SetInt.isEmpty(a11));
+b("File \"bs_set_int_test.res\", line 210, characters 4-11", Belt_SetInt.isEmpty(a11));
 
 let match$5 = Belt_SetInt.split(undefined, 0);
 
 let match$6 = match$5[0];
 
-b("File \"bs_set_int_test.res\", line 216, characters 4-11", Belt_SetInt.isEmpty(match$6[0]));
+b("File \"bs_set_int_test.res\", line 215, characters 4-11", Belt_SetInt.isEmpty(match$6[0]));
 
-b("File \"bs_set_int_test.res\", line 217, characters 4-11", Belt_SetInt.isEmpty(match$6[1]));
+b("File \"bs_set_int_test.res\", line 216, characters 4-11", Belt_SetInt.isEmpty(match$6[1]));
 
-b("File \"bs_set_int_test.res\", line 218, characters 4-11", !match$5[1]);
+b("File \"bs_set_int_test.res\", line 217, characters 4-11", !match$5[1]);
 
 let v$12 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000));
 
@@ -339,23 +339,23 @@ let counted = Belt_Array.reduce(us, 0, (acc, x) => {
   }
 });
 
-eq("File \"bs_set_int_test.res\", line 235, characters 5-12", counted, 1001);
+eq("File \"bs_set_int_test.res\", line 234, characters 5-12", counted, 1001);
 
-b("File \"bs_set_int_test.res\", line 236, characters 4-11", Belt_SetInt.eq(v$12, v0));
+b("File \"bs_set_int_test.res\", line 235, characters 4-11", Belt_SetInt.eq(v$12, v0));
 
-b("File \"bs_set_int_test.res\", line 237, characters 4-11", Belt_SetInt.cmp(v$12, v0) === 0);
+b("File \"bs_set_int_test.res\", line 236, characters 4-11", Belt_SetInt.cmp(v$12, v0) === 0);
 
-b("File \"bs_set_int_test.res\", line 238, characters 4-11", Belt_SetInt.cmp(v$12, v1) < 0);
+b("File \"bs_set_int_test.res\", line 237, characters 4-11", Belt_SetInt.cmp(v$12, v1) < 0);
 
-b("File \"bs_set_int_test.res\", line 239, characters 4-11", Belt_SetInt.cmp(v$12, v2) > 0);
+b("File \"bs_set_int_test.res\", line 238, characters 4-11", Belt_SetInt.cmp(v$12, v2) > 0);
 
-b("File \"bs_set_int_test.res\", line 240, characters 4-11", Belt_SetInt.subset(v3, v0));
+b("File \"bs_set_int_test.res\", line 239, characters 4-11", Belt_SetInt.subset(v3, v0));
 
-b("File \"bs_set_int_test.res\", line 241, characters 4-11", !Belt_SetInt.subset(v1, v0));
+b("File \"bs_set_int_test.res\", line 240, characters 4-11", !Belt_SetInt.subset(v1, v0));
 
-eq("File \"bs_set_int_test.res\", line 242, characters 5-12", Belt_SetInt.get(v$12, 30), 30);
+eq("File \"bs_set_int_test.res\", line 241, characters 5-12", Belt_SetInt.get(v$12, 30), 30);
 
-eq("File \"bs_set_int_test.res\", line 243, characters 5-12", Belt_SetInt.get(v$12, 3000), undefined);
+eq("File \"bs_set_int_test.res\", line 242, characters 5-12", Belt_SetInt.get(v$12, 3000), undefined);
 
 Mt.from_pair_suites("Bs_set_int_test", suites.contents);
 
diff --git a/jscomp/test/chn_test.js b/jscomp/test/chn_test.js
index 306622fec7..17e05c04c4 100644
--- a/jscomp/test/chn_test.js
+++ b/jscomp/test/chn_test.js
@@ -43,17 +43,17 @@ function convert(s) {
         RE_EXN_ID: "Assert_failure",
         _1: [
           "chn_test.res",
-          17,
-          14
+          18,
+          16
         ]
       }
     });
   }));
 }
 
-eq("File \"chn_test.res\", line 24, characters 4-11", "你好，\n世界", "你好，\n世界");
+eq("File \"chn_test.res\", line 26, characters 4-11", "你好，\n世界", "你好，\n世界");
 
-eq("File \"chn_test.res\", line 30, characters 4-11", convert("汉字是世界上最美丽的character"), {
+eq("File \"chn_test.res\", line 32, characters 4-11", convert("汉字是世界上最美丽的character"), {
   hd: 27721,
   tl: {
     hd: 23383,
@@ -112,7 +112,7 @@ eq("File \"chn_test.res\", line 30, characters 4-11", convert("汉字是世界
   }
 });
 
-eq("File \"chn_test.res\", line 54, characters 5-12", convert("\x3f\x3fa"), {
+eq("File \"chn_test.res\", line 56, characters 5-12", convert("\x3f\x3fa"), {
   hd: 63,
   tl: {
     hd: 63,
@@ -123,7 +123,7 @@ eq("File \"chn_test.res\", line 54, characters 5-12", convert("\x3f\x3fa"), {
   }
 });
 
-eq("File \"chn_test.res\", line 55, characters 5-12", convert("??a"), {
+eq("File \"chn_test.res\", line 57, characters 5-12", convert("??a"), {
   hd: 63,
   tl: {
     hd: 63,
@@ -134,7 +134,7 @@ eq("File \"chn_test.res\", line 55, characters 5-12", convert("??a"), {
   }
 });
 
-eq("File \"chn_test.res\", line 56, characters 5-12", convert("\u003f\x3fa"), {
+eq("File \"chn_test.res\", line 58, characters 5-12", convert("\u003f\x3fa"), {
   hd: 63,
   tl: {
     hd: 63,
@@ -145,7 +145,7 @@ eq("File \"chn_test.res\", line 56, characters 5-12", convert("\u003f\x3fa"), {
   }
 });
 
-eq("File \"chn_test.res\", line 57, characters 5-12", convert("🚀🚀a"), {
+eq("File \"chn_test.res\", line 59, characters 5-12", convert("🚀🚀a"), {
   hd: 128640,
   tl: {
     hd: 128640,
@@ -156,7 +156,7 @@ eq("File \"chn_test.res\", line 57, characters 5-12", convert("🚀🚀a"), {
   }
 });
 
-eq("File \"chn_test.res\", line 58, characters 5-12", convert("\uD83D\uDE80a"), {
+eq("File \"chn_test.res\", line 60, characters 5-12", convert("\uD83D\uDE80a"), {
   hd: 128640,
   tl: {
     hd: 97,
@@ -164,7 +164,7 @@ eq("File \"chn_test.res\", line 58, characters 5-12", convert("\uD83D\uDE80a"),
   }
 });
 
-eq("File \"chn_test.res\", line 59, characters 5-12", convert("\uD83D\uDE80\x3f"), {
+eq("File \"chn_test.res\", line 61, characters 5-12", convert("\uD83D\uDE80\x3f"), {
   hd: 128640,
   tl: {
     hd: 63,
@@ -172,7 +172,7 @@ eq("File \"chn_test.res\", line 59, characters 5-12", convert("\uD83D\uDE80\x3f"
   }
 });
 
-eq("File \"chn_test.res\", line 63, characters 5-12", convert("\uD83D\uDE80\uD83D\uDE80a"), {
+eq("File \"chn_test.res\", line 65, characters 5-12", convert("\uD83D\uDE80\uD83D\uDE80a"), {
   hd: 128640,
   tl: {
     hd: 128640,
@@ -185,16 +185,16 @@ eq("File \"chn_test.res\", line 63, characters 5-12", convert("\uD83D\uDE80\uD83
 
 eq("No inline string length", "\uD83D\uDE80\0".length, 3);
 
-eq("File \"chn_test.res\", line 70, characters 4-11", Caml_string.get("\uD83D\uDE80\0", 0), 128640);
+eq("File \"chn_test.res\", line 72, characters 4-11", Caml_string.get("\uD83D\uDE80\0", 0), 128640);
 
-eq("File \"chn_test.res\", line 75, characters 5-12", Caml_string.get("🚀", 0), 128640);
+eq("File \"chn_test.res\", line 77, characters 5-12", Caml_string.get("🚀", 0), 128640);
 
-eq("File \"chn_test.res\", line 80, characters 5-12", convert("\uD83D\uDE80"), {
+eq("File \"chn_test.res\", line 82, characters 5-12", convert("\uD83D\uDE80"), {
   hd: 128640,
   tl: /* [] */0
 });
 
-eq("File \"chn_test.res\", line 81, characters 5-12", convert("\uD83D\uDE80\uD83D\uDE80"), {
+eq("File \"chn_test.res\", line 83, characters 5-12", convert("\uD83D\uDE80\uD83D\uDE80"), {
   hd: 128640,
   tl: {
     hd: 128640,
@@ -202,7 +202,7 @@ eq("File \"chn_test.res\", line 81, characters 5-12", convert("\uD83D\uDE80\uD83
   }
 });
 
-eq("File \"chn_test.res\", line 82, characters 5-12", convert(" \b\t\n\v\f\ra"), {
+eq("File \"chn_test.res\", line 84, characters 5-12", convert(" \b\t\n\v\f\ra"), {
   hd: 32,
   tl: {
     hd: 8,
@@ -228,7 +228,7 @@ eq("File \"chn_test.res\", line 82, characters 5-12", convert(" \b\t\n\v\f\ra"),
   }
 });
 
-eq("File \"chn_test.res\", line 89, characters 4-11", convert(" \b\t\n\v\f\r\"'\\\0a"), {
+eq("File \"chn_test.res\", line 90, characters 5-12", convert(" \b\t\n\v\f\r\"'\\\0a"), {
   hd: 32,
   tl: {
     hd: 8,
diff --git a/jscomp/test/earger_curry_test.js b/jscomp/test/earger_curry_test.js
index 8e6d741bff..c5cc837bc7 100644
--- a/jscomp/test/earger_curry_test.js
+++ b/jscomp/test/earger_curry_test.js
@@ -123,15 +123,15 @@ let c = g(0)(3, 4);
 
 let d = g(0)(3, 5);
 
-eq("File \"earger_curry_test.res\", line 141, characters 5-12", a, 10);
+eq("File \"earger_curry_test.res\", line 142, characters 5-12", a, 10);
 
-eq("File \"earger_curry_test.res\", line 142, characters 5-12", b, 11);
+eq("File \"earger_curry_test.res\", line 143, characters 5-12", b, 11);
 
-eq("File \"earger_curry_test.res\", line 143, characters 5-12", c, 10);
+eq("File \"earger_curry_test.res\", line 144, characters 5-12", c, 10);
 
-eq("File \"earger_curry_test.res\", line 144, characters 5-12", d, 11);
+eq("File \"earger_curry_test.res\", line 145, characters 5-12", d, 11);
 
-eq("File \"earger_curry_test.res\", line 145, characters 5-12", all_v.contents, {
+eq("File \"earger_curry_test.res\", line 146, characters 5-12", all_v.contents, {
   hd: 8,
   tl: {
     hd: 6,
diff --git a/jscomp/test/float_test.js b/jscomp/test/float_test.js
index e463d77f83..5242aa892f 100644
--- a/jscomp/test/float_test.js
+++ b/jscomp/test/float_test.js
@@ -172,16 +172,16 @@ function float_greaterequal(x, y) {
 
 let generic_greaterequal = Caml_obj.greaterequal;
 
-eq("File \"float_test.res\", line 59, characters 5-12", Pervasives.classify_float(3), "FP_normal");
+eq("File \"float_test.res\", line 57, characters 5-12", Pervasives.classify_float(3), "FP_normal");
 
-eq("File \"float_test.res\", line 60, characters 5-12", Caml_float.modf_float(-3.125), [
+eq("File \"float_test.res\", line 58, characters 5-12", Caml_float.modf_float(-3.125), [
   -0.125,
   -3
 ]);
 
 let match$3 = Caml_float.modf_float(Number.NaN);
 
-eq("File \"float_test.res\", line 62, characters 4-11", [
+eq("File \"float_test.res\", line 60, characters 4-11", [
   Number.isNaN(match$3[0]),
   Number.isNaN(match$3[1])
 ], [
@@ -189,7 +189,7 @@ eq("File \"float_test.res\", line 62, characters 4-11", [
   true
 ]);
 
-eq("File \"float_test.res\", line 71, characters 4-11", $$Array.map(x => {
+eq("File \"float_test.res\", line 68, characters 5-12", $$Array.map(x => {
   if (x > 0) {
     return 1;
   } else if (x < 0) {
@@ -216,101 +216,101 @@ eq("File \"float_test.res\", line 71, characters 4-11", $$Array.map(x => {
   1
 ]);
 
-eq("File \"float_test.res\", line 83, characters 5-12", Caml_float.copysign_float(-3, 0), 3);
+eq("File \"float_test.res\", line 77, characters 5-12", Caml_float.copysign_float(-3, 0), 3);
 
-eq("File \"float_test.res\", line 84, characters 5-12", Caml_float.copysign_float(3, 0), 3);
+eq("File \"float_test.res\", line 78, characters 5-12", Caml_float.copysign_float(3, 0), 3);
 
-eq("File \"float_test.res\", line 85, characters 5-12", Math.log10(10), 1);
+eq("File \"float_test.res\", line 79, characters 5-12", Math.log10(10), 1);
 
-eq("File \"float_test.res\", line 86, characters 5-12", Caml_float.expm1_float(0), 0);
+eq("File \"float_test.res\", line 80, characters 5-12", Caml_float.expm1_float(0), 0);
 
-eq("File \"float_test.res\", line 87, characters 5-12", Number("3.0"), 3.0);
+eq("File \"float_test.res\", line 81, characters 5-12", Number("3.0"), 3.0);
 
-approx("File \"float_test.res\", line 88, characters 9-16", Caml_float.expm1_float(2), 6.38905609893065);
+approx("File \"float_test.res\", line 82, characters 9-16", Caml_float.expm1_float(2), 6.38905609893065);
 
-eq("File \"float_test.res\", line 89, characters 5-12", Caml.float_compare(NaN, NaN), 0);
+eq("File \"float_test.res\", line 83, characters 5-12", Caml.float_compare(NaN, NaN), 0);
 
-eq("File \"float_test.res\", line 90, characters 5-12", Caml_obj.compare(NaN, NaN), 0);
+eq("File \"float_test.res\", line 84, characters 5-12", Caml_obj.compare(NaN, NaN), 0);
 
-eq("File \"float_test.res\", line 91, characters 5-12", Caml.float_compare(NaN, Pervasives.neg_infinity), -1);
+eq("File \"float_test.res\", line 85, characters 5-12", Caml.float_compare(NaN, Pervasives.neg_infinity), -1);
 
-eq("File \"float_test.res\", line 92, characters 5-12", Caml_obj.compare(NaN, Pervasives.neg_infinity), -1);
+eq("File \"float_test.res\", line 86, characters 5-12", Caml_obj.compare(NaN, Pervasives.neg_infinity), -1);
 
-eq("File \"float_test.res\", line 93, characters 5-12", Caml.float_compare(Pervasives.neg_infinity, NaN), 1);
+eq("File \"float_test.res\", line 87, characters 5-12", Caml.float_compare(Pervasives.neg_infinity, NaN), 1);
 
-eq("File \"float_test.res\", line 94, characters 5-12", Caml_obj.compare(Pervasives.neg_infinity, NaN), 1);
+eq("File \"float_test.res\", line 88, characters 5-12", Caml_obj.compare(Pervasives.neg_infinity, NaN), 1);
 
-eq("File \"float_test.res\", line 95, characters 5-12", NaN === NaN, false);
+eq("File \"float_test.res\", line 89, characters 5-12", NaN === NaN, false);
 
-eq("File \"float_test.res\", line 96, characters 5-12", Caml_obj.equal(NaN, NaN), false);
+eq("File \"float_test.res\", line 90, characters 5-12", Caml_obj.equal(NaN, NaN), false);
 
-eq("File \"float_test.res\", line 97, characters 5-12", 4.2 === NaN, false);
+eq("File \"float_test.res\", line 91, characters 5-12", 4.2 === NaN, false);
 
-eq("File \"float_test.res\", line 98, characters 5-12", Caml_obj.equal(4.2, NaN), false);
+eq("File \"float_test.res\", line 92, characters 5-12", Caml_obj.equal(4.2, NaN), false);
 
-eq("File \"float_test.res\", line 99, characters 5-12", NaN === 4.2, false);
+eq("File \"float_test.res\", line 93, characters 5-12", NaN === 4.2, false);
 
-eq("File \"float_test.res\", line 100, characters 5-12", Caml_obj.equal(NaN, 4.2), false);
+eq("File \"float_test.res\", line 94, characters 5-12", Caml_obj.equal(NaN, 4.2), false);
 
-eq("File \"float_test.res\", line 101, characters 5-12", NaN !== NaN, true);
+eq("File \"float_test.res\", line 95, characters 5-12", NaN !== NaN, true);
 
-eq("File \"float_test.res\", line 102, characters 5-12", Caml_obj.notequal(NaN, NaN), true);
+eq("File \"float_test.res\", line 96, characters 5-12", Caml_obj.notequal(NaN, NaN), true);
 
-eq("File \"float_test.res\", line 103, characters 5-12", 4.2 !== NaN, true);
+eq("File \"float_test.res\", line 97, characters 5-12", 4.2 !== NaN, true);
 
-eq("File \"float_test.res\", line 104, characters 5-12", Caml_obj.notequal(4.2, NaN), true);
+eq("File \"float_test.res\", line 98, characters 5-12", Caml_obj.notequal(4.2, NaN), true);
 
-eq("File \"float_test.res\", line 105, characters 5-12", NaN !== 4.2, true);
+eq("File \"float_test.res\", line 99, characters 5-12", NaN !== 4.2, true);
 
-eq("File \"float_test.res\", line 106, characters 5-12", Caml_obj.notequal(NaN, 4.2), true);
+eq("File \"float_test.res\", line 100, characters 5-12", Caml_obj.notequal(NaN, 4.2), true);
 
-eq("File \"float_test.res\", line 107, characters 5-12", NaN < NaN, false);
+eq("File \"float_test.res\", line 101, characters 5-12", NaN < NaN, false);
 
-eq("File \"float_test.res\", line 108, characters 5-12", Caml_obj.lessthan(NaN, NaN), false);
+eq("File \"float_test.res\", line 102, characters 5-12", Caml_obj.lessthan(NaN, NaN), false);
 
-eq("File \"float_test.res\", line 109, characters 5-12", 4.2 < NaN, false);
+eq("File \"float_test.res\", line 103, characters 5-12", 4.2 < NaN, false);
 
-eq("File \"float_test.res\", line 110, characters 5-12", Caml_obj.lessthan(4.2, NaN), false);
+eq("File \"float_test.res\", line 104, characters 5-12", Caml_obj.lessthan(4.2, NaN), false);
 
-eq("File \"float_test.res\", line 111, characters 5-12", NaN < 4.2, false);
+eq("File \"float_test.res\", line 105, characters 5-12", NaN < 4.2, false);
 
-eq("File \"float_test.res\", line 112, characters 5-12", Caml_obj.lessthan(NaN, 4.2), false);
+eq("File \"float_test.res\", line 106, characters 5-12", Caml_obj.lessthan(NaN, 4.2), false);
 
-eq("File \"float_test.res\", line 113, characters 5-12", NaN > NaN, false);
+eq("File \"float_test.res\", line 107, characters 5-12", NaN > NaN, false);
 
-eq("File \"float_test.res\", line 114, characters 5-12", Caml_obj.greaterthan(NaN, NaN), false);
+eq("File \"float_test.res\", line 108, characters 5-12", Caml_obj.greaterthan(NaN, NaN), false);
 
-eq("File \"float_test.res\", line 115, characters 5-12", 4.2 > NaN, false);
+eq("File \"float_test.res\", line 109, characters 5-12", 4.2 > NaN, false);
 
-eq("File \"float_test.res\", line 116, characters 5-12", Caml_obj.greaterthan(4.2, NaN), false);
+eq("File \"float_test.res\", line 110, characters 5-12", Caml_obj.greaterthan(4.2, NaN), false);
 
-eq("File \"float_test.res\", line 117, characters 5-12", NaN > 4.2, false);
+eq("File \"float_test.res\", line 111, characters 5-12", NaN > 4.2, false);
 
-eq("File \"float_test.res\", line 118, characters 5-12", Caml_obj.greaterthan(NaN, 4.2), false);
+eq("File \"float_test.res\", line 112, characters 5-12", Caml_obj.greaterthan(NaN, 4.2), false);
 
-eq("File \"float_test.res\", line 119, characters 5-12", NaN <= NaN, false);
+eq("File \"float_test.res\", line 113, characters 5-12", NaN <= NaN, false);
 
-eq("File \"float_test.res\", line 120, characters 5-12", Caml_obj.lessequal(NaN, NaN), false);
+eq("File \"float_test.res\", line 114, characters 5-12", Caml_obj.lessequal(NaN, NaN), false);
 
-eq("File \"float_test.res\", line 121, characters 5-12", 4.2 <= NaN, false);
+eq("File \"float_test.res\", line 115, characters 5-12", 4.2 <= NaN, false);
 
-eq("File \"float_test.res\", line 122, characters 5-12", Caml_obj.lessequal(4.2, NaN), false);
+eq("File \"float_test.res\", line 116, characters 5-12", Caml_obj.lessequal(4.2, NaN), false);
 
-eq("File \"float_test.res\", line 123, characters 5-12", NaN <= 4.2, false);
+eq("File \"float_test.res\", line 117, characters 5-12", NaN <= 4.2, false);
 
-eq("File \"float_test.res\", line 124, characters 5-12", Caml_obj.lessequal(NaN, 4.2), false);
+eq("File \"float_test.res\", line 118, characters 5-12", Caml_obj.lessequal(NaN, 4.2), false);
 
-eq("File \"float_test.res\", line 125, characters 5-12", NaN >= NaN, false);
+eq("File \"float_test.res\", line 119, characters 5-12", NaN >= NaN, false);
 
-eq("File \"float_test.res\", line 126, characters 5-12", Caml_obj.greaterequal(NaN, NaN), false);
+eq("File \"float_test.res\", line 120, characters 5-12", Caml_obj.greaterequal(NaN, NaN), false);
 
-eq("File \"float_test.res\", line 127, characters 5-12", 4.2 >= NaN, false);
+eq("File \"float_test.res\", line 121, characters 5-12", 4.2 >= NaN, false);
 
-eq("File \"float_test.res\", line 128, characters 5-12", Caml_obj.greaterequal(4.2, NaN), false);
+eq("File \"float_test.res\", line 122, characters 5-12", Caml_obj.greaterequal(4.2, NaN), false);
 
-eq("File \"float_test.res\", line 129, characters 5-12", NaN >= 4.2, false);
+eq("File \"float_test.res\", line 123, characters 5-12", NaN >= 4.2, false);
 
-eq("File \"float_test.res\", line 130, characters 5-12", Caml_obj.greaterequal(NaN, 4.2), false);
+eq("File \"float_test.res\", line 124, characters 5-12", Caml_obj.greaterequal(NaN, 4.2), false);
 
 let match$4 = Caml_float.modf_float(32.3);
 
diff --git a/jscomp/test/gpr_1667_test.js b/jscomp/test/gpr_1667_test.js
index 9da1661ecb..91ee789e76 100644
--- a/jscomp/test/gpr_1667_test.js
+++ b/jscomp/test/gpr_1667_test.js
@@ -26,7 +26,7 @@ function eq(loc, x, y) {
   };
 }
 
-eq("File \"gpr_1667_test.res\", line 24, characters 5-12", 0, 0);
+eq("File \"gpr_1667_test.res\", line 25, characters 5-12", 0, 0);
 
 Mt.from_pair_suites("Gpr_1667_test", suites.contents);
 
diff --git a/jscomp/test/gpr_5218_test.js b/jscomp/test/gpr_5218_test.js
index 9d13cb0be4..98cb8e6eb6 100644
--- a/jscomp/test/gpr_5218_test.js
+++ b/jscomp/test/gpr_5218_test.js
@@ -25,7 +25,7 @@ function test(x) {
   }
 }
 
-Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 11, characters 27-34", test({
+Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 11, characters 29-36", test({
   NAME: 1,
   VAL: 3
 }), {
@@ -33,7 +33,7 @@ Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 11, characters 2
   VAL: 3
 });
 
-Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 13, characters 27-34", test({
+Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 13, characters 29-36", test({
   NAME: 2,
   VAL: 3
 }), {
diff --git a/jscomp/test/int32_test.js b/jscomp/test/int32_test.js
index de01fef604..d22572f2f9 100644
--- a/jscomp/test/int32_test.js
+++ b/jscomp/test/int32_test.js
@@ -199,9 +199,9 @@ function eq(loc, x, y) {
   Mt.eq_suites(test_id, suites, loc, x, y);
 }
 
-eq("File \"int32_test.res\", line 170, characters 5-12", Caml_float.int_bits_of_float(0.3), 1050253722);
+eq("File \"int32_test.res\", line 176, characters 5-12", Caml_float.int_bits_of_float(0.3), 1050253722);
 
-eq("File \"int32_test.res\", line 171, characters 5-12", Caml_float.int_float_of_bits(1050253722), 0.300000011920928955);
+eq("File \"int32_test.res\", line 177, characters 5-12", Caml_float.int_float_of_bits(1050253722), 0.300000011920928955);
 
 Mt.from_pair_suites("Int32_test", suites.contents);
 
diff --git a/jscomp/test/int64_mul_div_test.js b/jscomp/test/int64_mul_div_test.js
index e2c3036e63..ffb2920e65 100644
--- a/jscomp/test/int64_mul_div_test.js
+++ b/jscomp/test/int64_mul_div_test.js
@@ -1644,7 +1644,7 @@ Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pa
     ],
     tl: {
       hd: [
-        "File \"int64_mul_div_test.res\", line 263, characters 19-26",
+        "File \"int64_mul_div_test.res\", line 256, characters 19-26",
         () => ({
           TAG: "Eq",
           _0: Caml_int64.to_float(Int64.max_int),
diff --git a/jscomp/test/int64_test.js b/jscomp/test/int64_test.js
index fa1dbbd745..fb275fde6f 100644
--- a/jscomp/test/int64_test.js
+++ b/jscomp/test/int64_test.js
@@ -1044,7 +1044,7 @@ let suites = Pervasives.$at({
                                 ],
                                 tl: {
                                   hd: [
-                                    "File \"int64_test.res\", line 277, characters 7-14",
+                                    "File \"int64_test.res\", line 275, characters 7-14",
                                     () => ({
                                       TAG: "Eq",
                                       _0: Int64.min_int,
@@ -1053,7 +1053,7 @@ let suites = Pervasives.$at({
                                   ],
                                   tl: {
                                     hd: [
-                                      "File \"int64_test.res\", line 279, characters 8-15",
+                                      "File \"int64_test.res\", line 277, characters 8-15",
                                       () => ({
                                         TAG: "Eq",
                                         _0: Int64.max_int,
@@ -1773,7 +1773,7 @@ let suites = Pervasives.$at({
                                                         ],
                                                         tl: {
                                                           hd: [
-                                                            "File \"int64_test.res\", line 526, characters 7-14",
+                                                            "File \"int64_test.res\", line 524, characters 7-14",
                                                             () => ({
                                                               TAG: "Eq",
                                                               _0: [
@@ -1926,7 +1926,7 @@ let suites = Pervasives.$at({
                                                                               ],
                                                                               tl: {
                                                                                 hd: [
-                                                                                  "File \"int64_test.res\", line 553, characters 8-15",
+                                                                                  "File \"int64_test.res\", line 551, characters 8-15",
                                                                                   () => ({
                                                                                     TAG: "Eq",
                                                                                     _0: Caml_int64.add(Int64.max_int, Int64.max_int),
@@ -1938,7 +1938,7 @@ let suites = Pervasives.$at({
                                                                                 ],
                                                                                 tl: {
                                                                                   hd: [
-                                                                                    "File \"int64_test.res\", line 563, characters 8-15",
+                                                                                    "File \"int64_test.res\", line 561, characters 8-15",
                                                                                     () => ({
                                                                                       TAG: "Eq",
                                                                                       _0: Caml_int64.add(Int64.min_int, Int64.min_int),
@@ -1947,7 +1947,7 @@ let suites = Pervasives.$at({
                                                                                   ],
                                                                                   tl: {
                                                                                     hd: [
-                                                                                      "File \"int64_test.res\", line 573, characters 8-15",
+                                                                                      "File \"int64_test.res\", line 571, characters 8-15",
                                                                                       () => ({
                                                                                         TAG: "Eq",
                                                                                         _0: Caml_int64.neg_one,
@@ -2041,39 +2041,39 @@ function id(loc, x) {
   }
 }
 
-eq("File \"int64_test.res\", line 629, characters 5-12", Caml_int64.bits_of_float(0.3), [
+eq("File \"int64_test.res\", line 633, characters 5-12", Caml_int64.bits_of_float(0.3), [
   1070805811,
   858993459
 ]);
 
-eq("File \"int64_test.res\", line 630, characters 5-12", Caml_int64.float_of_bits([
+eq("File \"int64_test.res\", line 634, characters 5-12", Caml_int64.float_of_bits([
   1070805811,
   858993459
 ]), 0.3);
 
-id("File \"int64_test.res\", line 631, characters 5-12", Caml_int64.neg_one);
+id("File \"int64_test.res\", line 635, characters 5-12", Caml_int64.neg_one);
 
-id("File \"int64_test.res\", line 632, characters 5-12", [
+id("File \"int64_test.res\", line 636, characters 5-12", [
   -1,
   4294967196
 ]);
 
-id("File \"int64_test.res\", line 633, characters 5-12", [
+id("File \"int64_test.res\", line 637, characters 5-12", [
   0,
   4294967295
 ]);
 
-id("File \"int64_test.res\", line 634, characters 5-12", [
+id("File \"int64_test.res\", line 638, characters 5-12", [
   0,
   536870911
 ]);
 
-id("File \"int64_test.res\", line 635, characters 5-12", [
+id("File \"int64_test.res\", line 639, characters 5-12", [
   0,
   536870655
 ]);
 
-eq("File \"int64_test.res\", line 637, characters 4-11", Caml_int64.div(Int64.min_int, [
+eq("File \"int64_test.res\", line 641, characters 4-11", Caml_int64.div(Int64.min_int, [
   0,
   10
 ]), [
@@ -2081,24 +2081,24 @@ eq("File \"int64_test.res\", line 637, characters 4-11", Caml_int64.div(Int64.mi
   858993460
 ]);
 
-eq("File \"int64_test.res\", line 645, characters 4-11", Caml_int64.to_string(Caml_int64.div(Int64.min_int, [
+eq("File \"int64_test.res\", line 649, characters 4-11", Caml_int64.to_string(Caml_int64.div(Int64.min_int, [
   0,
   10
 ])), "-922337203685477580");
 
-eq("File \"int64_test.res\", line 653, characters 4-11", Caml_int64.mul(Int64.min_int, [
+eq("File \"int64_test.res\", line 657, characters 4-11", Caml_int64.mul(Int64.min_int, [
   0,
   10
 ]), Caml_int64.zero);
 
-eq("File \"int64_test.res\", line 661, characters 4-11", Caml_int64.mul([
+eq("File \"int64_test.res\", line 665, characters 4-11", Caml_int64.mul([
   0,
   10
 ], Int64.min_int), Caml_int64.zero);
 
-eq("File \"int64_test.res\", line 669, characters 4-11", Caml_int64.mul(Caml_int64.one, Int64.min_int), Int64.min_int);
+eq("File \"int64_test.res\", line 673, characters 4-11", Caml_int64.mul(Caml_int64.one, Int64.min_int), Int64.min_int);
 
-eq("File \"int64_test.res\", line 677, characters 4-11", Caml_int64.mul(Int64.max_int, [
+eq("File \"int64_test.res\", line 681, characters 4-11", Caml_int64.mul(Int64.max_int, [
   0,
   10
 ]), [
@@ -2106,14 +2106,14 @@ eq("File \"int64_test.res\", line 677, characters 4-11", Caml_int64.mul(Int64.ma
   4294967286
 ]);
 
-eq("File \"int64_test.res\", line 685, characters 4-11", Caml_int64.succ(Int64.max_int), Int64.min_int);
+eq("File \"int64_test.res\", line 689, characters 4-11", Caml_int64.succ(Int64.max_int), Int64.min_int);
 
-eq("File \"int64_test.res\", line 693, characters 4-11", Caml_int64.succ(Int64.min_int), [
+eq("File \"int64_test.res\", line 697, characters 4-11", Caml_int64.succ(Int64.min_int), [
   -2147483648,
   1
 ]);
 
-eq("File \"int64_test.res\", line 700, characters 5-12", Caml_int64.succ([
+eq("File \"int64_test.res\", line 704, characters 5-12", Caml_int64.succ([
   0,
   4294967295
 ]), [
diff --git a/jscomp/test/js_json_test.js b/jscomp/test/js_json_test.js
index e9af1d1c3b..e0959fb9ca 100644
--- a/jscomp/test/js_json_test.js
+++ b/jscomp/test/js_json_test.js
@@ -96,8 +96,8 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", () => {
           RE_EXN_ID: "Assert_failure",
           _1: [
             "js_json_test.res",
-            37,
-            19
+            38,
+            21
           ]
         }
       });
@@ -110,8 +110,8 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", () => {
         RE_EXN_ID: "Assert_failure",
         _1: [
           "js_json_test.res",
-          37,
-          19
+          38,
+          21
         ]
       }
     });
@@ -122,7 +122,7 @@ add_test("File \"js_json_test.res\", line 22, characters 11-18", () => {
   };
 });
 
-eq("File \"js_json_test.res\", line 48, characters 5-12", Js_json.test(v, "Object"), true);
+eq("File \"js_json_test.res\", line 50, characters 5-12", Js_json.test(v, "Object"), true);
 
 let json = JSON.parse(JSON.stringify(null));
 
@@ -130,20 +130,20 @@ let ty = Js_json.classify(json);
 
 if (typeof ty !== "object") {
   if (ty === "JSONNull") {
-    add_test("File \"js_json_test.res\", line 55, characters 24-31", () => ({
+    add_test("File \"js_json_test.res\", line 57, characters 24-31", () => ({
       TAG: "Ok",
       _0: true
     }));
   } else {
     console.log(ty);
-    add_test("File \"js_json_test.res\", line 58, characters 11-18", () => ({
+    add_test("File \"js_json_test.res\", line 60, characters 11-18", () => ({
       TAG: "Ok",
       _0: false
     }));
   }
 } else {
   console.log(ty);
-  add_test("File \"js_json_test.res\", line 58, characters 11-18", () => ({
+  add_test("File \"js_json_test.res\", line 60, characters 11-18", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -154,14 +154,14 @@ let json$1 = JSON.parse(JSON.stringify("test string"));
 let ty$1 = Js_json.classify(json$1);
 
 if (typeof ty$1 !== "object") {
-  add_test("File \"js_json_test.res\", line 68, characters 16-23", () => ({
+  add_test("File \"js_json_test.res\", line 70, characters 16-23", () => ({
     TAG: "Ok",
     _0: false
   }));
 } else if (ty$1.TAG === "JSONString") {
-  eq("File \"js_json_test.res\", line 67, characters 26-33", ty$1._0, "test string");
+  eq("File \"js_json_test.res\", line 69, characters 26-33", ty$1._0, "test string");
 } else {
-  add_test("File \"js_json_test.res\", line 68, characters 16-23", () => ({
+  add_test("File \"js_json_test.res\", line 70, characters 16-23", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -176,11 +176,11 @@ let exit = 0;
 if (typeof ty$2 !== "object" || ty$2.TAG !== "JSONNumber") {
   exit = 1;
 } else {
-  eq("File \"js_json_test.res\", line 77, characters 26-33", ty$2._0, 1.23456789);
+  eq("File \"js_json_test.res\", line 79, characters 26-33", ty$2._0, 1.23456789);
 }
 
 if (exit === 1) {
-  add_test("File \"js_json_test.res\", line 78, characters 18-25", () => ({
+  add_test("File \"js_json_test.res\", line 80, characters 18-25", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -195,11 +195,11 @@ let exit$1 = 0;
 if (typeof ty$3 !== "object" || ty$3.TAG !== "JSONNumber") {
   exit$1 = 1;
 } else {
-  eq("File \"js_json_test.res\", line 87, characters 26-33", ty$3._0 | 0, -1347440721);
+  eq("File \"js_json_test.res\", line 89, characters 26-33", ty$3._0 | 0, -1347440721);
 }
 
 if (exit$1 === 1) {
-  add_test("File \"js_json_test.res\", line 88, characters 18-25", () => ({
+  add_test("File \"js_json_test.res\", line 90, characters 18-25", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -209,18 +209,18 @@ function test(v) {
   let json = JSON.parse(JSON.stringify(v));
   let ty = Js_json.classify(json);
   if (typeof ty === "object") {
-    return add_test("File \"js_json_test.res\", line 100, characters 18-25", () => ({
+    return add_test("File \"js_json_test.res\", line 102, characters 18-25", () => ({
       TAG: "Ok",
       _0: false
     }));
   }
   switch (ty) {
     case "JSONFalse" :
-      return eq("File \"js_json_test.res\", line 99, characters 24-31", false, v);
+      return eq("File \"js_json_test.res\", line 101, characters 24-31", false, v);
     case "JSONTrue" :
-      return eq("File \"js_json_test.res\", line 98, characters 23-30", true, v);
+      return eq("File \"js_json_test.res\", line 100, characters 23-30", true, v);
     default:
-      return add_test("File \"js_json_test.res\", line 100, characters 18-25", () => ({
+      return add_test("File \"js_json_test.res\", line 102, characters 18-25", () => ({
         TAG: "Ok",
         _0: false
       }));
@@ -240,7 +240,7 @@ function option_get(x) {
       RE_EXN_ID: "Assert_failure",
       _1: [
         "js_json_test.res",
-        111,
+        113,
         12
       ]
     }
@@ -258,7 +258,7 @@ let json$4 = JSON.parse(JSON.stringify(dict));
 let ty$4 = Js_json.classify(json$4);
 
 if (typeof ty$4 !== "object") {
-  add_test("File \"js_json_test.res\", line 142, characters 16-23", () => ({
+  add_test("File \"js_json_test.res\", line 144, characters 16-23", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -266,45 +266,45 @@ if (typeof ty$4 !== "object") {
   let x = ty$4._0;
   let ta = Js_json.classify(option_get(Js_dict.get(x, "a")));
   if (typeof ta !== "object") {
-    add_test("File \"js_json_test.res\", line 140, characters 18-25", () => ({
+    add_test("File \"js_json_test.res\", line 142, characters 18-25", () => ({
       TAG: "Ok",
       _0: false
     }));
   } else if (ta.TAG === "JSONString") {
     if (ta._0 !== "test string") {
-      add_test("File \"js_json_test.res\", line 131, characters 15-22", () => ({
+      add_test("File \"js_json_test.res\", line 133, characters 15-22", () => ({
         TAG: "Ok",
         _0: false
       }));
     } else {
       let ty$5 = Js_json.classify(option_get(Js_dict.get(x, "b")));
       if (typeof ty$5 !== "object") {
-        add_test("File \"js_json_test.res\", line 137, characters 22-29", () => ({
+        add_test("File \"js_json_test.res\", line 139, characters 22-29", () => ({
           TAG: "Ok",
           _0: false
         }));
       } else if (ty$5.TAG === "JSONNumber") {
         let b = ty$5._0;
-        add_test("File \"js_json_test.res\", line 136, characters 38-45", () => ({
+        add_test("File \"js_json_test.res\", line 138, characters 38-45", () => ({
           TAG: "Approx",
           _0: 123.0,
           _1: b
         }));
       } else {
-        add_test("File \"js_json_test.res\", line 137, characters 22-29", () => ({
+        add_test("File \"js_json_test.res\", line 139, characters 22-29", () => ({
           TAG: "Ok",
           _0: false
         }));
       }
     }
   } else {
-    add_test("File \"js_json_test.res\", line 140, characters 18-25", () => ({
+    add_test("File \"js_json_test.res\", line 142, characters 18-25", () => ({
       TAG: "Ok",
       _0: false
     }));
   }
 } else {
-  add_test("File \"js_json_test.res\", line 142, characters 16-23", () => ({
+  add_test("File \"js_json_test.res\", line 144, characters 16-23", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -428,11 +428,11 @@ let json$5 = JSON.parse(JSON.stringify($$Array.map(prim => prim, [
   "string 2"
 ])));
 
-eq_at_i("File \"js_json_test.res\", line 199, characters 10-17", json$5, 0, "String", "string 0");
+eq_at_i("File \"js_json_test.res\", line 198, characters 10-17", json$5, 0, "String", "string 0");
 
-eq_at_i("File \"js_json_test.res\", line 200, characters 10-17", json$5, 1, "String", "string 1");
+eq_at_i("File \"js_json_test.res\", line 199, characters 10-17", json$5, 1, "String", "string 1");
 
-eq_at_i("File \"js_json_test.res\", line 201, characters 10-17", json$5, 2, "String", "string 2");
+eq_at_i("File \"js_json_test.res\", line 200, characters 10-17", json$5, 2, "String", "string 2");
 
 let json$6 = JSON.parse(JSON.stringify([
   "string 0",
@@ -440,11 +440,11 @@ let json$6 = JSON.parse(JSON.stringify([
   "string 2"
 ]));
 
-eq_at_i("File \"js_json_test.res\", line 208, characters 10-17", json$6, 0, "String", "string 0");
+eq_at_i("File \"js_json_test.res\", line 207, characters 10-17", json$6, 0, "String", "string 0");
 
-eq_at_i("File \"js_json_test.res\", line 209, characters 10-17", json$6, 1, "String", "string 1");
+eq_at_i("File \"js_json_test.res\", line 208, characters 10-17", json$6, 1, "String", "string 1");
 
-eq_at_i("File \"js_json_test.res\", line 210, characters 10-17", json$6, 2, "String", "string 2");
+eq_at_i("File \"js_json_test.res\", line 209, characters 10-17", json$6, 2, "String", "string 2");
 
 let a = [
   1.0000001,
@@ -454,11 +454,11 @@ let a = [
 
 let json$7 = JSON.parse(JSON.stringify(a));
 
-eq_at_i("File \"js_json_test.res\", line 219, characters 10-17", json$7, 0, "Number", Caml_array.get(a, 0));
+eq_at_i("File \"js_json_test.res\", line 218, characters 10-17", json$7, 0, "Number", Caml_array.get(a, 0));
 
-eq_at_i("File \"js_json_test.res\", line 220, characters 10-17", json$7, 1, "Number", Caml_array.get(a, 1));
+eq_at_i("File \"js_json_test.res\", line 219, characters 10-17", json$7, 1, "Number", Caml_array.get(a, 1));
 
-eq_at_i("File \"js_json_test.res\", line 221, characters 10-17", json$7, 2, "Number", Caml_array.get(a, 2));
+eq_at_i("File \"js_json_test.res\", line 220, characters 10-17", json$7, 2, "Number", Caml_array.get(a, 2));
 
 let a$1 = [
   0,
@@ -468,11 +468,11 @@ let a$1 = [
 
 let json$8 = JSON.parse(JSON.stringify($$Array.map(prim => prim, a$1)));
 
-eq_at_i("File \"js_json_test.res\", line 230, characters 10-17", json$8, 0, "Number", Caml_array.get(a$1, 0));
+eq_at_i("File \"js_json_test.res\", line 229, characters 10-17", json$8, 0, "Number", Caml_array.get(a$1, 0));
 
-eq_at_i("File \"js_json_test.res\", line 231, characters 10-17", json$8, 1, "Number", Caml_array.get(a$1, 1));
+eq_at_i("File \"js_json_test.res\", line 230, characters 10-17", json$8, 1, "Number", Caml_array.get(a$1, 1));
 
-eq_at_i("File \"js_json_test.res\", line 232, characters 10-17", json$8, 2, "Number", Caml_array.get(a$1, 2));
+eq_at_i("File \"js_json_test.res\", line 231, characters 10-17", json$8, 2, "Number", Caml_array.get(a$1, 2));
 
 let a$2 = [
   true,
@@ -482,11 +482,11 @@ let a$2 = [
 
 let json$9 = JSON.parse(JSON.stringify(a$2));
 
-eq_at_i("File \"js_json_test.res\", line 241, characters 10-17", json$9, 0, "Boolean", Caml_array.get(a$2, 0));
+eq_at_i("File \"js_json_test.res\", line 240, characters 10-17", json$9, 0, "Boolean", Caml_array.get(a$2, 0));
 
-eq_at_i("File \"js_json_test.res\", line 242, characters 10-17", json$9, 1, "Boolean", Caml_array.get(a$2, 1));
+eq_at_i("File \"js_json_test.res\", line 241, characters 10-17", json$9, 1, "Boolean", Caml_array.get(a$2, 1));
 
-eq_at_i("File \"js_json_test.res\", line 243, characters 10-17", json$9, 2, "Boolean", Caml_array.get(a$2, 2));
+eq_at_i("File \"js_json_test.res\", line 242, characters 10-17", json$9, 2, "Boolean", Caml_array.get(a$2, 2));
 
 function make_d(s, i) {
   let d = {};
@@ -505,40 +505,40 @@ let json$10 = JSON.parse(JSON.stringify(a$3));
 let ty$6 = Js_json.classify(json$10);
 
 if (typeof ty$6 !== "object") {
-  add_test("File \"js_json_test.res\", line 271, characters 16-23", () => ({
+  add_test("File \"js_json_test.res\", line 270, characters 16-23", () => ({
     TAG: "Ok",
     _0: false
   }));
 } else if (ty$6.TAG === "JSONArray") {
   let ty$7 = Js_json.classify(Caml_array.get(ty$6._0, 1));
   if (typeof ty$7 !== "object") {
-    add_test("File \"js_json_test.res\", line 269, characters 18-25", () => ({
+    add_test("File \"js_json_test.res\", line 268, characters 18-25", () => ({
       TAG: "Ok",
       _0: false
     }));
   } else if (ty$7.TAG === "JSONObject") {
     let ty$8 = Js_json.classify(option_get(Js_dict.get(ty$7._0, "a")));
     if (typeof ty$8 !== "object") {
-      add_test("File \"js_json_test.res\", line 267, characters 20-27", () => ({
+      add_test("File \"js_json_test.res\", line 266, characters 20-27", () => ({
         TAG: "Ok",
         _0: false
       }));
     } else if (ty$8.TAG === "JSONString") {
-      eq("File \"js_json_test.res\", line 266, characters 35-42", ty$8._0, "bbb");
+      eq("File \"js_json_test.res\", line 265, characters 35-42", ty$8._0, "bbb");
     } else {
-      add_test("File \"js_json_test.res\", line 267, characters 20-27", () => ({
+      add_test("File \"js_json_test.res\", line 266, characters 20-27", () => ({
         TAG: "Ok",
         _0: false
       }));
     }
   } else {
-    add_test("File \"js_json_test.res\", line 269, characters 18-25", () => ({
+    add_test("File \"js_json_test.res\", line 268, characters 18-25", () => ({
       TAG: "Ok",
       _0: false
     }));
   }
 } else {
-  add_test("File \"js_json_test.res\", line 271, characters 16-23", () => ({
+  add_test("File \"js_json_test.res\", line 270, characters 16-23", () => ({
     TAG: "Ok",
     _0: false
   }));
@@ -546,24 +546,24 @@ if (typeof ty$6 !== "object") {
 
 try {
   JSON.parse("{{ A}");
-  add_test("File \"js_json_test.res\", line 279, characters 11-18", () => ({
+  add_test("File \"js_json_test.res\", line 278, characters 11-18", () => ({
     TAG: "Ok",
     _0: false
   }));
 } catch (exn) {
-  add_test("File \"js_json_test.res\", line 281, characters 17-24", () => ({
+  add_test("File \"js_json_test.res\", line 280, characters 17-24", () => ({
     TAG: "Ok",
     _0: true
   }));
 }
 
-eq("File \"js_json_test.res\", line 287, characters 12-19", JSON.stringify([
+eq("File \"js_json_test.res\", line 286, characters 12-19", JSON.stringify([
   1,
   2,
   3
 ]), "[1,2,3]");
 
-eq("File \"js_json_test.res\", line 290, characters 2-9", JSON.stringify({
+eq("File \"js_json_test.res\", line 289, characters 2-9", JSON.stringify({
   foo: 1,
   bar: "hello",
   baz: {
@@ -571,88 +571,88 @@ eq("File \"js_json_test.res\", line 290, characters 2-9", JSON.stringify({
   }
 }), "{\"foo\":1,\"bar\":\"hello\",\"baz\":{\"baaz\":10}}");
 
-eq("File \"js_json_test.res\", line 295, characters 12-19", JSON.stringify(null), "null");
+eq("File \"js_json_test.res\", line 294, characters 12-19", JSON.stringify(null), "null");
 
-eq("File \"js_json_test.res\", line 297, characters 12-19", JSON.stringify(undefined), undefined);
+eq("File \"js_json_test.res\", line 296, characters 12-19", JSON.stringify(undefined), undefined);
 
-eq("File \"js_json_test.res\", line 300, characters 5-12", Js_json.decodeString("test"), "test");
+eq("File \"js_json_test.res\", line 299, characters 5-12", Js_json.decodeString("test"), "test");
 
-eq("File \"js_json_test.res\", line 301, characters 5-12", Js_json.decodeString(true), undefined);
+eq("File \"js_json_test.res\", line 300, characters 5-12", Js_json.decodeString(true), undefined);
 
-eq("File \"js_json_test.res\", line 302, characters 5-12", Js_json.decodeString([]), undefined);
+eq("File \"js_json_test.res\", line 301, characters 5-12", Js_json.decodeString([]), undefined);
 
-eq("File \"js_json_test.res\", line 303, characters 5-12", Js_json.decodeString(null), undefined);
+eq("File \"js_json_test.res\", line 302, characters 5-12", Js_json.decodeString(null), undefined);
 
-eq("File \"js_json_test.res\", line 304, characters 5-12", Js_json.decodeString({}), undefined);
+eq("File \"js_json_test.res\", line 303, characters 5-12", Js_json.decodeString({}), undefined);
 
-eq("File \"js_json_test.res\", line 305, characters 5-12", Js_json.decodeString(1.23), undefined);
+eq("File \"js_json_test.res\", line 304, characters 5-12", Js_json.decodeString(1.23), undefined);
 
-eq("File \"js_json_test.res\", line 309, characters 5-12", Js_json.decodeNumber("test"), undefined);
+eq("File \"js_json_test.res\", line 308, characters 5-12", Js_json.decodeNumber("test"), undefined);
 
-eq("File \"js_json_test.res\", line 310, characters 5-12", Js_json.decodeNumber(true), undefined);
+eq("File \"js_json_test.res\", line 309, characters 5-12", Js_json.decodeNumber(true), undefined);
 
-eq("File \"js_json_test.res\", line 311, characters 5-12", Js_json.decodeNumber([]), undefined);
+eq("File \"js_json_test.res\", line 310, characters 5-12", Js_json.decodeNumber([]), undefined);
 
-eq("File \"js_json_test.res\", line 312, characters 5-12", Js_json.decodeNumber(null), undefined);
+eq("File \"js_json_test.res\", line 311, characters 5-12", Js_json.decodeNumber(null), undefined);
 
-eq("File \"js_json_test.res\", line 313, characters 5-12", Js_json.decodeNumber({}), undefined);
+eq("File \"js_json_test.res\", line 312, characters 5-12", Js_json.decodeNumber({}), undefined);
 
-eq("File \"js_json_test.res\", line 314, characters 5-12", Js_json.decodeNumber(1.23), 1.23);
+eq("File \"js_json_test.res\", line 313, characters 5-12", Js_json.decodeNumber(1.23), 1.23);
 
-eq("File \"js_json_test.res\", line 318, characters 5-12", Js_json.decodeObject("test"), undefined);
+eq("File \"js_json_test.res\", line 317, characters 5-12", Js_json.decodeObject("test"), undefined);
 
-eq("File \"js_json_test.res\", line 319, characters 5-12", Js_json.decodeObject(true), undefined);
+eq("File \"js_json_test.res\", line 318, characters 5-12", Js_json.decodeObject(true), undefined);
 
-eq("File \"js_json_test.res\", line 320, characters 5-12", Js_json.decodeObject([]), undefined);
+eq("File \"js_json_test.res\", line 319, characters 5-12", Js_json.decodeObject([]), undefined);
 
-eq("File \"js_json_test.res\", line 321, characters 5-12", Js_json.decodeObject(null), undefined);
+eq("File \"js_json_test.res\", line 320, characters 5-12", Js_json.decodeObject(null), undefined);
 
-eq("File \"js_json_test.res\", line 322, characters 5-12", Js_json.decodeObject({}), {});
+eq("File \"js_json_test.res\", line 321, characters 5-12", Js_json.decodeObject({}), {});
 
-eq("File \"js_json_test.res\", line 323, characters 5-12", Js_json.decodeObject(1.23), undefined);
+eq("File \"js_json_test.res\", line 322, characters 5-12", Js_json.decodeObject(1.23), undefined);
 
-eq("File \"js_json_test.res\", line 327, characters 5-12", Js_json.decodeArray("test"), undefined);
+eq("File \"js_json_test.res\", line 326, characters 5-12", Js_json.decodeArray("test"), undefined);
 
-eq("File \"js_json_test.res\", line 328, characters 5-12", Js_json.decodeArray(true), undefined);
+eq("File \"js_json_test.res\", line 327, characters 5-12", Js_json.decodeArray(true), undefined);
 
-eq("File \"js_json_test.res\", line 329, characters 5-12", Js_json.decodeArray([]), []);
+eq("File \"js_json_test.res\", line 328, characters 5-12", Js_json.decodeArray([]), []);
 
-eq("File \"js_json_test.res\", line 330, characters 5-12", Js_json.decodeArray(null), undefined);
+eq("File \"js_json_test.res\", line 329, characters 5-12", Js_json.decodeArray(null), undefined);
 
-eq("File \"js_json_test.res\", line 331, characters 5-12", Js_json.decodeArray({}), undefined);
+eq("File \"js_json_test.res\", line 330, characters 5-12", Js_json.decodeArray({}), undefined);
 
-eq("File \"js_json_test.res\", line 332, characters 5-12", Js_json.decodeArray(1.23), undefined);
+eq("File \"js_json_test.res\", line 331, characters 5-12", Js_json.decodeArray(1.23), undefined);
 
-eq("File \"js_json_test.res\", line 336, characters 5-12", Js_json.decodeBoolean("test"), undefined);
+eq("File \"js_json_test.res\", line 335, characters 5-12", Js_json.decodeBoolean("test"), undefined);
 
-eq("File \"js_json_test.res\", line 337, characters 5-12", Js_json.decodeBoolean(true), true);
+eq("File \"js_json_test.res\", line 336, characters 5-12", Js_json.decodeBoolean(true), true);
 
-eq("File \"js_json_test.res\", line 338, characters 5-12", Js_json.decodeBoolean([]), undefined);
+eq("File \"js_json_test.res\", line 337, characters 5-12", Js_json.decodeBoolean([]), undefined);
 
-eq("File \"js_json_test.res\", line 339, characters 5-12", Js_json.decodeBoolean(null), undefined);
+eq("File \"js_json_test.res\", line 338, characters 5-12", Js_json.decodeBoolean(null), undefined);
 
-eq("File \"js_json_test.res\", line 340, characters 5-12", Js_json.decodeBoolean({}), undefined);
+eq("File \"js_json_test.res\", line 339, characters 5-12", Js_json.decodeBoolean({}), undefined);
 
-eq("File \"js_json_test.res\", line 341, characters 5-12", Js_json.decodeBoolean(1.23), undefined);
+eq("File \"js_json_test.res\", line 340, characters 5-12", Js_json.decodeBoolean(1.23), undefined);
 
-eq("File \"js_json_test.res\", line 345, characters 5-12", Js_json.decodeNull("test"), undefined);
+eq("File \"js_json_test.res\", line 344, characters 5-12", Js_json.decodeNull("test"), undefined);
 
-eq("File \"js_json_test.res\", line 346, characters 5-12", Js_json.decodeNull(true), undefined);
+eq("File \"js_json_test.res\", line 345, characters 5-12", Js_json.decodeNull(true), undefined);
 
-eq("File \"js_json_test.res\", line 347, characters 5-12", Js_json.decodeNull([]), undefined);
+eq("File \"js_json_test.res\", line 346, characters 5-12", Js_json.decodeNull([]), undefined);
 
-eq("File \"js_json_test.res\", line 348, characters 5-12", Js_json.decodeNull(null), null);
+eq("File \"js_json_test.res\", line 347, characters 5-12", Js_json.decodeNull(null), null);
 
-eq("File \"js_json_test.res\", line 349, characters 5-12", Js_json.decodeNull({}), undefined);
+eq("File \"js_json_test.res\", line 348, characters 5-12", Js_json.decodeNull({}), undefined);
 
-eq("File \"js_json_test.res\", line 350, characters 5-12", Js_json.decodeNull(1.23), undefined);
+eq("File \"js_json_test.res\", line 349, characters 5-12", Js_json.decodeNull(1.23), undefined);
 
 function id(obj) {
   return Js_json.deserializeUnsafe(Js_json.serializeExn(obj));
 }
 
 function idtest(obj) {
-  eq("File \"js_json_test.res\", line 355, characters 23-30", obj, Js_json.deserializeUnsafe(Js_json.serializeExn(obj)));
+  eq("File \"js_json_test.res\", line 354, characters 23-30", obj, Js_json.deserializeUnsafe(Js_json.serializeExn(obj)));
 }
 
 idtest(undefined);
diff --git a/jscomp/test/js_string_test.js b/jscomp/test/js_string_test.js
index 47a498aede..d5b774d8e8 100644
--- a/jscomp/test/js_string_test.js
+++ b/jscomp/test/js_string_test.js
@@ -554,7 +554,7 @@ let suites_1 = {
                                                                                                           ],
                                                                                                           tl: {
                                                                                                             hd: [
-                                                                                                              "File \"js_string_test.res\", line 138, characters 5-12",
+                                                                                                              "File \"js_string_test.res\", line 135, characters 5-12",
                                                                                                               param => ({
                                                                                                                 TAG: "Ok",
                                                                                                                 _0: "ab".includes("a")
diff --git a/jscomp/test/lazy_test.js b/jscomp/test/lazy_test.js
index 9e6b8ca8fe..12d3c2aa67 100644
--- a/jscomp/test/lazy_test.js
+++ b/jscomp/test/lazy_test.js
@@ -171,7 +171,7 @@ Mt.from_pair_suites("Lazy_test", {
                   ],
                   tl: {
                     hd: [
-                      "File \"lazy_test.res\", line 95, characters 7-14",
+                      "File \"lazy_test.res\", line 98, characters 7-14",
                       () => ({
                         TAG: "Ok",
                         _0: Lazy.is_val(CamlinternalLazy.from_val(3))
@@ -179,7 +179,7 @@ Mt.from_pair_suites("Lazy_test", {
                     ],
                     tl: {
                       hd: [
-                        "File \"lazy_test.res\", line 96, characters 7-14",
+                        "File \"lazy_test.res\", line 99, characters 7-14",
                         () => ({
                           TAG: "Ok",
                           _0: !Lazy.is_val(CamlinternalLazy.from_fun(() => {
diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js
index 38aef77e7a..2b1ff3c81c 100644
--- a/jscomp/test/ocaml_re_test.js
+++ b/jscomp/test/ocaml_re_test.js
@@ -1077,7 +1077,7 @@ function split_at_match_rec(_l$p, _x) {
           RE_EXN_ID: "Assert_failure",
           _1: [
             "ocaml_re_test.res",
-            816,
+            815,
             16
           ]
         }
@@ -1887,7 +1887,7 @@ function colorize(c, regexp) {
                 RE_EXN_ID: "Assert_failure",
                 _1: [
                   "ocaml_re_test.res",
-                  2169,
+                  2168,
                   8
                 ]
               }
@@ -2497,7 +2497,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x)
               RE_EXN_ID: "Assert_failure",
               _1: [
                 "ocaml_re_test.res",
-                2403,
+                2402,
                 80
               ]
             }
@@ -2540,7 +2540,7 @@ function as_set(x) {
         RE_EXN_ID: "Assert_failure",
         _1: [
           "ocaml_re_test.res",
-          2438,
+          2437,
           11
         ]
       }
@@ -2554,7 +2554,7 @@ function as_set(x) {
       RE_EXN_ID: "Assert_failure",
       _1: [
         "ocaml_re_test.res",
-        2438,
+        2437,
         11
       ]
     }
@@ -4189,7 +4189,7 @@ function exec(rex, pos, s) {
 
 let s = "a".repeat(1048575) + "b";
 
-eq("File \"ocaml_re_test.res\", line 3843, characters 7-14", get(exec(compile(re(undefined, "aa?b")), undefined, s), 0), "aab");
+eq("File \"ocaml_re_test.res\", line 3842, characters 7-14", get(exec(compile(re(undefined, "aa?b")), undefined, s), 0), "aab");
 
 Mt.from_pair_suites("Ocaml_re_test", suites.contents);
 
diff --git a/jscomp/test/poly_variant_test.js b/jscomp/test/poly_variant_test.js
index a52acfbb73..d3333dec35 100644
--- a/jscomp/test/poly_variant_test.js
+++ b/jscomp/test/poly_variant_test.js
@@ -58,13 +58,13 @@ let vv = [
   hey_int(4)
 ];
 
-eq("File \"poly_variant_test.res\", line 64, characters 5-12", vv, [
+eq("File \"poly_variant_test.res\", line 65, characters 5-12", vv, [
   3,
   0,
   4
 ]);
 
-eq("File \"poly_variant_test.res\", line 65, characters 5-12", [
+eq("File \"poly_variant_test.res\", line 66, characters 5-12", [
   hey_int(5),
   hey_int(6)
 ], [
@@ -72,7 +72,7 @@ eq("File \"poly_variant_test.res\", line 65, characters 5-12", [
   6
 ]);
 
-eq("File \"poly_variant_test.res\", line 66, characters 5-12", uu, [
+eq("File \"poly_variant_test.res\", line 67, characters 5-12", uu, [
   "on_open",
   "on_closed",
   "in"
@@ -90,9 +90,9 @@ function p_is_int_test(x) {
   }
 }
 
-eq("File \"poly_variant_test.res\", line 156, characters 5-12", 2, 2);
+eq("File \"poly_variant_test.res\", line 157, characters 5-12", 2, 2);
 
-eq("File \"poly_variant_test.res\", line 157, characters 5-12", 3, p_is_int_test({
+eq("File \"poly_variant_test.res\", line 158, characters 5-12", 3, p_is_int_test({
   NAME: "b",
   VAL: 2
 }));
diff --git a/jscomp/test/queue_test.js b/jscomp/test/queue_test.js
index f27062e419..84e93e0b06 100644
--- a/jscomp/test/queue_test.js
+++ b/jscomp/test/queue_test.js
@@ -75,7 +75,7 @@ let T2 = {
 };
 
 let suites_0 = [
-  "File \"queue_test.res\", line 34, characters 6-13",
+  "File \"queue_test.res\", line 33, characters 6-13",
   param => {
     let x = [
       3,
@@ -93,7 +93,7 @@ let suites_0 = [
 
 let suites_1 = {
   hd: [
-    "File \"queue_test.res\", line 41, characters 6-13",
+    "File \"queue_test.res\", line 40, characters 6-13",
     param => {
       let x = [
         3,
diff --git a/jscomp/test/random_test.js b/jscomp/test/random_test.js
index 1e59086117..fa87f196d2 100644
--- a/jscomp/test/random_test.js
+++ b/jscomp/test/random_test.js
@@ -27,7 +27,7 @@ function approx(f) {
   return (extra, extra$1) => Mt_global.collect_approx(id, suites, f, extra, extra$1);
 }
 
-Mt_global.collect_neq(id, suites, "File \"random_test.res\", line 9, characters 2-9", (Random.self_init(), Random.int(10000)), (Random.self_init(), Random.int(1000)));
+Mt_global.collect_neq(id, suites, "File \"random_test.res\", line 8, characters 13-20", (Random.self_init(), Random.int(10000)), (Random.self_init(), Random.int(1000)));
 
 Random.init(0);
 
@@ -37,7 +37,7 @@ for (let i = 0; i <= 9; ++i) {
   Caml_array.set(v, i, Random.bool());
 }
 
-Mt_global.collect_eq(id, suites, "File \"random_test.res\", line 28, characters 12-19", v, [
+Mt_global.collect_eq(id, suites, "File \"random_test.res\", line 27, characters 12-19", v, [
   true,
   true,
   true,
diff --git a/jscomp/test/record_debug_test.js b/jscomp/test/record_debug_test.js
index c1591413b6..5440c26437 100644
--- a/jscomp/test/record_debug_test.js
+++ b/jscomp/test/record_debug_test.js
@@ -86,7 +86,7 @@ let c = [
 
 console.log(a, c);
 
-eq("File \"record_debug_test.res\", line 58, characters 3-10", [
+eq("File \"record_debug_test.res\", line 56, characters 3-10", [
   "",
   "a"
 ], [
diff --git a/jscomp/test/tramp_fib.js b/jscomp/test/tramp_fib.js
index e1b4d77b91..9e70049c28 100644
--- a/jscomp/test/tramp_fib.js
+++ b/jscomp/test/tramp_fib.js
@@ -81,11 +81,11 @@ function isOdd(n) {
   }
 }
 
-eq("File \"tramp_fib.res\", line 57, characters 3-10", iter(u), 89);
+eq("File \"tramp_fib.res\", line 53, characters 3-10", iter(u), 89);
 
-eq("File \"tramp_fib.res\", line 59, characters 3-10", iter(isEven(20000)), true);
+eq("File \"tramp_fib.res\", line 55, characters 3-10", iter(isEven(20000)), true);
 
-Mt.from_pair_suites("File \"tramp_fib.res\", line 61, characters 20-27", suites.contents);
+Mt.from_pair_suites("File \"tramp_fib.res\", line 57, characters 20-27", suites.contents);
 
 exports.suites = suites;
 exports.test_id = test_id;